diff --git a/composer.json b/composer.json
index 3545c61..95adf6d 100644
--- a/composer.json
+++ b/composer.json
@@ -1,17 +1,283 @@
 {
   "name": "bendtstudio/pancake",
   "description": "Self-hosted invoicing application (Pancake) for bendtstudio homelab",
+  "keywords": [
+    "online invoicing",
+    "time tracking",
+    "project management",
+    "pancake"
+  ],
+  "license": "proprietary",
   "type": "project",
+  "homepage": "https://www.pancakeapp.com",
+  "support": {
+    "email": "support@pancakeapp.com",
+    "issues": "https://www.pancakeapp.com/account/support/ticket/new"
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
   "require": {
     "php": "^8.0",
     "ext-gd": "*",
     "ext-dom": "*",
     "ext-curl": "*",
-    "ext-mbstring": "*"
+    "ext-mbstring": "*",
+    "ext-json": "*",
+    "aws/aws-sdk-php": "3.*",
+    "brunodebarros/fix-php-post-input": "1.*",
+    "composer/ca-bundle": "^1.0",
+    "erusev/parsedown": "dev-master",
+    "ezyang/htmlpurifier": "^4.8",
+    "google/apiclient": "^2.0",
+    "html2text/html2text": "dev-master",
+    "ifsnop/mysqldump-php": "2.*",
+    "illuminate/collections": "^8",
+    "jakeasmith/http_build_url": "^1",
+    "league/csv": "^9.8",
+    "league/event": "2.*",
+    "league/flysystem-aws-s3-v3": "1.0.*",
+    "league/oauth2-google": "^2.2",
+    "moneyphp/money": "^3.3",
+    "mustache/mustache": "^2.11",
+    "nesbot/carbon": "^3.0",
+    "omnipay/paypal": "^3",
+    "owasp/phprbac": "2.*",
+    "pancakeapp/dompdf": "dev-master",
+    "payeezy/payeezy-php": "dev-master",
+    "pear/math_biginteger": "^1.0",
+    "php-http/guzzle7-adapter": "^1.0",
+    "phpseclib/bcmath_compat": "^2.0",
+    "spatie/once": "^2",
+    "stripe/stripe-php": "^7.0",
+    "swiftmailer/swiftmailer": "^6",
+    "symfony/http-foundation": "^5",
+    "symfony/polyfill-ctype": "^1.26",
+    "symfony/polyfill-mbstring": "1.*",
+    "symfony/var-dumper": "^4.3"
   },
   "autoload": {
     "classmap": [
       "system/"
+    ],
+    "psr-4": {
+      "Pancake\\": "pancake/apis/"
+    }
+  },
+  "config": {
+    "preferred-install": "dist",
+    "sort-packages": true,
+    "optimize-autoloader": true,
+    "allow-plugins": {
+      "php-http/discovery": true
+    }
+  },
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/pancakeapp/ccavenue"
+    },
+    {
+      "type": "vcs",
+      "url": "https://github.com/pancakeapp/dompdf"
+    }
+  ],
+  "scripts": {
+    "pre-autoload-dump": [
+      "find vendor -name '.gitignore' -type f -delete",
+      "find vendor -name '.gitmodules' -type f -delete",
+      "find vendor -name '.php_cs' -type f -delete",
+      "find vendor -name '.styleci.yml' -type f -delete",
+      "find vendor -name '.travis.yml' -type f -delete",
+      "find vendor -name 'CONTRIBUTING.md' -type f -delete",
+      "find vendor -name 'CREDITS' -type f -delete",
+      "find vendor -name 'README' -type f -delete",
+      "find vendor -name 'VERSION' -type f -delete",
+      "find vendor -name 'README.md' -type f -delete",
+      "find vendor -name 'UPGRADING.md' -type f -delete",
+      "find vendor -name 'CHANGELOG.md' -type f -delete",
+      "find vendor -name 'ChangeLog.txt' -type f -delete",
+      "find vendor -name 'NEWS' -type f -delete",
+      "find vendor -name 'CHANGES' -type f -delete",
+      "find vendor -name 'INSTALL' -type f -delete",
+      "find vendor -name 'phpunit.xml.dist' -type f -delete",
+      "find vendor -name 'phpunit.xml' -type f -delete",
+      "find vendor -name 'build.xml' -type f -delete",
+      "find vendor -name 'test' | xargs rm -Rf",
+      "find vendor -name 'tests' | xargs rm -Rf",
+      "find vendor -name 'Tests' | xargs rm -Rf",
+      "find vendor -name 'docs' | xargs rm -Rf",
+      "find vendor -name 'doc' | xargs rm -Rf",
+      "find vendor -name 'examples' | xargs rm -Rf",
+      "rm -rf vendor/aws/aws-sdk-php/.changes",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/a*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/b*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/c*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/d*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/e*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/f*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/g*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/h*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/i*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/j*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/k*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/l*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/m*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/n*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/o*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/p*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/q*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/r*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/sa*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/s3c*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/s3o*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/sc*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/se*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/sh*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/si*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/sm*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/sn*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/ss*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/st*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/su*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/sq*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/sw*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/sy*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/t*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/u*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/v*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/w*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/x*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/y*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/data/z*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Ac*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/AC*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Al*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Am*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/ApiG*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/App*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/At*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Au*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/B*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Ch*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Clo*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Co*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Cu*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/DA*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Da*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Det*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Dev*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Di*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/DL*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Do*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Dy*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/dr*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/EB*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Ec*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/EC*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Ef*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/EK*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/El*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Em*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/EM*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Ev*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/F*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/f*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/G*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/He*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Ho*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/I*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/i*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/J*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/K*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/k*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/L*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/M*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/m*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/N*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/O*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/P*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Q*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/RA*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Rd*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/RD*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Rec*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Red*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Rek*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Res*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Ro*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Sa*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/S3C*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/S3O*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Sc*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Se*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Sf*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Sh*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/si*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Sm*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Sn*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Ss*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/SS*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/St*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Su*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Sq*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Sw*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Sy*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/U*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/V*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/W*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/X*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Y*/",
+      "rm -rf vendor/aws/aws-sdk-php/src/Z*/",
+      "rm -rf vendor/google/apiclient-services/src/A*",
+      "rm -rf vendor/google/apiclient-services/src/B*",
+      "rm -rf vendor/google/apiclient-services/src/C*",
+      "rm -rf vendor/google/apiclient-services/src/D*",
+      "rm -rf vendor/google/apiclient-services/src/E*",
+      "rm -rf vendor/google/apiclient-services/src/F*",
+      "rm -rf vendor/google/apiclient-services/src/Ga*",
+      "rm -rf vendor/google/apiclient-services/src/GK*",
+      "rm -rf vendor/google/apiclient-services/src/Ge*",
+      "rm -rf vendor/google/apiclient-services/src/Go*",
+      "rm -rf vendor/google/apiclient-services/src/Gr*",
+      "rm -rf vendor/google/apiclient-services/src/H*",
+      "rm -rf vendor/google/apiclient-services/src/I*",
+      "rm -rf vendor/google/apiclient-services/src/K*",
+      "rm -rf vendor/google/apiclient-services/src/L*",
+      "rm -rf vendor/google/apiclient-services/src/M*",
+      "rm -rf vendor/google/apiclient-services/src/N*",
+      "rm -rf vendor/google/apiclient-services/src/O*",
+      "rm -rf vendor/google/apiclient-services/src/P*",
+      "rm -rf vendor/google/apiclient-services/src/Q*",
+      "rm -rf vendor/google/apiclient-services/src/R*",
+      "rm -rf vendor/google/apiclient-services/src/S*",
+      "rm -rf vendor/google/apiclient-services/src/T*",
+      "rm -rf vendor/google/apiclient-services/src/U*",
+      "rm -rf vendor/google/apiclient-services/src/V*",
+      "rm -rf vendor/google/apiclient-services/src/W*",
+      "rm -rf vendor/google/apiclient-services/src/Y*",
+      "rm -rf vendor/brunodebarros/mustache.php/bin/build_bootstrap.php",
+      "rm -rf vendor/ezyang/htmlpurifier/extras",
+      "rm -rf vendor/ezyang/htmlpurifier/INSTALL.fr.utf8",
+      "rm -rf vendor/ezyang/htmlpurifier/package.php",
+      "rm -rf vendor/ezyang/htmlpurifier/phpdoc.ini",
+      "rm -rf vendor/ezyang/htmlpurifier/plugins",
+      "rm -rf vendor/ezyang/htmlpurifier/release1-update.php",
+      "rm -rf vendor/ezyang/htmlpurifier/release2-tag.php",
+      "rm -rf vendor/ezyang/htmlpurifier/test-settings.sample.php",
+      "rm -rf vendor/ezyang/htmlpurifier/TODO",
+      "rm -rf vendor/ezyang/htmlpurifier/WHATSNEW",
+      "rm -rf vendor/ezyang/htmlpurifier/WYSIWYG",
+      "rm -rf vendor/guzzle/guzzle/phing",
+      "rm -rf vendor/ircmaxell/password-compat/version-test.php",
+      "rm -rf vendor/omnipay/common/makedoc.sh",
+      "rm -rf vendor/omnipay/stripe/makedoc.sh",
+      "rm -rf vendor/omnipay/stripe/runtests.sh",
+      "rm -rf vendor/owasp/phprbac/PhpRbac/database",
+      "rm -rf vendor/owasp/phprbac/PhpRbac/autoload.php",
+      "rm -rf vendor/owasp/phprbac/PhpRbac/install.php",
+      "find ../ -name '*.svg' -print0 | xargs -0 dos2unix",
+      "find ../ -name '*.js' -print0 | xargs -0 dos2unix",
+      "find ../ -name '*.php' -print0 | xargs -0 dos2unix"
     ]
   }
 }
diff --git a/system/composer.json b/system/composer.json
index 32b681e..11ea5ed 100755
--- a/system/composer.json
+++ b/system/composer.json
@@ -35,7 +35,7 @@
         "league/oauth2-google": "^2.2",
         "moneyphp/money": "^3.3",
         "mustache/mustache": "^2.11",
-        "nesbot/carbon": "^2.52",
+        "nesbot/carbon": "^3.0",
         "omnipay/paypal": "^3",
         "owasp/phprbac": "2.*",
         "pancakeapp/dompdf": "dev-master",