diff --git a/package-lock.json b/package-lock.json
index 250092c..24ede43 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,6 +23,8 @@
         "@ng-bootstrap/ng-bootstrap": "9.1.3",
         "@ngx-translate/core": "13.0.0",
         "@ngx-translate/http-loader": "6.0.0",
+        "@types/gapi.auth2": "0.0.54",
+        "angularx-social-login": "^4.0.1",
         "bootstrap": "4.6.0",
         "dayjs": "1.10.5",
         "ngx-infinite-scroll": "10.0.1",
@@ -4227,6 +4229,19 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/gapi": {
+      "version": "0.0.40",
+      "resolved": "https://registry.npmjs.org/@types/gapi/-/gapi-0.0.40.tgz",
+      "integrity": "sha512-HzV7JIp5vgCZYPLzTg+LJCEVbTbZ/wNSCatNYThNvDTtiNXU+ccrUfFLUF2akHsil+KCpf2yp9OUhLUflsOuBw=="
+    },
+    "node_modules/@types/gapi.auth2": {
+      "version": "0.0.54",
+      "resolved": "https://registry.npmjs.org/@types/gapi.auth2/-/gapi.auth2-0.0.54.tgz",
+      "integrity": "sha512-4HEphaKsGndb9+tnd2PBBmxloaij04iYXVsjgHpFxqbPFt5Le6pasoh5g5BEtwp/YEm9xDbzssp44BYR2/7RcQ==",
+      "dependencies": {
+        "@types/gapi": "*"
+      }
+    },
     "node_modules/@types/glob": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
@@ -5091,6 +5106,18 @@
       "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
       "dev": true
     },
+    "node_modules/angularx-social-login": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/angularx-social-login/-/angularx-social-login-4.0.1.tgz",
+      "integrity": "sha512-dL65y0HXlKd8hhuH70/FFTxWsndEBU5DX2I1x7AcJ1ZAYpU6LPtQMbnzy10eSOcWZNeZX8XzaRaIbc4P+GjmvA==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "^12.0.0",
+        "@angular/core": "^12.0.0"
+      }
+    },
     "node_modules/ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -30320,6 +30347,19 @@
         "@types/node": "*"
       }
     },
+    "@types/gapi": {
+      "version": "0.0.40",
+      "resolved": "https://registry.npmjs.org/@types/gapi/-/gapi-0.0.40.tgz",
+      "integrity": "sha512-HzV7JIp5vgCZYPLzTg+LJCEVbTbZ/wNSCatNYThNvDTtiNXU+ccrUfFLUF2akHsil+KCpf2yp9OUhLUflsOuBw=="
+    },
+    "@types/gapi.auth2": {
+      "version": "0.0.54",
+      "resolved": "https://registry.npmjs.org/@types/gapi.auth2/-/gapi.auth2-0.0.54.tgz",
+      "integrity": "sha512-4HEphaKsGndb9+tnd2PBBmxloaij04iYXVsjgHpFxqbPFt5Le6pasoh5g5BEtwp/YEm9xDbzssp44BYR2/7RcQ==",
+      "requires": {
+        "@types/gapi": "*"
+      }
+    },
     "@types/glob": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
@@ -30984,6 +31024,14 @@
       "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
       "dev": true
     },
+    "angularx-social-login": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/angularx-social-login/-/angularx-social-login-4.0.1.tgz",
+      "integrity": "sha512-dL65y0HXlKd8hhuH70/FFTxWsndEBU5DX2I1x7AcJ1ZAYpU6LPtQMbnzy10eSOcWZNeZX8XzaRaIbc4P+GjmvA==",
+      "requires": {
+        "tslib": "^2.0.0"
+      }
+    },
     "ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
diff --git a/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html b/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html
index 95b20ad..a4ce1c6 100644
--- a/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html
+++ b/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html
@@ -1,21 +1,11 @@
 <div>
   <h2 id="page-heading" data-cy="UsuarioExtraHeading">
-    <span jhiTranslate="dataSurveyApp.usuarioExtra.home.title">Usuario Extras</span>
+    <span jhiTranslate="dataSurveyApp.usuarioExtra.home.title">Usuarios</span>
 
     <div class="d-flex justify-content-end">
-      <button class="btn btn-info mr-2" (click)="loadAll()" [disabled]="isLoading">
-        <fa-icon icon="sync" [spin]="isLoading"></fa-icon>
-        <span jhiTranslate="dataSurveyApp.usuarioExtra.home.refreshListLabel">Refresh List</span>
-      </button>
-
-      <button
-        id="jh-create-entity"
-        data-cy="entityCreateButton"
-        class="btn btn-primary jh-create-entity create-usuario-extra"
-        [routerLink]="['/usuario-extra/new']"
-      >
+      <button id="jh-create-entity" data-cy="entityCreateButton" class="ds-btn ds-btn--primary" [routerLink]="['/usuario-extra/new']">
         <fa-icon icon="plus"></fa-icon>
-        <span jhiTranslate="dataSurveyApp.usuarioExtra.home.createLabel"> Create a new Usuario Extra </span>
+        <span jhiTranslate="dataSurveyApp.usuarioExtra.home.createLabel"> Create a new administrador </span>
       </button>
     </div>
   </h2>
@@ -32,10 +22,10 @@
     <table class="table table-striped" aria-describedby="page-heading">
       <thead>
         <tr>
-          <th scope="col"><span>Rol</span></th>
-          <th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.iconoPerfil">Icono Perfil</span></th>
+          <th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.rol">Rol</span></th>
+          <th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.iconoPerfil">Icono</span></th>
           <th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.nombre">Nombre Usuario</span></th>
-          <th scope="col"><span>Correo electrónico</span></th>
+          <th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.correo">Correo electrónico</span></th>
           <th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.estado">Estado</span></th>
           <!--<th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.plantilla">Plantilla</span></th>-->
           <th scope="col"></th>
@@ -62,19 +52,19 @@
               >{{ last ? '' : ', ' }}
             </span>
           </td>-->
-          <td class="text-right">
+          <td class="text-center">
             <div class="btn-group">
               <button
                 type="submit"
                 [routerLink]="['/usuario-extra', usuarioExtra.id, 'view']"
-                class="btn btn-info btn-sm"
+                class="ds-btn ds-btn--primary btn-sm"
                 data-cy="entityDetailsButton"
               >
                 <fa-icon icon="eye"></fa-icon>
                 <span class="d-none d-md-inline" jhiTranslate="entity.action.view">View</span>
               </button>
-
-              <button type="submit" (click)="delete(usuarioExtra)" class="btn btn-danger btn-sm" data-cy="entityDeleteButton">
+              &nbsp;&nbsp;
+              <button type="submit" (click)="delete(usuarioExtra)" class="ds-btn ds-btn--danger btn-sm" data-cy="entityDeleteButton">
                 <fa-icon icon="times"></fa-icon>
                 <span class="d-none d-md-inline" jhiTranslate="entity.action.delete">Delete</span>
               </button>
diff --git a/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.scss b/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.scss
index 8c65d1f..85a5c1e 100644
--- a/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.scss
+++ b/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.scss
@@ -10,3 +10,7 @@
   list-style: none;
   padding-left: 10px;
 }
+
+.btn-group button {
+  margin: 0 2px;
+}
diff --git a/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.ts b/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.ts
index 0e69222..3588bf3 100644
--- a/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.ts
+++ b/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.ts
@@ -30,9 +30,9 @@ export class UsuarioExtraComponent implements OnInit {
           rolList = user.authorities;
           let a = rolList?.pop();
           if (a == 'ROLE_ADMIN') {
-            user.authorities = ['ADMIN'];
+            user.authorities = ['Admin'];
           } else if (a == 'ROLE_USER') {
-            user.authorities = ['USUARIO'];
+            user.authorities = ['Usuario'];
           }
         });
         this.publicUsers = res;
diff --git a/src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.html b/src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.html
index 3f3437d..a56a4be 100644
--- a/src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.html
+++ b/src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.html
@@ -34,7 +34,15 @@
             The password and its confirmation do not match!
           </div>
 
-          <form name="form" role="form" class="form" (ngSubmit)="register()" [formGroup]="registerForm" *ngIf="!success" autocomplete="off">
+          <form
+            name="form"
+            role="form"
+            class="ds-form"
+            (ngSubmit)="register()"
+            [formGroup]="registerForm"
+            *ngIf="!success"
+            autocomplete="off"
+          >
             <div class="mb-3">
               <div class="form-group">
                 <label for="name" class="form-label">Nombre completo</label>
@@ -86,7 +94,7 @@
 
             <div class="mb-3">
               <div class="form-group">
-                <label for="emailaddress" class="form-label">Correo electrónico</label>
+                <label for="email" class="form-label">Correo electrónico</label>
                 <input
                   type="email"
                   class="form-control"
@@ -239,7 +247,7 @@
               <button
                 type="submit"
                 [disabled]="registerForm.invalid"
-                class="btn btn-primary w-100"
+                class="ds-btn ds-btn--primary w-100"
                 jhiTranslate="register.form.button"
                 data-cy="submit"
               >
diff --git a/src/main/webapp/i18n/es/accesoEncuesta.json b/src/main/webapp/i18n/es/accesoEncuesta.json
index e2d1333..2c3849c 100644
--- a/src/main/webapp/i18n/es/accesoEncuesta.json
+++ b/src/main/webapp/i18n/es/accesoEncuesta.json
@@ -2,8 +2,8 @@
   "dataSurveyApp": {
     "AccesoEncuesta": {
       "null": "",
-      "PUBLIC": "PUBLIC",
-      "PRIVATE": "PRIVATE"
+      "PUBLIC": "Pública",
+      "PRIVATE": "Privada"
     }
   }
 }
diff --git a/src/main/webapp/i18n/es/estadoCategoria.json b/src/main/webapp/i18n/es/estadoCategoria.json
index 89ac025..9423e85 100644
--- a/src/main/webapp/i18n/es/estadoCategoria.json
+++ b/src/main/webapp/i18n/es/estadoCategoria.json
@@ -2,8 +2,8 @@
   "dataSurveyApp": {
     "EstadoCategoria": {
       "null": "",
-      "ACTIVE": "ACTIVA",
-      "INACTIVE": "INACTIVA"
+      "ACTIVE": "Activa",
+      "INACTIVE": "Inactiva"
     }
   }
 }
diff --git a/src/main/webapp/i18n/es/estadoColaborador.json b/src/main/webapp/i18n/es/estadoColaborador.json
index dd777fd..9b7bafa 100644
--- a/src/main/webapp/i18n/es/estadoColaborador.json
+++ b/src/main/webapp/i18n/es/estadoColaborador.json
@@ -2,8 +2,8 @@
   "dataSurveyApp": {
     "EstadoColaborador": {
       "null": "",
-      "PENDING": "PENDING",
-      "ACTIVE": "ACTIVE"
+      "PENDING": "Pendiente",
+      "ACTIVE": "Activo"
     }
   }
 }
diff --git a/src/main/webapp/i18n/es/estadoEncuesta.json b/src/main/webapp/i18n/es/estadoEncuesta.json
index 3763c48..fc1505f 100644
--- a/src/main/webapp/i18n/es/estadoEncuesta.json
+++ b/src/main/webapp/i18n/es/estadoEncuesta.json
@@ -2,10 +2,10 @@
   "dataSurveyApp": {
     "EstadoEncuesta": {
       "null": "",
-      "DRAFT": "DRAFT",
-      "ACTIVE": "ACTIVE",
-      "FINISHED": "FINISHED",
-      "DELETED": "DELETED"
+      "DRAFT": "Borrador",
+      "ACTIVE": "Activa",
+      "FINISHED": "Finalizada",
+      "DELETED": "Eliminada"
     }
   }
 }
diff --git a/src/main/webapp/i18n/es/estadoPlantilla.json b/src/main/webapp/i18n/es/estadoPlantilla.json
index 930f5dc..a574065 100644
--- a/src/main/webapp/i18n/es/estadoPlantilla.json
+++ b/src/main/webapp/i18n/es/estadoPlantilla.json
@@ -2,10 +2,10 @@
   "dataSurveyApp": {
     "EstadoPlantilla": {
       "null": "",
-      "DRAFT": "DRAFT",
-      "ACTIVE": "ACTIVE",
-      "DELETED": "DELETED",
-      "DISABLED": "DISABLED"
+      "DRAFT": "Borrador",
+      "ACTIVE": "Activa",
+      "DELETED": "Eliminada",
+      "DISABLED": "Desactivada"
     }
   }
 }
diff --git a/src/main/webapp/i18n/es/estadoUsuario.json b/src/main/webapp/i18n/es/estadoUsuario.json
index 3bfd9fb..9a2740e 100644
--- a/src/main/webapp/i18n/es/estadoUsuario.json
+++ b/src/main/webapp/i18n/es/estadoUsuario.json
@@ -2,8 +2,8 @@
   "dataSurveyApp": {
     "EstadoUsuario": {
       "null": "",
-      "ACTIVE": "ACTIVE",
-      "SUSPENDED": "SUSPENDED"
+      "ACTIVE": "Activo",
+      "SUSPENDED": "Bloqueado"
     }
   }
 }
diff --git a/src/main/webapp/i18n/es/preguntaCerradaTipo.json b/src/main/webapp/i18n/es/preguntaCerradaTipo.json
index 0df7703..c845192 100644
--- a/src/main/webapp/i18n/es/preguntaCerradaTipo.json
+++ b/src/main/webapp/i18n/es/preguntaCerradaTipo.json
@@ -2,8 +2,8 @@
   "dataSurveyApp": {
     "PreguntaCerradaTipo": {
       "null": "",
-      "SINGLE": "SINGLE",
-      "MULTIPLE": "MULTIPLE"
+      "SINGLE": "Única",
+      "MULTIPLE": "Múltiple"
     }
   }
 }
diff --git a/src/main/webapp/i18n/es/rolColaborador.json b/src/main/webapp/i18n/es/rolColaborador.json
index 1734678..1891000 100644
--- a/src/main/webapp/i18n/es/rolColaborador.json
+++ b/src/main/webapp/i18n/es/rolColaborador.json
@@ -2,8 +2,8 @@
   "dataSurveyApp": {
     "RolColaborador": {
       "null": "",
-      "READ": "READ",
-      "WRITE": "WRITE"
+      "READ": "Lector",
+      "WRITE": "Escritor"
     }
   }
 }
diff --git a/src/main/webapp/i18n/es/usuarioExtra.json b/src/main/webapp/i18n/es/usuarioExtra.json
index 8b97d1a..40c7603 100644
--- a/src/main/webapp/i18n/es/usuarioExtra.json
+++ b/src/main/webapp/i18n/es/usuarioExtra.json
@@ -2,27 +2,29 @@
   "dataSurveyApp": {
     "usuarioExtra": {
       "home": {
-        "title": "Usuario Extras",
+        "title": "Usuarios",
         "refreshListLabel": "Refrescar lista",
-        "createLabel": "Crear nuevo Usuario Extra",
-        "createOrEditLabel": "Crear o editar Usuario Extra",
-        "notFound": "Ningún Usuario Extras encontrado"
+        "createLabel": "Crear nuevo administrador",
+        "createOrEditLabel": "Crear o editar usuario",
+        "notFound": "Ningún usuario encontrado"
       },
-      "created": "Un nuevo Usuario Extra ha sido creado con el identificador {{ param }}",
-      "updated": "Un Usuario Extra ha sido actualizado con el identificador {{ param }}",
-      "deleted": "Un Usuario Extra ha sido eliminado con el identificador {{ param }}",
+      "created": "Un nuevo usuario ha sido creado",
+      "updated": "El usuario con el identificador {{ param }} ha sido actualizado",
+      "deleted": "El usuario con el identificador {{ param }} ha sido eliminado",
       "delete": {
-        "question": "¿Seguro que quiere eliminar Usuario Extra {{ id }}?"
+        "question": "¿Seguro que quiere eliminar el usuario {{ id }}?"
       },
       "detail": {
-        "title": "Usuario Extra"
+        "title": "Usuario"
       },
       "id": "ID",
+      "rol": "Rol",
       "nombre": "Nombre",
-      "iconoPerfil": "Icono Perfil",
-      "fechaNacimiento": "Fecha Nacimiento",
+      "iconoPerfil": "Icono",
+      "fechaNacimiento": "Fecha de Nacimiento",
       "estado": "Estado",
-      "user": "User",
+      "user": "Usuario",
+      "correo": "Correo electrónico",
       "encuesta": "Encuesta",
       "usuarioEncuesta": "Usuario Encuesta",
       "plantilla": "Plantilla"