diff --git a/package.json b/package.json
index f11eabe0a..517868044 100644
--- a/package.json
+++ b/package.json
@@ -31,15 +31,15 @@
     "@angular/platform-browser": "~12.1.2",
     "@angular/platform-browser-dynamic": "~12.1.2",
     "@angular/router": "~12.1.2",
-    "@capacitor/android": "^3.3.1",
+    "@capacitor/android": "3.3.1",
     "@capacitor/app": "^1.0.5",
     "@capacitor/camera": "^1.2.0",
     "@capacitor/core": "^3.3.0",
+    "@capacitor/filesystem": "^1.0.6",
     "@capacitor/haptics": "^1.1.2",
+    "@capacitor/ios": "3.3.0",
     "@capacitor/keyboard": "^1.1.2",
     "@capacitor/network": "^1.0.6",
-    "@capacitor/filesystem": "^1.0.6",
-    "@capacitor/ios": "3.3.0",
     "@capacitor/push-notifications": "^1.0.7",
     "@fortawesome/angular-fontawesome": "^0.9.0",
     "@fortawesome/fontawesome-free": "^5.15.3",
diff --git a/src/app/pages/inactivity/inactivity.page.html b/src/app/pages/inactivity/inactivity.page.html
index 5f8114855..976982a56 100644
--- a/src/app/pages/inactivity/inactivity.page.html
+++ b/src/app/pages/inactivity/inactivity.page.html
@@ -7,7 +7,9 @@
       <div class="div-top-header">
 
         <div class="div-logo">
-          <img src='assets/images/logo-bg-removebg-preview.png' alt='logo'>
+          <img style="max-width: 90px;" *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-bg-removebg-preview.png' alt='logo'>
+          <img style="max-width: 80px;" *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/governoangola_A.png' alt='logo'>
+          <img style="max-width: 90px;" *ngIf="ThemeService.currentTheme == 'tribunal'" src='assets/images/theme/tribunal/tribunal-constitucional-logo-removebg-preview.png' alt='logo'>
         </div>
 
       </div>
diff --git a/src/app/pages/inactivity/inactivity.page.ts b/src/app/pages/inactivity/inactivity.page.ts
index 5681c459f..324212a46 100644
--- a/src/app/pages/inactivity/inactivity.page.ts
+++ b/src/app/pages/inactivity/inactivity.page.ts
@@ -7,7 +7,7 @@ import { environment } from 'src/environments/environment';
 import { AlertController } from '@ionic/angular';
 import { NotificationsService } from 'src/app/services/notifications.service';
 import { SessionStore } from 'src/app/store/session.service';
-
+import { ThemeService } from 'src/app/services/theme.service';
 
 @Component({
   selector: 'app-inactivity',
@@ -29,7 +29,8 @@ export class InactivityPage implements OnInit {
     private router: Router,
     private authService: AuthService,
     private toastService: ToastService,
-    public alertController: AlertController
+    public alertController: AlertController,
+    public ThemeService: ThemeService,
   ) {}
 
   loop = false
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 03fa662ba..366af4b43 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -10,7 +10,7 @@ import { SessionStore } from 'src/app/store/session.service';
 import { ClearStoreService } from 'src/app/services/clear-store.service';
 import { ChangeProfileService } from 'src/app/services/change-profile.service';
 import { ThemeService } from 'src/app/services/theme.service';
-import { StorageService } from 'src/app/services/storage.service'
+import { StorageService } from 'src/app/services/storage.service';
 
 @Component({
   selector: 'app-login',
@@ -39,7 +39,8 @@ export class LoginPage implements OnInit {
     private clearStoreService: ClearStoreService,
     private changeProfileService: ChangeProfileService,
     public ThemeService: ThemeService,
-    private storageservice: StorageService
+    private storageservice: StorageService,
+    
   ) {}
 
   ngOnInit() {
diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts
index 8c3948e42..c1e6c663c 100644
--- a/src/app/services/agenda/list-box.service.ts
+++ b/src/app/services/agenda/list-box.service.ts
@@ -94,12 +94,12 @@ export class ListBoxService {
 					if (diffDays >= 1) {
 						
 						const StartEvent =  this.transForm(event, {startMany: true,endMany: false,	middle: false, profile})
-            
-            if(this.push(event, selectedDate)) days[day].push(StartEvent)
+						
+						if(this.push(event, selectedDate)) days[day].push(StartEvent)
 						
 						let i = 1;
 						
-            // create event between date
+						// create event between date
 						while (startDate.getFullYear() !=  endDate.getFullYear() || 
 							startDate.getMonth() != endDate.getMonth() ||
 							startDate.getDate() != endDate.getDate()) {
@@ -132,12 +132,15 @@ export class ListBoxService {
 						}
 
 					} else {
+
+
 						if(this.push(event, selectedDate)) days[day].push(event)
 					}
 				} else {
+
 					if(this.push(event, selectedDate)) days[day].push(event)
 				}
-			} 
+			}
 
       if(this.push(event, selectedDate)) days[day].push(event)
 
@@ -158,8 +161,12 @@ export class ListBoxService {
 
 
   push(event: any, selectedDate: Date) {
+		
+		console.log(new Date(event.start).getDate(), selectedDate.getDate(), new Date(event.start).getDate() >= selectedDate.getDate())
+
     return  new Date(event.start).getMonth() == selectedDate.getMonth() &&
-            new Date(event.start).getFullYear() == selectedDate.getFullYear()
+			new Date(event.start).getFullYear() == selectedDate.getFullYear() && 
+			new Date(event.start).getDate() >= selectedDate.getDate()
   }
 
 	encapsulation(eventsList:EventListStore[], profile): CustomCalendarEvent[] {
diff --git a/src/assets/images/theme/gov/tribunal-constitucional-logo-removebg-preview.png b/src/assets/images/theme/gov/tribunal-constitucional-logo-removebg-preview.png
new file mode 100644
index 000000000..5ab14f907
Binary files /dev/null and b/src/assets/images/theme/gov/tribunal-constitucional-logo-removebg-preview.png differ