diff --git a/README.md b/README.md
index 76f8bc1f7f..4afc72376d 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ docker-compose up -d --remove-orphans
 Once the Docker installation completes, go to http://localhost to access the Appwrite console from your browser. Please notice that on non-linux native hosts, the server might take a few minutes to start after installation completes.
 
 
-For advanced, production and custom installation, check out our Docker [environment variables](/docs/EnviornementVariables.md) docs.
+For advanced, production and custom installation, check out our Docker [environment variables](docs/tutorials/environment-variables.md) docs.
 
 ### Changing Port Number
 
diff --git a/app/config/locale/es.countries.php b/app/config/locale/es.countries.php
index a0c11ae5c6..18fe488c17 100644
--- a/app/config/locale/es.countries.php
+++ b/app/config/locale/es.countries.php
@@ -37,14 +37,14 @@ return [
     'CI' => 'Costa de Marfil',
     'CM' => 'Camerún',
     'CD' => 'República Democrática del Congo',
-    'CG' => 'República del congo',
+    'CG' => 'República del Congo',
     'CO' => 'Colombia',
     'KM' => 'Comoras',
     'CV' => 'Cabo Verde',
     'CR' => 'Costa Rica',
     'CU' => 'Cuba',
     'CY' => 'Chipre',
-    'CZ' => 'Chequia',
+    'CZ' => 'República Checa',
     'DE' => 'Alemania',
     'DJ' => 'Yibuti',
     'DM' => 'Dominica',
@@ -80,7 +80,7 @@ return [
     'ID' => 'Indonesia',
     'IN' => 'India',
     'IE' => 'Irlanda',
-    'IR' => 'Iran',
+    'IR' => 'Irán',
     'IQ' => 'Irak',
     'IS' => 'Islandia',
     'IL' => 'Israel',
@@ -115,7 +115,7 @@ return [
     'MX' => 'Mexico',
     'MH' => 'Islas Marshall',
     'MK' => 'Macedonia',
-    'ML' => 'Mali',
+    'ML' => 'Malí',
     'MT' => 'Malta',
     'MM' => 'Myanmar',
     'ME' => 'Montenegro',
diff --git a/app/config/locale/es.php b/app/config/locale/es.php
index 0a56743689..cc8e82b7bd 100644
--- a/app/config/locale/es.php
+++ b/app/config/locale/es.php
@@ -6,7 +6,7 @@ return [
     'settings.direction' => 'ltr',
 
     // Service - Users
-    'auth.emails.team' => '%s Equipo',
+    'auth.emails.team' => 'Equipo %s',
     'auth.emails.confirm.title' => 'Confirmación de la cuenta',
     'auth.emails.confirm.body' => 'es.email.auth.confirm.tpl',
     'auth.emails.recovery.title' => 'Reestablecer contraseña',
diff --git a/app/config/locale/templates/es.email.auth.confirm.tpl b/app/config/locale/templates/es.email.auth.confirm.tpl
index 3bb7e97b62..a5b9235be8 100644
--- a/app/config/locale/templates/es.email.auth.confirm.tpl
+++ b/app/config/locale/templates/es.email.auth.confirm.tpl
@@ -10,7 +10,7 @@
     Hola {{name}},
     <br />
     <br />
-    Sigue este enlace para verificar tu dirección de correo:
+    Sigue este enlace para verificar tu dirección de correo.
     <br />
     <a href="{{redirect}}">{{redirect}}</a>
     <br />
@@ -21,4 +21,4 @@
     Gracias,
     <br />
     Equipo {{project}} 
-</div>
\ No newline at end of file
+</div>