diff --git a/src/app/models/event.model.ts b/src/app/models/event.model.ts
index ab56668d6..415ee7158 100644
--- a/src/app/models/event.model.ts
+++ b/src/app/models/event.model.ts
@@ -18,10 +18,11 @@ export class Event{
     IsRecurring: boolean;
     AppointmentState: number;
     TimeZone: string;
-    Organizer: string;
+    Organizer: any
     Category: string;
     HasAttachments: boolean;
     EventRecurrence: EventRecurrence;
+    Name?: string
 
     /* public Event(){
         this.EventRecurrence = new EventRecurrence();
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index d1ba2aeaa..4a7972bf8 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -222,7 +222,6 @@
               </div>
             </div>
             
-
             <div  class="fs-timeline flex-grow-1 d-none d-md-block d-md-block text-black  pr-20 width-100 height-100 overflow-y-auto" *ngIf="loggeduser.Profile == 'MDGPR'">
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
 
@@ -372,7 +371,6 @@
         [eventAttendees]="contacts"
       ></app-view-event>
 
-
       <app-event-list
         [style.display]="mobileComponent.showEventList ? 'flex' : 'none'"
         [profile]="profile"
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
index fca2a7dab..f1a3dc817 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
@@ -81,7 +81,7 @@
         <div class="option-desc">Reencaminhar para Area juridica</div>
         <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" style="margin-bottom: 0px !important;" shape="round" >Gerar Diploma </button>
         <!-- <div class="solid"></div> -->
-        <div class="option-desc">Outras opcções</div>
+        <div class="option-desc">Outras opções</div>
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
index 12ebd67c5..bb0c25b6d 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
@@ -25,7 +25,22 @@
         <div class="content-location">
           <p>
             <span class="location">{{loadedEvent.workflowInstanceDataFields.Location}}</span>
-            <span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}">{{loadedEvent.workflowInstanceDataFields.Agenda}}</span>
+
+            <span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial MDGPR' " style="background-color: #ffb703;"> 
+              {{loadedEvent.workflowInstanceDataFields.Agenda}}
+            </span>
+            <span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Pessoal MDGPR' " style="background-color: #f05d5e;"> 
+              {{loadedEvent.workflowInstanceDataFields.Agenda}}
+            </span>
+
+
+            <span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial PR' " style="background-color: #99e47b;"> 
+              {{loadedEvent.workflowInstanceDataFields.Agenda}}
+            </span>
+            <span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Pessoal PR' " style="background-color: #958bfc;"> 
+              {{loadedEvent.workflowInstanceDataFields.Agenda}}
+            </span>
+
           </p>
         </div>
         <div class="content-details">
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index 4a7dab8dc..3af68d03a 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -222,10 +222,7 @@ export class BookMeetingModalPage implements OnInit {
       this.runValidation()
     }
 
-
-
     // if(this.Form.invalid) return false
-    alert('!')
     
     let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
 
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html
index dd0adcb95..35db219f3 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -32,7 +32,22 @@
         <div class="content-location">
           <p>
             <span class="location">{{loadedEvent.workflowInstanceDataFields.Location}}</span>
-            <span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}">{{loadedEvent.workflowInstanceDataFields.Agenda}}</span>
+
+            <span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial MDGPR' " style="background-color: #ffb703;"> 
+              {{loadedEvent.workflowInstanceDataFields.Agenda}}
+            </span>
+            <span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Pessoal MDGPR' " style="background-color: #f05d5e;"> 
+              {{loadedEvent.workflowInstanceDataFields.Agenda}}
+            </span>
+
+
+            <span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial PR' " style="background-color: #99e47b;"> 
+              {{loadedEvent.workflowInstanceDataFields.Agenda}}
+            </span>
+            <span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Pessoal PR' " style="background-color: #958bfc;"> 
+              {{loadedEvent.workflowInstanceDataFields.Agenda}}
+            </span>
+
           </p>
         </div>
         <div class="content-details">
@@ -78,7 +93,7 @@
           </ion-item>
           </ion-list>
         </div>
-  
+        
       </div>
 
     </div>
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts
index c55044ef5..7bd01d909 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts
@@ -65,6 +65,17 @@ export class ApproveEventPage implements OnInit {
   ngOnChanges() {
     this.getTask();
     this.getAttachments();
+
+    setTimeout(()=>{
+      this.getTask();
+      this.getAttachments();
+    }, 4000)
+
+    setTimeout(()=>{
+      this.getTask();
+      this.getAttachments();
+    }, 6000)
+
   }
 
   notImplemented() {
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
index d5ffcf0dd..156a4698d 100644
--- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
@@ -255,6 +255,8 @@ export class EditEventToApprovePage implements OnInit {
 
   async save() {
     
+    this.close()
+
     this.injectValidation()
     this.runValidation()
 
@@ -263,8 +265,6 @@ export class EditEventToApprovePage implements OnInit {
     // set dates to eventProcess object
     this.getDatepickerData()
 
-
-
     this.taskParticipantsCc.forEach( e => {
       e.IsRequired = false
     })
@@ -300,11 +300,9 @@ export class EditEventToApprovePage implements OnInit {
       ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
     }
 
-    console.log(event);
-
     try {
       await  this.eventsService.postEventToApproveEdit(event).toPromise()
-      this.close()
+      
       this.toastService.successMessage('Evento editado');
       
 
diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts
index b3e8a5433..784be3682 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -45,8 +45,6 @@ export class EventListPage implements OnInit {
 
     this.segment = this.loggeduser.Profile;
 
-    //this.LoadToApproveEvents();
-
     const pathname = window.location.pathname
 
     this.router.events.forEach((event) => {
@@ -102,10 +100,11 @@ export class EventListPage implements OnInit {
     this.LoadToApproveEvents();
     console.log('refresh');
     setTimeout(() => {
-        event.target.complete();
-      }, 2000);
+      event.target.complete();
+    }, 2000);
   }
-  close(){
+
+  close() {
     console.log('close')
     this.cloneAllmobileComponent.emit();
   }
diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html
index f7c63440d..e3d6e03b1 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -29,7 +29,20 @@
   <div class="main-content">
     <div class="upper-content">
       <div class="content-location">
-        <p><span class="date">{{loadedEvent.Location}}</span><span class="label">{{loadedEvent.CalendarName}}</span></p>
+
+        <span class="date">{{loadedEvent.Location}}</span>
+        
+        
+        <div *ngIf="loadedEvent.Organizer.Name == 'Agenda do Presidente da República' ">
+          <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' " style="background-color: #99e47b;">{{loadedEvent.CalendarName}}</span>
+          <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #958bfc;">{{loadedEvent.CalendarName}}</span>
+        </div>
+
+        <div *ngIf="loadedEvent.Organizer.Name == 'Agenda do Ministro e Director do Gabinete do PR' ">
+          <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' "  style="background-color: #ffb703;">{{loadedEvent.CalendarName}}</span>
+          <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #f05d5e;">{{loadedEvent.CalendarName}}</span>
+        </div>
+
       </div>
       <div class="content-details">
         <ion-label>