diff --git a/core/composer.json b/core/composer.json
index f860b26948..39ebddf615 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -68,7 +68,7 @@
     "james-heinrich/phpthumb": "1.*",
     "evolutioncms-services/user-manager": "1.*",
     "evolutioncms-services/document-manager": "1.*",
-    "evolution-cms/salo": "1.x-dev"
+    "evolution-cms/salo": "1.*"
   },
   "require-dev": {
     "roave/security-advisories": "dev-master"
diff --git a/core/custom/.env.docker.example b/core/custom/.env.docker.example
new file mode 100644
index 0000000000..61c4a13734
--- /dev/null
+++ b/core/custom/.env.docker.example
@@ -0,0 +1,3 @@
+DB_USERNAME=homestead
+DB_PASSWORD=secret
+DB_DATABASE=evo
\ No newline at end of file
diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json
index d5273576e7..9459028718 100644
--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
@@ -1134,17 +1134,17 @@
         },
         {
             "name": "evolution-cms/salo",
-            "version": "1.x-dev",
-            "version_normalized": "1.9999999.9999999.9999999-dev",
+            "version": "1.0.1",
+            "version_normalized": "1.0.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Ser1ous/sail.git",
-                "reference": "28161a11f854a70c95660a860a337f74e12f8743"
+                "url": "https://github.com/Ser1ous/salo.git",
+                "reference": "f224115d310037d49fd271ff71fb0358ddaf2e6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Ser1ous/sail/zipball/28161a11f854a70c95660a860a337f74e12f8743",
-                "reference": "28161a11f854a70c95660a860a337f74e12f8743",
+                "url": "https://api.github.com/repos/Ser1ous/salo/zipball/f224115d310037d49fd271ff71fb0358ddaf2e6e",
+                "reference": "f224115d310037d49fd271ff71fb0358ddaf2e6e",
                 "shasum": ""
             },
             "require": {
@@ -1153,10 +1153,9 @@
                 "illuminate/support": "^8.0|^9.0",
                 "php": "^7.3|^8.0"
             },
-            "time": "2021-07-27T09:15:13+00:00",
-            "default-branch": true,
+            "time": "2021-07-28T13:21:32+00:00",
             "bin": [
-                "bin/sail"
+                "bin/salo"
             ],
             "type": "library",
             "extra": {
@@ -1179,20 +1178,14 @@
             "license": [
                 "MIT"
             ],
-            "authors": [
-                {
-                    "name": "Taylor Otwell",
-                    "email": "taylor@laravel.com"
-                }
-            ],
-            "description": "Docker files for running a basic Laravel application.",
+            "description": "Docker files for running a basic evo application.",
             "keywords": [
                 "docker",
-                "laravel"
+                "evo"
             ],
             "support": {
-                "issues": "https://github.com/laravel/sail/issues",
-                "source": "https://github.com/laravel/sail"
+                "issues": "https://github.com/Ser1ous/salo/issues",
+                "source": "https://github.com/Ser1ous/salo/tree/1.0.1"
             },
             "install-path": "../evolution-cms/salo"
         },
@@ -3299,17 +3292,17 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.51.0",
-            "version_normalized": "2.51.0.0",
+            "version": "2.51.1",
+            "version_normalized": "2.51.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "48ebff252df4d3b60ecb8e2583f79dfba6b56bc8"
+                "reference": "8619c299d1e0d4b344e1f98ca07a1ce2cfbf1922"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/48ebff252df4d3b60ecb8e2583f79dfba6b56bc8",
-                "reference": "48ebff252df4d3b60ecb8e2583f79dfba6b56bc8",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8619c299d1e0d4b344e1f98ca07a1ce2cfbf1922",
+                "reference": "8619c299d1e0d4b344e1f98ca07a1ce2cfbf1922",
                 "shasum": ""
             },
             "require": {
@@ -3329,7 +3322,7 @@
                 "phpunit/phpunit": "^7.5.20 || ^8.5.14",
                 "squizlabs/php_codesniffer": "^3.4"
             },
-            "time": "2021-07-28T08:28:41+00:00",
+            "time": "2021-07-28T13:16:28+00:00",
             "bin": [
                 "bin/carbon"
             ],
diff --git a/core/vendor/composer/installed.php b/core/vendor/composer/installed.php
index 6d72147e94..abaab5b9c1 100644
--- a/core/vendor/composer/installed.php
+++ b/core/vendor/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'd7a3ca0a902b78043b85e5613aacd3e1131fa62c',
+        'reference' => 'd3a29635692a7712c72a46d83d2028e645b1b7bf',
         'name' => 'evolutioncms/core',
         'dev' => true,
     ),
@@ -137,12 +137,12 @@
             'dev_requirement' => false,
         ),
         'evolution-cms/salo' => array(
-            'pretty_version' => '1.x-dev',
-            'version' => '1.9999999.9999999.9999999-dev',
+            'pretty_version' => '1.0.1',
+            'version' => '1.0.1.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../evolution-cms/salo',
             'aliases' => array(),
-            'reference' => '28161a11f854a70c95660a860a337f74e12f8743',
+            'reference' => 'f224115d310037d49fd271ff71fb0358ddaf2e6e',
             'dev_requirement' => false,
         ),
         'evolutioncms-services/document-manager' => array(
@@ -169,7 +169,7 @@
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'd7a3ca0a902b78043b85e5613aacd3e1131fa62c',
+            'reference' => 'd3a29635692a7712c72a46d83d2028e645b1b7bf',
             'dev_requirement' => false,
         ),
         'graham-campbell/result-type' => array(
@@ -461,12 +461,12 @@
             'dev_requirement' => false,
         ),
         'nesbot/carbon' => array(
-            'pretty_version' => '2.51.0',
-            'version' => '2.51.0.0',
+            'pretty_version' => '2.51.1',
+            'version' => '2.51.1.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../nesbot/carbon',
             'aliases' => array(),
-            'reference' => '48ebff252df4d3b60ecb8e2583f79dfba6b56bc8',
+            'reference' => '8619c299d1e0d4b344e1f98ca07a1ce2cfbf1922',
             'dev_requirement' => false,
         ),
         'phpmailer/phpmailer' => array(
diff --git a/core/vendor/evolution-cms/salo/bin/sail b/core/vendor/evolution-cms/salo/bin/salo
similarity index 80%
rename from core/vendor/evolution-cms/salo/bin/sail
rename to core/vendor/evolution-cms/salo/bin/salo
index b9d1178f51..069c281588 100755
--- a/core/vendor/evolution-cms/salo/bin/sail
+++ b/core/vendor/evolution-cms/salo/bin/salo
@@ -13,7 +13,7 @@ case "${UNAMEOUT}" in
 esac
 
 if [ "$MACHINE" == "UNKNOWN" ]; then
-    echo "Unsupported operating system [$(uname -s)]. Laravel Sail supports macOS, Linux, and Windows (WSL2)." >&2
+    echo "Unsupported operating system [$(uname -s)]. Laravel Salo supports macOS, Linux, and Windows (WSL2)." >&2
 
     exit 1
 fi
@@ -25,9 +25,9 @@ export DB_PORT=${DB_PORT:-3306}
 export WWWUSER=${WWWUSER:-$UID}
 export WWWGROUP=${WWWGROUP:-$(id -g)}
 
-export SAIL_SHARE_DASHBOARD=${SAIL_SHARE_DASHBOARD:-4040}
-export SAIL_SHARE_SERVER_HOST=${SAIL_SHARE_SERVER_HOST:-"laravel-sail.site"}
-export SAIL_SHARE_SERVER_PORT=${SAIL_SHARE_SERVER_PORT:-8080}
+export SALO_SHARE_DASHBOARD=${SALO_SHARE_DASHBOARD:-4040}
+export SALO_SHARE_SERVER_HOST=${SALO_SHARE_SERVER_HOST:-"laravel-salo.site"}
+export SALO_SHARE_SERVER_PORT=${SALO_SHARE_SERVER_PORT:-8080}
 
 # Ensure that Docker is running...
 if ! docker info > /dev/null 2>&1; then
@@ -36,11 +36,11 @@ if ! docker info > /dev/null 2>&1; then
     exit 1
 fi
 
-# Determine if Sail is currently up...
+# Determine if Salo is currently up...
 PSRESULT="$(docker-compose ps -q)"
 
 if docker-compose ps | grep $APP_SERVICE | grep 'Exit'; then
-    echo -e "${WHITE}Shutting down old Sail processes...${NC}" >&2
+    echo -e "${WHITE}Shutting down old Salo processes...${NC}" >&2
 
     docker-compose down > /dev/null 2>&1
 
@@ -51,11 +51,11 @@ else
     EXEC="no"
 fi
 
-# Function that outputs Sail is not running...
-function sail_is_not_running {
-    echo -e "${WHITE}Sail is not running.${NC}" >&2
+# Function that outputs Salo is not running...
+function salo_is_not_running {
+    echo -e "${WHITE}Salo is not running.${NC}" >&2
     echo "" >&2
-    echo -e "${WHITE}You may Sail using the following commands:${NC} './vendor/bin/sail up' or './vendor/bin/sail up -d'" >&2
+    echo -e "${WHITE}You may Salo using the following commands:${NC} './vendor/bin/salo up' or './vendor/bin/salo up -d'" >&2
 
     exit 1
 }
@@ -72,11 +72,11 @@ if [ $# -gt 0 ]; then
 
         if [ "$EXEC" == "yes" ]; then
             docker-compose exec \
-                -u sail \
+                -u salo \
                 "$APP_SERVICE" \
                 php "$@"
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Proxy vendor binary commands on the application container...
@@ -85,11 +85,11 @@ if [ $# -gt 0 ]; then
 
         if [ "$EXEC" == "yes" ]; then
             docker-compose exec \
-                -u sail \
+                -u salo \
                 "$APP_SERVICE" \
                 ./vendor/bin/"$@"
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Proxy Composer commands to the "composer" binary on the application container...
@@ -98,11 +98,11 @@ if [ $# -gt 0 ]; then
 
         if [ "$EXEC" == "yes" ]; then
             docker-compose exec \
-                -u sail \
+                -u salo \
                 "$APP_SERVICE" \
                 composer "$@"
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Proxy Artisan commands to the "artisan" binary on the application container...
@@ -111,11 +111,11 @@ if [ $# -gt 0 ]; then
 
         if [ "$EXEC" == "yes" ]; then
             docker-compose exec \
-                -u sail \
+                -u salo \
                 "$APP_SERVICE" \
                 php core/artisan "$@"
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Proxy the "test" command to the "php artisan test" Artisan command...
@@ -124,11 +124,11 @@ if [ $# -gt 0 ]; then
 
         if [ "$EXEC" == "yes" ]; then
             docker-compose exec \
-                -u sail \
+                -u salo \
                 "$APP_SERVICE" \
                 php core/artisan test "$@"
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Proxy the "dusk" command to the "php artisan dusk" Artisan command...
@@ -137,13 +137,13 @@ if [ $# -gt 0 ]; then
 
         if [ "$EXEC" == "yes" ]; then
             docker-compose exec \
-                -u sail \
+                -u salo \
                 -e "APP_URL=http://laravel.test" \
                 -e "DUSK_DRIVER_URL=http://selenium:4444/wd/hub" \
                 "$APP_SERVICE" \
                 php core/artisan dusk "$@"
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Proxy the "dusk:fails" command to the "php artisan dusk:fails" Artisan command...
@@ -152,13 +152,13 @@ if [ $# -gt 0 ]; then
 
         if [ "$EXEC" == "yes" ]; then
             docker-compose exec \
-                -u sail \
+                -u salo \
                 -e "APP_URL=http://laravel.test" \
                 -e "DUSK_DRIVER_URL=http://selenium:4444/wd/hub" \
                 "$APP_SERVICE" \
                 php core/artisan dusk:fails "$@"
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Initiate a Laravel Tinker session within the application container...
@@ -167,11 +167,11 @@ if [ $# -gt 0 ]; then
 
         if [ "$EXEC" == "yes" ]; then
             docker-compose exec \
-                -u sail \
+                -u salo \
                 "$APP_SERVICE" \
                 php core/artisan tinker
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Proxy Node commands to the "node" binary on the application container...
@@ -180,11 +180,11 @@ if [ $# -gt 0 ]; then
 
         if [ "$EXEC" == "yes" ]; then
             docker-compose exec \
-                -u sail \
+                -u salo \
                 "$APP_SERVICE" \
                 node "$@"
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Proxy NPM commands to the "npm" binary on the application container...
@@ -193,11 +193,11 @@ if [ $# -gt 0 ]; then
 
         if [ "$EXEC" == "yes" ]; then
             docker-compose exec \
-                -u sail \
+                -u salo \
                 "$APP_SERVICE" \
                 npm "$@"
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Proxy NPX commands to the "npx" binary on the application container...
@@ -206,11 +206,11 @@ if [ $# -gt 0 ]; then
 
         if [ "$EXEC" == "yes" ]; then
             docker-compose exec \
-                -u sail \
+                -u salo \
                 "$APP_SERVICE" \
                 npx "$@"
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Proxy YARN commands to the "yarn" binary on the application container...
@@ -219,11 +219,11 @@ if [ $# -gt 0 ]; then
 
         if [ "$EXEC" == "yes" ]; then
             docker-compose exec \
-                -u sail \
+                -u salo \
                 "$APP_SERVICE" \
                 yarn "$@"
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Initiate a MySQL CLI terminal session within the "mysql" container...
@@ -235,7 +235,7 @@ if [ $# -gt 0 ]; then
                 mysql \
                 bash -c 'MYSQL_PWD=${MYSQL_PASSWORD} mysql -u ${MYSQL_USER} ${MYSQL_DATABASE}'
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Initiate a MySQL CLI terminal session within the "mariadb" container...
@@ -247,7 +247,7 @@ if [ $# -gt 0 ]; then
                 mariadb \
                 bash -c 'MYSQL_PWD=${MYSQL_PASSWORD} mysql -u ${MYSQL_USER} ${MYSQL_DATABASE}'
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Initiate a PostgreSQL CLI terminal session within the "pgsql" container...
@@ -259,7 +259,7 @@ if [ $# -gt 0 ]; then
                  pgsql \
                  bash -c 'PGPASSWORD=${PGPASSWORD} psql -U ${POSTGRES_USER} ${POSTGRES_DB}'
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Initiate a Bash shell within the application container...
@@ -268,11 +268,11 @@ if [ $# -gt 0 ]; then
 
         if [ "$EXEC" == "yes" ]; then
             docker-compose exec \
-                -u sail \
+                -u salo \
                 "$APP_SERVICE" \
                 bash
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Initiate a root user Bash shell within the application container...
@@ -284,7 +284,7 @@ if [ $# -gt 0 ]; then
                 "$APP_SERVICE" \
                 bash
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Initiate a Redis CLI terminal session within the "redis" container...
@@ -296,7 +296,7 @@ if [ $# -gt 0 ]; then
                 redis \
                 redis-cli
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Share the site...
@@ -304,14 +304,14 @@ if [ $# -gt 0 ]; then
         shift 1
 
         if [ "$EXEC" == "yes" ]; then
-            docker run --init --rm -p $SAIL_SHARE_DASHBOARD:4040 -t beyondcodegmbh/expose-server:latest share http://host.docker.internal:"$APP_PORT" \
-            --server-host="$SAIL_SHARE_SERVER_HOST" \
-            --server-port="$SAIL_SHARE_SERVER_PORT" \
-            --auth="$SAIL_SHARE_TOKEN" \
+            docker run --init --rm -p $SALO_SHARE_DASHBOARD:4040 -t beyondcodegmbh/expose-server:latest share http://host.docker.internal:"$APP_PORT" \
+            --server-host="$SALO_SHARE_SERVER_HOST" \
+            --server-port="$SALO_SHARE_SERVER_PORT" \
+            --auth="$SALO_SHARE_TOKEN" \
             --subdomain="" \
             "$@"
         else
-            sail_is_not_running
+            salo_is_not_running
         fi
 
     # Pass unknown commands to the "docker-compose" binary...
diff --git a/core/vendor/evolution-cms/salo/composer.json b/core/vendor/evolution-cms/salo/composer.json
index eb9675d258..77f4d31d9f 100644
--- a/core/vendor/evolution-cms/salo/composer.json
+++ b/core/vendor/evolution-cms/salo/composer.json
@@ -1,18 +1,8 @@
 {
     "name": "evolution-cms/salo",
-    "description": "Docker files for running a basic Laravel application.",
-    "keywords": ["laravel", "docker"],
+    "description": "Docker files for running a basic evo application.",
+    "keywords": ["evo", "docker"],
     "license": "MIT",
-    "support": {
-        "issues": "https://github.com/laravel/sail/issues",
-        "source": "https://github.com/laravel/sail"
-    },
-    "authors": [
-        {
-            "name": "Taylor Otwell",
-            "email": "taylor@laravel.com"
-        }
-    ],
     "require": {
         "php": "^7.3|^8.0",
         "illuminate/contracts": "^8.0|^9.0",
@@ -20,7 +10,7 @@
         "illuminate/support": "^8.0|^9.0"
     },
     "bin": [
-        "bin/sail"
+        "bin/salo"
     ],
     "autoload": {
         "psr-4": {
diff --git a/core/vendor/evolution-cms/salo/runtimes/7.4/Dockerfile b/core/vendor/evolution-cms/salo/runtimes/7.4/Dockerfile
deleted file mode 100644
index 2b24e0fc28..0000000000
--- a/core/vendor/evolution-cms/salo/runtimes/7.4/Dockerfile
+++ /dev/null
@@ -1,56 +0,0 @@
-FROM ubuntu:21.04
-
-LABEL maintainer="Taylor Otwell"
-
-ARG WWWGROUP
-
-WORKDIR /var/www/html
-
-ENV DEBIAN_FRONTEND noninteractive
-ENV TZ=UTC
-
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-RUN apt-get update \
-    && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 \
-    && mkdir -p ~/.gnupg \
-    && chmod 600 ~/.gnupg \
-    && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
-    && apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys E5267A6C \
-    && apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C300EE8C \
-    && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu hirsute main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
-    && apt-get update \
-    && apt-get install -y php7.4-cli php7.4-dev \
-       php7.4-pgsql php7.4-sqlite3 php7.4-gd \
-       php7.4-curl php7.4-memcached \
-       php7.4-imap php7.4-mysql php7.4-mbstring \
-       php7.4-xml php7.4-zip php7.4-bcmath php7.4-soap \
-       php7.4-intl php7.4-readline php7.4-pcov \
-       php7.4-msgpack php7.4-igbinary php7.4-ldap \
-       php7.4-redis \
-    && php -r "readfile('http://getcomposer.org/installer');" | php -- --install-dir=/usr/bin/ --filename=composer \
-    && curl -sL https://deb.nodesource.com/setup_16.x | bash - \
-    && apt-get install -y nodejs \
-    && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
-    && apt-get update \
-    && apt-get install -y yarn \
-    && apt-get install -y mysql-client \
-    && apt-get install -y postgresql-client \
-    && apt-get -y autoremove \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN setcap "cap_net_bind_service=+ep" /usr/bin/php7.4
-
-RUN groupadd --force -g $WWWGROUP sail
-RUN useradd -ms /bin/bash --no-user-group -g $WWWGROUP -u 1337 sail
-
-COPY start-container /usr/local/bin/start-container
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY php.ini /etc/php/7.4/cli/conf.d/99-sail.ini
-RUN chmod +x /usr/local/bin/start-container
-
-EXPOSE 8000
-
-ENTRYPOINT ["start-container"]
diff --git a/core/vendor/evolution-cms/salo/runtimes/7.4/php.ini b/core/vendor/evolution-cms/salo/runtimes/7.4/php.ini
deleted file mode 100644
index 66d04d5bef..0000000000
--- a/core/vendor/evolution-cms/salo/runtimes/7.4/php.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[PHP]
-post_max_size = 100M
-upload_max_filesize = 100M
-variables_order = EGPCS
diff --git a/core/vendor/evolution-cms/salo/runtimes/7.4/start-container b/core/vendor/evolution-cms/salo/runtimes/7.4/start-container
deleted file mode 100644
index 39e52706c5..0000000000
--- a/core/vendor/evolution-cms/salo/runtimes/7.4/start-container
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-if [ ! -z "$WWWUSER" ]; then
-    usermod -u $WWWUSER sail
-fi
-
-if [ ! -d /.composer ]; then
-    mkdir /.composer
-fi
-
-chmod -R ugo+rw /.composer
-
-if [ $# -gt 0 ];then
-    exec gosu $WWWUSER "$@"
-else
-    /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
-fi
diff --git a/core/vendor/evolution-cms/salo/runtimes/7.4/supervisord.conf b/core/vendor/evolution-cms/salo/runtimes/7.4/supervisord.conf
deleted file mode 100644
index 9d28479582..0000000000
--- a/core/vendor/evolution-cms/salo/runtimes/7.4/supervisord.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[supervisord]
-nodaemon=true
-user=root
-logfile=/var/log/supervisor/supervisord.log
-pidfile=/var/run/supervisord.pid
-
-[program:php]
-command=/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80
-user=sail
-environment=LARAVEL_SAIL="1"
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/core/vendor/evolution-cms/salo/runtimes/8.0/start-container b/core/vendor/evolution-cms/salo/runtimes/8.0/start-container
deleted file mode 100644
index 39e52706c5..0000000000
--- a/core/vendor/evolution-cms/salo/runtimes/8.0/start-container
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-if [ ! -z "$WWWUSER" ]; then
-    usermod -u $WWWUSER sail
-fi
-
-if [ ! -d /.composer ]; then
-    mkdir /.composer
-fi
-
-chmod -R ugo+rw /.composer
-
-if [ $# -gt 0 ];then
-    exec gosu $WWWUSER "$@"
-else
-    /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
-fi
diff --git a/core/vendor/evolution-cms/salo/runtimes/8.0/supervisord.conf b/core/vendor/evolution-cms/salo/runtimes/8.0/supervisord.conf
deleted file mode 100644
index 148339d756..0000000000
--- a/core/vendor/evolution-cms/salo/runtimes/8.0/supervisord.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[supervisord]
-nodaemon=true
-user=root
-logfile=/var/log/supervisor/supervisord.log
-pidfile=/var/run/supervisord.pid
-
-[program:php]
-command=/usr/bin/php -d variables_order=EGPCS /var/www/html/core/artisan serve --host=0.0.0.0 --port=80
-user=sail
-environment=LARAVEL_SAIL="1"
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
diff --git a/core/vendor/evolution-cms/salo/runtimes/custom.cnf b/core/vendor/evolution-cms/salo/runtimes/custom.cnf
deleted file mode 100644
index ea62150afc..0000000000
--- a/core/vendor/evolution-cms/salo/runtimes/custom.cnf
+++ /dev/null
@@ -1,4 +0,0 @@
-[mysqld]
-character-set-server = utf8mb4
-collation-server = utf8mb4_general_ci
-skip-character-set-client-handshake
\ No newline at end of file
diff --git a/core/vendor/evolution-cms/salo/src/Console/InstallCommand.php b/core/vendor/evolution-cms/salo/src/Console/InstallCommand.php
index e51953c1fc..e0a1cfa653 100644
--- a/core/vendor/evolution-cms/salo/src/Console/InstallCommand.php
+++ b/core/vendor/evolution-cms/salo/src/Console/InstallCommand.php
@@ -11,14 +11,14 @@ class InstallCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'sail:install {--with= : The services that should be included in the installation}';
+    protected $signature = 'salo:install {--with= : The services that should be included in the installation}';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Install Laravel Sail\'s default Docker Compose file';
+    protected $description = 'Install Laravel Salo\'s default Docker Compose file';
 
     /**
      * Execute the console command.
@@ -38,11 +38,11 @@ public function handle()
         $this->buildDockerCompose($services);
         $this->replaceEnvVariables($services);
 
-        $this->info('Sail scaffolding installed successfully.');
+        $this->info('Salo scaffolding installed successfully.');
     }
 
     /**
-     * Gather the desired Sail services using a Symfony menu.
+     * Gather the desired Salo services using a Symfony menu.
      *
      * @return array
      */
@@ -50,7 +50,6 @@ protected function gatherServicesWithSymfonyMenu()
     {
         return $this->choice('Which services would you like to install?', [
             'mysql',
-            'pgsql',
             'mariadb',
             'redis',
             'memcached',
@@ -86,7 +85,7 @@ protected function buildDockerCompose(array $services)
             ->filter(function ($service) {
                 return in_array($service, ['mysql', 'pgsql', 'mariadb', 'redis', 'meilisearch', 'minio']);
             })->map(function ($service) {
-                return "    sail{$service}:\n        driver: local";
+                return "    salo{$service}:\n        driver: local";
             })->whenNotEmpty(function ($collection) {
                 return $collection->prepend('volumes:');
             })->implode("\n");
@@ -114,7 +113,7 @@ protected function replaceEnvVariables(array $services)
         if (file_exists(evo()->basePath('custom/.env'))) {
             $environment = file_get_contents(evo()->basePath('custom/.env'));
         } else {
-            $environment = file_get_contents(evo()->basePath('custom/.env.example'));
+            $environment = file_get_contents(evo()->basePath('custom/.env.docker.example'));
         }
 
         if (in_array('pgsql', $services)) {
@@ -127,7 +126,7 @@ protected function replaceEnvVariables(array $services)
             $environment = str_replace('DB_HOST=127.0.0.1', "DB_HOST=mysql", $environment);
         }
 
-        $environment = str_replace('DB_USERNAME=root', "DB_USERNAME=sail", $environment);
+        $environment = str_replace('DB_USERNAME=root', "DB_USERNAME=salo", $environment);
         $environment = preg_replace("/DB_PASSWORD=(.*)/", "DB_PASSWORD=password", $environment);
 
         $environment = str_replace('MEMCACHED_HOST=127.0.0.1', 'MEMCACHED_HOST=memcached', $environment);
diff --git a/core/vendor/evolution-cms/salo/src/Console/PublishCommand.php b/core/vendor/evolution-cms/salo/src/Console/PublishCommand.php
index 851cad9d53..dad5324ac3 100644
--- a/core/vendor/evolution-cms/salo/src/Console/PublishCommand.php
+++ b/core/vendor/evolution-cms/salo/src/Console/PublishCommand.php
@@ -11,14 +11,14 @@ class PublishCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'sail:publish';
+    protected $signature = 'salo:publish';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Publish the Laravel Sail Docker files';
+    protected $description = 'Publish the Laravel Salo Docker files';
 
     /**
      * Execute the console command.
@@ -27,14 +27,14 @@ class PublishCommand extends Command
      */
     public function handle()
     {
-        $this->call('vendor:publish', ['--tag' => 'sail']);
+        $this->call('vendor:publish', ['--tag' => 'salo']);
 
         file_put_contents(
             $this->laravel->basePath('docker-compose.yml'),
             str_replace(
                 [
-                    './vendor/laravel/sail/runtimes/8.0',
-                    './vendor/laravel/sail/runtimes/7.4',
+                    './vendor/laravel/salo/runtimes/8.0',
+                    './vendor/laravel/salo/runtimes/7.4',
                 ],
                 [
                     './docker/8.0',
diff --git a/core/vendor/evolution-cms/salo/src/SaloServiceProvider.php b/core/vendor/evolution-cms/salo/src/SaloServiceProvider.php
index 622b466643..7e70a28c72 100644
--- a/core/vendor/evolution-cms/salo/src/SaloServiceProvider.php
+++ b/core/vendor/evolution-cms/salo/src/SaloServiceProvider.php
@@ -45,11 +45,11 @@ protected function configurePublishing()
         if ($this->app->runningInConsole()) {
             $this->publishes([
                 __DIR__ . '/../runtimes' => $this->app->basePath('docker'),
-            ], ['sail', 'sail-docker']);
+            ], ['salo', 'salo-docker']);
 
             $this->publishes([
-                __DIR__ . '/../bin/sail' => $this->app->basePath('sail'),
-            ], ['sail', 'sail-bin']);
+                __DIR__ . '/../bin/salo' => $this->app->basePath('salo'),
+            ], ['salo', 'salo-bin']);
         }
     }
 
diff --git a/core/vendor/evolution-cms/salo/stubs/docker-compose.stub b/core/vendor/evolution-cms/salo/stubs/docker-compose.stub
index 3249a30549..7614b26485 100644
--- a/core/vendor/evolution-cms/salo/stubs/docker-compose.stub
+++ b/core/vendor/evolution-cms/salo/stubs/docker-compose.stub
@@ -1,4 +1,4 @@
-# For more information: https://laravel.com/docs/sail
+# For more information: https://laravel.com/docs/salo
 version: '3'
 services:
     evo.php:
@@ -12,14 +12,14 @@ services:
             - '${APP_PORT:-80}:80'
         environment:
             WWWUSER: '${WWWUSER}'
-            LARAVEL_SAIL: 1
+            LARAVEL_SALO: 1
         volumes:
             - '.:/var/www/html'
         networks:
-            - sail
+            - salo
 {{depends}}
 {{services}}
 networks:
-    sail:
+    salo:
         driver: bridge
 {{volumes}}
diff --git a/core/vendor/evolution-cms/salo/stubs/mailhog.stub b/core/vendor/evolution-cms/salo/stubs/mailhog.stub
index ebbf5591e0..67c6a19915 100644
--- a/core/vendor/evolution-cms/salo/stubs/mailhog.stub
+++ b/core/vendor/evolution-cms/salo/stubs/mailhog.stub
@@ -4,4 +4,4 @@
             - '${FORWARD_MAILHOG_PORT:-1025}:1025'
             - '${FORWARD_MAILHOG_DASHBOARD_PORT:-8025}:8025'
         networks:
-            - sail
+            - salo
diff --git a/core/vendor/evolution-cms/salo/stubs/mariadb.stub b/core/vendor/evolution-cms/salo/stubs/mariadb.stub
index f34046f524..667d1c7d45 100644
--- a/core/vendor/evolution-cms/salo/stubs/mariadb.stub
+++ b/core/vendor/evolution-cms/salo/stubs/mariadb.stub
@@ -9,9 +9,9 @@
             MYSQL_PASSWORD: '${DB_PASSWORD}'
             MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
         volumes:
-            - 'sailmariadb:/var/lib/mysql'
+            - 'salomariadb:/var/lib/mysql'
         networks:
-            - sail
+            - salo
         healthcheck:
           test: ["CMD", "mysqladmin", "ping", "-p${DB_PASSWORD}"]
           retries: 3
diff --git a/core/vendor/evolution-cms/salo/stubs/meilisearch.stub b/core/vendor/evolution-cms/salo/stubs/meilisearch.stub
index a4ca35c415..4c6dc81c17 100644
--- a/core/vendor/evolution-cms/salo/stubs/meilisearch.stub
+++ b/core/vendor/evolution-cms/salo/stubs/meilisearch.stub
@@ -3,9 +3,9 @@
         ports:
             - '${FORWARD_MEILISEARCH_PORT:-7700}:7700'
         volumes:
-            - 'sailmeilisearch:/data.ms'
+            - 'salomeilisearch:/data.ms'
         networks:
-            - sail
+            - salo
         healthcheck:
           test: ["CMD", "wget", "--no-verbose", "--spider",  "http://localhost:7700/health"]
           retries: 3
diff --git a/core/vendor/evolution-cms/salo/stubs/memcached.stub b/core/vendor/evolution-cms/salo/stubs/memcached.stub
index 34fdbd45e4..443e2811f8 100644
--- a/core/vendor/evolution-cms/salo/stubs/memcached.stub
+++ b/core/vendor/evolution-cms/salo/stubs/memcached.stub
@@ -3,4 +3,4 @@
         ports:
             - '11211:11211'
         networks:
-            - sail
+            - salo
diff --git a/core/vendor/evolution-cms/salo/stubs/minio.stub b/core/vendor/evolution-cms/salo/stubs/minio.stub
index 5321f6397b..ea3557fb19 100644
--- a/core/vendor/evolution-cms/salo/stubs/minio.stub
+++ b/core/vendor/evolution-cms/salo/stubs/minio.stub
@@ -4,12 +4,12 @@
             - '${FORWARD_MINIO_PORT:-9000}:9000'
             - '${FORWARD_MINIO_CONSOLE_PORT:-8900}:8900'
         environment:
-            MINIO_ROOT_USER: 'sail'
+            MINIO_ROOT_USER: 'salo'
             MINIO_ROOT_PASSWORD: 'password'
         volumes:
-            - 'sailminio:/data/minio'
+            - 'salominio:/data/minio'
         networks:
-            - sail
+            - salo
         command: minio server /data/minio --console-address ":8900"
         healthcheck:
           test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
diff --git a/core/vendor/evolution-cms/salo/stubs/mysql.stub b/core/vendor/evolution-cms/salo/stubs/mysql.stub
index cc73dbb4fb..518671a80a 100644
--- a/core/vendor/evolution-cms/salo/stubs/mysql.stub
+++ b/core/vendor/evolution-cms/salo/stubs/mysql.stub
@@ -10,9 +10,9 @@
             MYSQL_PASSWORD: '${DB_PASSWORD}'
             MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
         volumes:
-            - 'sailmysql:/var/lib/mysql'
+            - 'salomysql:/var/lib/mysql'
         networks:
-            - sail
+            - salo
         healthcheck:
           test: ["CMD", "mysqladmin", "ping", "-p${DB_PASSWORD}"]
           retries: 3
diff --git a/core/vendor/evolution-cms/salo/stubs/pgsql.stub b/core/vendor/evolution-cms/salo/stubs/pgsql.stub
index 18db1144dc..37b9d94f14 100644
--- a/core/vendor/evolution-cms/salo/stubs/pgsql.stub
+++ b/core/vendor/evolution-cms/salo/stubs/pgsql.stub
@@ -8,9 +8,9 @@
             POSTGRES_USER: '${DB_USERNAME}'
             POSTGRES_PASSWORD: '${DB_PASSWORD:-secret}'
         volumes:
-            - 'sailpgsql:/var/lib/postgresql/data'
+            - 'salopgsql:/var/lib/postgresql/data'
         networks:
-            - sail
+            - salo
         healthcheck:
           test: ["CMD", "pg_isready", "-q", "-d", "${DB_DATABASE}", "-U", "${DB_USERNAME}"]
           retries: 3
diff --git a/core/vendor/evolution-cms/salo/stubs/redis.stub b/core/vendor/evolution-cms/salo/stubs/redis.stub
index 02498a4f9a..c023edb2aa 100644
--- a/core/vendor/evolution-cms/salo/stubs/redis.stub
+++ b/core/vendor/evolution-cms/salo/stubs/redis.stub
@@ -3,9 +3,9 @@
         ports:
             - '${FORWARD_REDIS_PORT:-6379}:6379'
         volumes:
-            - 'sailredis:/data'
+            - 'saloredis:/data'
         networks:
-            - sail
+            - salo
         healthcheck:
           test: ["CMD", "redis-cli", "ping"]
           retries: 3
diff --git a/core/vendor/evolution-cms/salo/stubs/selenium.stub b/core/vendor/evolution-cms/salo/stubs/selenium.stub
index ac22037574..66641759ec 100644
--- a/core/vendor/evolution-cms/salo/stubs/selenium.stub
+++ b/core/vendor/evolution-cms/salo/stubs/selenium.stub
@@ -3,4 +3,4 @@
        volumes:
             - '/dev/shm:/dev/shm'
        networks:
-           - sail
+           - salo