diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 0c858d0d9..ec5221a8f 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -514,6 +514,7 @@ export class AgendaPage implements OnInit {
             this.CalendarStore.pushEvent(response, 'md');
 
             console.log('CALENDAR STORE', this.CalendarStore.eventSource)
+            this.listToPresent = this.CalendarStore.eventSource
             this.trasnformData(response, 'md');
 
             this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
@@ -542,7 +543,9 @@ export class AgendaPage implements OnInit {
           this.CalendarStore.removeRange(startTime, endTime, 'pr')
           // calendar
           this.CalendarStore.pushEvent(response, 'pr');
-          this.trasnformData(response, 'pr');
+
+          this.listToPresent = this.CalendarStore.eventSource
+
 
           this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
@@ -572,7 +575,8 @@ export class AgendaPage implements OnInit {
             // startTime = 1, endTime = 31
             this.CalendarStore.removeRange(startTime, endTime, 'pr')
             this.CalendarStore.pushEvent(response, 'pr');
-            this.trasnformData(response, 'pr')
+
+            this.listToPresent = this.CalendarStore.eventSource
 
 
             this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
@@ -611,7 +615,8 @@ export class AgendaPage implements OnInit {
 
           // loop
           this.CalendarStore.pushEvent(eventsList, 'md');
-          this.trasnformData(response, 'md')
+
+          this.listToPresent = this.CalendarStore.eventSource
 
           this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
@@ -643,10 +648,12 @@ export class AgendaPage implements OnInit {
           let eventsList = response;
 
           // clear the current month only
-          /* this.CalendarStore.removeRange(startTime, endTime, 'pr')
+          this.CalendarStore.removeRange(startTime, endTime, 'pr')
+
+
+          this.CalendarStore.pushEvent(eventsList, 'pr');
+          this.listToPresent = this.CalendarStore.eventSource
 
-          this.CalendarStore.pushEvent(eventsList, 'pr'); */
-          this.trasnformData(response, 'pr')
 
           this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
@@ -692,7 +699,7 @@ export class AgendaPage implements OnInit {
           this.CalendarStore.removeRange(startTime, endTime, 'pr')
 
           this.CalendarStore.pushEvent(eventsList, 'pr');
-          this.trasnformData(eventsList, 'pr')
+          this.listToPresent = this.CalendarStore.eventSource
 
           this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts
index 8cd58e2f1..368bdc781 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -41,13 +41,11 @@ export class EditEventPage implements OnInit {
   recurringTypes: any;
   selectedRecurringType: any;
 
-
   loadedEventAttachments: Attachment[] = [];
   taskParticipants: any = [];
   taskParticipantsCc: any = [];
   adding: "intervenient" | "CC" = "intervenient";
 
-
   showAttendees = false;
 
   constructor(
@@ -196,19 +194,22 @@ export class EditEventPage implements OnInit {
     this.postEvent.EventRecurrence.Type = this.selectedRecurringType;
 
     this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
-      if(this.initCalendarName != this.postEvent.CalendarName){
+
+      if(this.initCalendarName != this.postEvent.CalendarName) {
+
         let body = {
           "EventId": this.postEvent.EventId,
           "CalendarDestinationName": this.postEvent.CalendarName,
-      }
-      try {
-        await this.eventsService.changeAgenda(body).toPromise();
-      } catch (error) {}
-      finally {
-        this.goBack();
+        }
+        try {
+          await this.eventsService.changeAgenda(body).toPromise();
+        } catch (error) {}
+        finally {
+          this.goBack();
+        }
+  
       }
 
-      }
       this.toastService.successMessage();
 
     }, error => {
diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss
index 44837e303..828a438d8 100644
--- a/src/app/pages/agenda/view-event/view-event.page.scss
+++ b/src/app/pages/agenda/view-event/view-event.page.scss
@@ -198,7 +198,7 @@ ion-menu{
         .attach-title-item{
           width: 100%;
           font-size: 15px;
-          color:var(--title-text-color);
+          color: var(--title-text-color);
         }
         /* SPAN */
         .span-left{
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.scss b/src/app/shared/agenda/edit-event/edit-event.page.scss
index 9eb41d3a8..4ef1fdcce 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.scss
+++ b/src/app/shared/agenda/edit-event/edit-event.page.scss
@@ -117,7 +117,7 @@ ion-content{
       .attach-title-item{
         width: 100%;
         font-size: 15px;
-        color:#0d89d1;
+        color: var(--title-text-color);
       }
       /* SPAN */
       .span-left{
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index f66e97819..609cc47d9 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -14,7 +14,6 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ParticipantsPipe } from 'src/app/pipes/participants.pipe';
 import { ThemeService } from 'src/app/services/theme.service'
 
-
 @Component({
   selector: 'app-edit-event',
   templateUrl: './edit-event.page.html',
@@ -127,6 +126,7 @@ export class EditEventPage implements OnInit {
       }
     }
 
+    this.initCalendarName = this.postEvent.CalendarName;
 
     this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments)
 
diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss
index 4f044aa5f..039695b83 100644
--- a/src/app/shared/agenda/view-event/view-event.page.scss
+++ b/src/app/shared/agenda/view-event/view-event.page.scss
@@ -176,7 +176,7 @@ ion-content{
         .attach-title-item{
           width: 100%;
           font-size: 15px;
-          color:#0d89d1;
+          color:var(--title-text-color);
         }
         /* SPAN */
         .span-left{
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts
index bd0343cf6..b87751e16 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -216,19 +216,19 @@ export class DespachosOptionsPage implements OnInit {
           Attachments: DocumentToSave,
         }
 
-        if(actionName == 'Executado'){
+        if(actionName == 'Executado') {
           await this.executado(res.data.note, docs);
         }
         else if(actionName == 'Arquivar'){
          await this.arquivar(res.data.note, docs);
         }
-        else if(actionName == 'Gerar Diploma'){
+        else if(actionName == 'Gerar Diploma') {
           await this.generateDiploma(res.data.note, docs);
         }
-        else if(actionName == 'Concluido'){
+        else if(actionName == 'Concluido') {
           //this.concluir(res.data.note, docs);
         }
-        else if(actionName == 'Reexecução'){
+        else if(actionName == 'Reexecução') {
           await this.reexecutar(res.data.note, docs);
         }
         this.goBack();
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html
index c830407f6..57bd27f4e 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html
@@ -28,8 +28,8 @@
     </div>
     <div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
       <div class="flex-grow-1">
-        <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >11Efetuar Despacho</button>
-        <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >11Efetuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
         <div class="solid"></div>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
diff --git a/src/index.html b/src/index.html
index 2d40cbfe9..2d125ea04 100644
--- a/src/index.html
+++ b/src/index.html
@@ -11,7 +11,7 @@
   <script type="text/javascript" src="node_modules/ibm-mfp-web-sdk/ibmmfpf.js"></script> -->
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.9.359/pdf.min.js" integrity="sha512-U5C477Z8VvmbYAoV4HDq17tf4wG6HXPC6/KM9+0/wEXQQ13gmKY2Zb0Z2vu0VNUWch4GlJ+Tl/dfoLOH4i2msw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
   
- <!--  <script  src="node_modules/ibm-mfp-web-sdk/ibmmfpf.js"></script>
+  <!--  <script  src="node_modules/ibm-mfp-web-sdk/ibmmfpf.js"></script>
   <script  src="node_modules/ibm-mfp-web-sdk/ibmmfpfanalytics.js"></script> -->
   <!-- <script src="assets/js/index.js"></script> -->
   <link rel="manifest" href="assets/manifest.json">
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 84d552a9d..79c7281e0 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -715,6 +715,10 @@ body {
       }
     }
   }
+
+  .desk{
+    color:  black !important;
+  }
 }
 
 .gov {
@@ -794,6 +798,10 @@ body {
       }
     }
   }
+
+  .desk{
+    color:  black !important;
+  }
 }
 
 // blue
@@ -913,6 +921,7 @@ body {
         }
     }
   }
+
 }
 
 .font-awesome {