diff --git a/.idea/.name b/.idea/.name
index 9cc5b2b..2baef0e 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-GISINGv.3
\ No newline at end of file
+GisingApp
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 33cc4c8..83556f7 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-01-17T01:24:02.921736700Z">
+        <DropdownSelection timestamp="2026-03-11T11:22:48.189390300Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=U4YYD22315502349" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\maila\.android\avd\Medium_Phone.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c42e547..817c264 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -4,16 +4,14 @@ plugins {
 
 android {
     namespace = "com.example.gisingv3"
-    compileSdk {
-        version = release(36)
-    }
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.example.gisingv3"
         minSdk = 24
         targetSdk = 36
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 41
+        versionName = "4.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -36,7 +34,7 @@ android {
 dependencies {
     implementation(libs.appcompat)
     implementation(libs.material)
-    implementation("com.google.code.gson:gson:2.10.1") // Added GSON for JSON serialization
+    implementation("com.google.code.gson:gson:2.10.1")
     testImplementation(libs.junit)
     androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)
diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm
index b821ac2..266a2b7 100644
Binary files a/app/release/baselineProfiles/0/app-release.dm and b/app/release/baselineProfiles/0/app-release.dm differ
diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm
index 174b0ff..e24ad3a 100644
Binary files a/app/release/baselineProfiles/1/app-release.dm and b/app/release/baselineProfiles/1/app-release.dm differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index bdb1b54..042bdf0 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 1,
-      "versionName": "1.0",
+      "versionCode": 41,
+      "versionName": "4.1",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e2f23e2..f161fb9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
     <application
         android:allowBackup="true"
@@ -40,6 +41,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
         
diff --git a/app/src/main/java/com/example/gisingv3/AddAlarmActivity.java b/app/src/main/java/com/example/gisingv3/AddAlarmActivity.java
index 86950db..a470a2e 100644
--- a/app/src/main/java/com/example/gisingv3/AddAlarmActivity.java
+++ b/app/src/main/java/com/example/gisingv3/AddAlarmActivity.java
@@ -140,7 +140,8 @@ private void updateTimeDisplay() {
         String amPm = selectedHour >= 12 ? "PM" : "AM";
         int hour12 = selectedHour % 12;
         if (hour12 == 0) hour12 = 12;
-        tvTimeInput.setText(String.format(Locale.getDefault(), "%02d:%02d %s", hour12, selectedMinute, amPm));
+        // Use %d instead of %02d for hour to remove leading zero
+        tvTimeInput.setText(String.format(Locale.getDefault(), "%d:%02d %s", hour12, selectedMinute, amPm));
     }
     
     private void updateDaySelection(int index) {
diff --git a/app/src/main/java/com/example/gisingv3/Alarm.java b/app/src/main/java/com/example/gisingv3/Alarm.java
index ce7a389..3b8faed 100644
--- a/app/src/main/java/com/example/gisingv3/Alarm.java
+++ b/app/src/main/java/com/example/gisingv3/Alarm.java
@@ -30,7 +30,6 @@ public Alarm(int id, int hour, int minute, String challengeType, int difficultyL
     public boolean isEnabled() { return isEnabled; }
     public void setEnabled(boolean enabled) { isEnabled = enabled; }
     public boolean[] getDaysSelected() { 
-        // Safety check for older saved data
         if (daysSelected == null) return new boolean[7];
         return daysSelected; 
     }
@@ -39,7 +38,8 @@ public String getTimeString() {
         String amPm = hour >= 12 ? "PM" : "AM";
         int hour12 = hour % 12;
         if (hour12 == 0) hour12 = 12;
-        return String.format(Locale.getDefault(), "%02d:%02d %s", hour12, minute, amPm);
+        // Use %d instead of %02d for hour to remove the leading zero
+        return String.format(Locale.getDefault(), "%d:%02d %s", hour12, minute, amPm);
     }
 
     public String getDaysDisplay() {
diff --git a/app/src/main/java/com/example/gisingv3/AlarmReceiver.java b/app/src/main/java/com/example/gisingv3/AlarmReceiver.java
index 452d678..259c544 100644
--- a/app/src/main/java/com/example/gisingv3/AlarmReceiver.java
+++ b/app/src/main/java/com/example/gisingv3/AlarmReceiver.java
@@ -11,6 +11,7 @@
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Build;
+import android.os.PowerManager;
 import androidx.core.app.NotificationCompat;
 import java.util.Calendar;
 import java.util.List;
@@ -20,15 +21,19 @@ public class AlarmReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
+        // Use a WakeLock to ensure the CPU stays awake while we process the alarm
+        PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+        PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "GisingApp:AlarmWakeLock");
+        wakeLock.acquire(10000); // Hold for 10 seconds
+
         int alarmId = intent.getIntExtra("alarm_id", -1);
         String challengeType = intent.getStringExtra("challenge_type");
         int difficulty = intent.getIntExtra("difficulty", 1);
 
         createNotificationChannel(context);
 
-        // Prepare the ring activity intent
         Intent ringIntent = new Intent(context, AlarmRingActivity.class);
-        ringIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        ringIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_USER_ACTION);
         ringIntent.putExtra("alarm_id", alarmId);
         ringIntent.putExtra("challenge_type", challengeType);
         ringIntent.putExtra("difficulty", difficulty);
@@ -55,14 +60,13 @@ public void onReceive(Context context, Intent intent) {
 
         NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         if (notificationManager != null) {
-            // Use unique alarmId to allow multiple simultaneous alarms
             notificationManager.notify(alarmId, builder.build());
         }
         
-        // Start activity
+        // Force the activity to the front
         context.startActivity(ringIntent);
 
-        // Reschedule for next occurrence if it's a repeating alarm
+        // Reschedule logic
         rescheduleNextOccurrence(context, alarmId);
     }
 
@@ -72,10 +76,8 @@ private void rescheduleNextOccurrence(Context context, int alarmId) {
 
         for (Alarm alarm : alarmList) {
             if (alarm.getId() == alarmId && alarm.isEnabled()) {
-                // If it's a repeating alarm, calculate and schedule the next time
                 boolean hasDays = false;
                 for (boolean d : alarm.getDaysSelected()) if (d) hasDays = true;
-
                 if (hasDays) {
                     scheduleNext(context, alarm);
                 }
@@ -95,24 +97,19 @@ private void scheduleNext(Context context, Alarm alarm) {
         PendingIntent pendingIntent = PendingIntent.getBroadcast(context, alarm.getId(), intent,
                 PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
-        // Logic to find next trigger time (similar to MainActivity)
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.HOUR_OF_DAY, alarm.getHour());
         calendar.set(Calendar.MINUTE, alarm.getMinute());
         calendar.set(Calendar.SECOND, 0);
         calendar.set(Calendar.MILLISECOND, 0);
 
-        long now = System.currentTimeMillis();
-        boolean[] days = alarm.getDaysSelected();
-
-        // Start looking from "tomorrow" relative to the current alarm trigger
         calendar.add(Calendar.DAY_OF_YEAR, 1);
 
         for (int i = 0; i < 7; i++) {
             int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
             int dayIndex = dayOfWeek - 1;
 
-            if (days[dayIndex]) {
+            if (alarm.getDaysSelected()[dayIndex]) {
                 if (alarmManager != null) {
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                         if (alarmManager.canScheduleExactAlarms()) {
@@ -148,17 +145,13 @@ private void createNotificationChannel(Context context) {
                     .build();
             
             Uri alarmSound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM);
-            if (alarmSound == null) {
-                alarmSound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE);
-            }
+            if (alarmSound == null) alarmSound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE);
             
             channel.setSound(alarmSound, audioAttributes);
             channel.enableVibration(true);
             channel.setLockscreenVisibility(android.app.Notification.VISIBILITY_PUBLIC);
             
-            if (manager != null) {
-                manager.createNotificationChannel(channel);
-            }
+            if (manager != null) manager.createNotificationChannel(channel);
         }
     }
 }
diff --git a/app/src/main/java/com/example/gisingv3/AlarmRingActivity.java b/app/src/main/java/com/example/gisingv3/AlarmRingActivity.java
index 6f6c4d3..0b0b503 100644
--- a/app/src/main/java/com/example/gisingv3/AlarmRingActivity.java
+++ b/app/src/main/java/com/example/gisingv3/AlarmRingActivity.java
@@ -1,5 +1,6 @@
 package com.example.gisingv3;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.appcompat.app.AppCompatActivity;
 import android.app.KeyguardManager;
 import android.app.NotificationManager;
@@ -15,6 +16,7 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.Vibrator;
 import android.text.InputFilter;
 import android.view.View;
@@ -32,7 +34,6 @@
 
 public class AlarmRingActivity extends AppCompatActivity implements SensorEventListener {
 
-    private TextView tvRingTime;
     private TextView tvMathQuestion;
     private EditText etMathAnswer;
     private Button btnStartOrSolveChallenge;
@@ -77,7 +78,7 @@ protected void onCreate(Bundle savedInstanceState) {
         hideSystemUI();
         setContentView(R.layout.activity_alarm_ring);
         
-        tvRingTime = findViewById(R.id.tvRingTime);
+        TextView tvRingTime = findViewById(R.id.tvRingTime);
         tvMathQuestion = findViewById(R.id.tvMathQuestion);
         etMathAnswer = findViewById(R.id.etMathAnswer);
         btnStartOrSolveChallenge = findViewById(R.id.btnSolveChallenge);
@@ -95,7 +96,7 @@ protected void onCreate(Bundle savedInstanceState) {
             }
         });
 
-        SimpleDateFormat sdf = new SimpleDateFormat("hh:mm a", Locale.getDefault());
+        SimpleDateFormat sdf = new SimpleDateFormat("h:mm a", Locale.getDefault());
         tvRingTime.setText(sdf.format(new Date()));
 
         if (getIntent() != null) {
@@ -107,17 +108,22 @@ protected void onCreate(Bundle savedInstanceState) {
         setupChallengeUI();
         btnStartOrSolveChallenge.setOnClickListener(v -> startChallenge());
         startAlarmEffects();
+
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                Toast.makeText(AlarmRingActivity.this, "Finish the challenge!", Toast.LENGTH_SHORT).show();
+            }
+        });
     }
 
     private void setupChallengeUI() {
-        // Update Stars
         StringBuilder stars = new StringBuilder();
         for (int i = 0; i < difficulty; i++) {
             stars.append("★");
         }
         tvDifficultyStars.setText(stars.toString());
 
-        // Update Label and Icon
         if ("Shake Phone".equals(challengeType)) {
             tvChallengeTypeLabel.setText("Shake Phone Challenge");
             ivChallengeIcon.setImageResource(R.drawable.phone_shake);
@@ -136,7 +142,8 @@ private void startChallenge() {
             tvMathQuestion.setVisibility(View.VISIBLE);
             tvChallengePrompt.setVisibility(View.VISIBLE);
             requiredShakes = 10 * difficulty;
-            tvChallengePrompt.setText("Shakes remaining: " + requiredShakes);
+            String prompt = "Shakes remaining: " + requiredShakes;
+            tvChallengePrompt.setText(prompt);
             
             sensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
             if (sensorManager != null) {
@@ -146,7 +153,6 @@ private void startChallenge() {
                 }
             }
         } else {
-            // Math Problem
             btnStartOrSolveChallenge.setText("Submit Answer");
             btnStartOrSolveChallenge.setOnClickListener(v -> checkAnswer());
             
@@ -186,7 +192,7 @@ private void startAlarmEffects() {
             mediaPlayer.setLooping(true);
             mediaPlayer.prepare();
             mediaPlayer.start();
-        } catch (Exception e) {}
+        } catch (Exception ignored) {}
 
         vibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE);
         if (vibrator != null) {
@@ -202,7 +208,8 @@ private void generateMathProblem() {
                 a = random.nextInt(10) + 1;
                 b = random.nextInt(10) + 1;
                 correctAnswer = a + b;
-                tvMathQuestion.setText(a + " + " + b + " = ?");
+                String q1 = a + " + " + b + " = ?";
+                tvMathQuestion.setText(q1);
                 break;
             case 2:
                 a = random.nextInt(20) + 10;
@@ -210,10 +217,12 @@ private void generateMathProblem() {
                 c = random.nextInt(10) + 1;
                 if (random.nextBoolean()) {
                     correctAnswer = a + b - c;
-                    tvMathQuestion.setText("(" + a + " + " + b + ") - " + c + " = ?");
+                    String q2 = "(" + a + " + " + b + ") - " + c + " = ?";
+                    tvMathQuestion.setText(q2);
                 } else {
                     correctAnswer = a - b + c;
-                    tvMathQuestion.setText("(" + a + " - " + b + ") + " + c + " = ?");
+                    String q2 = "(" + a + " - " + b + ") + " + c + " = ?";
+                    tvMathQuestion.setText(q2);
                 }
                 break;
             case 3:
@@ -222,21 +231,24 @@ private void generateMathProblem() {
                 c = random.nextInt(40) + 1;
                 if (random.nextBoolean()) {
                     correctAnswer = (a * b) + c;
-                    tvMathQuestion.setText("(" + a + " × " + b + ") + " + c + " = ?");
+                    String q3 = "(" + a + " × " + b + ") + " + c + " = ?";
+                    tvMathQuestion.setText(q3);
                 } else {
                     while ((a * b) < c) {
                         a = random.nextInt(10) + 2;
                         b = random.nextInt(10) + 2;
                     }
                     correctAnswer = (a * b) - c;
-                    tvMathQuestion.setText("(" + a + " × " + b + ") - " + c + " = ?");
+                    String q3 = "(" + a + " × " + b + ") - " + c + " = ?";
+                    tvMathQuestion.setText(q3);
                 }
                 break;
             default:
                 a = random.nextInt(10) + 1;
                 b = random.nextInt(10) + 1;
                 correctAnswer = a + b;
-                tvMathQuestion.setText(a + " + " + b + " = ?");
+                String qd = a + " + " + b + " = ?";
+                tvMathQuestion.setText(qd);
                 break;
         }
     }
@@ -275,7 +287,7 @@ private void stopAlarm() {
         if (mediaPlayer != null) {
             try {
                 if (mediaPlayer.isPlaying()) mediaPlayer.stop();
-            } catch (Exception e) {}
+            } catch (Exception ignored) {}
             mediaPlayer.release();
             mediaPlayer = null;
         }
@@ -295,7 +307,10 @@ public void onSensorChanged(SensorEvent event) {
                 lastShakeTime = now;
                 shakeCount++;
                 if (shakeCount >= requiredShakes) onChallengeSolved();
-                else tvChallengePrompt.setText("Shakes remaining: " + (requiredShakes - shakeCount));
+                else {
+                    String prompt = "Shakes remaining: " + (requiredShakes - shakeCount);
+                    tvChallengePrompt.setText(prompt);
+                }
             }
         }
     }
@@ -304,8 +319,27 @@ public void onSensorChanged(SensorEvent event) {
     public void onAccuracyChanged(Sensor sensor, int accuracy) {}
 
     @Override
-    public void onBackPressed() {
-        Toast.makeText(this, "Finish the challenge!", Toast.LENGTH_SHORT).show();
+    protected void onPause() {
+        super.onPause();
+        if (!isChallengeSolved) {
+            new Handler().postDelayed(() -> {
+                if (!isChallengeSolved) {
+                    Intent intent = new Intent(this, AlarmRingActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_NEW_TASK);
+                    startActivity(intent);
+                }
+            }, 500);
+        }
+    }
+
+    @Override
+    protected void onUserLeaveHint() {
+        super.onUserLeaveHint();
+        if (!isChallengeSolved) {
+            Intent intent = new Intent(this, AlarmRingActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        }
     }
 
     @Override
diff --git a/app/src/main/java/com/example/gisingv3/MainActivity.java b/app/src/main/java/com/example/gisingv3/MainActivity.java
index 756974e..347183e 100644
--- a/app/src/main/java/com/example/gisingv3/MainActivity.java
+++ b/app/src/main/java/com/example/gisingv3/MainActivity.java
@@ -3,18 +3,23 @@
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import android.Manifest;
+import android.annotation.SuppressLint;
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.PowerManager;
 import android.provider.Settings;
 import android.view.View;
 import android.widget.TextView;
@@ -47,6 +52,13 @@ public void run() {
         }
     };
 
+    private final ActivityResultLauncher<String> requestPermissionLauncher =
+            registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
+                if (!isGranted) {
+                    Toast.makeText(this, "Notification permission is required for alarms to show.", Toast.LENGTH_LONG).show();
+                }
+            });
+
     private final ActivityResultLauncher<Intent> alarmActivityLauncher = registerForActivityResult(
             new ActivityResultContracts.StartActivityForResult(),
             result -> {
@@ -74,6 +86,9 @@ public void run() {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        // Force the app to stay in Light Mode and remove all dark mode related logic
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+        
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
@@ -124,9 +139,8 @@ public void onItemClick(Alarm alarm, int position) {
         rvAlarms.setAdapter(adapter);
 
         updateEmptyState();
-        checkExactAlarmPermission();
+        checkPermissions();
         
-        // Start live clock
         timeHandler.post(timeRunnable);
 
         btnAddAlarm.setOnClickListener(view -> {
@@ -136,25 +150,45 @@ public void onItemClick(Alarm alarm, int position) {
         });
     }
 
-    private void updateCurrentTimeAndDate() {
-        if (tvCurrentTime == null || tvCurrentDate == null) return;
-        
-        SimpleDateFormat timeFormat = new SimpleDateFormat("hh:mm a", Locale.getDefault());
-        SimpleDateFormat dateFormat = new SimpleDateFormat("EEEE, MMMM d", Locale.getDefault());
-        
-        Date now = new Date();
-        tvCurrentTime.setText(timeFormat.format(now).toUpperCase());
-        tvCurrentDate.setText(dateFormat.format(now));
-    }
+    private void checkPermissions() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (androidx.core.content.ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
+                requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS);
+            }
+        }
 
-    private void checkExactAlarmPermission() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             AlarmManager alarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
             if (alarmManager != null && !alarmManager.canScheduleExactAlarms()) {
                 Intent intent = new Intent(Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM);
                 startActivity(intent);
+                Toast.makeText(this, "Please allow Exact Alarms for GisingApp to work correctly", Toast.LENGTH_LONG).show();
             }
         }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+            if (pm != null && !pm.isIgnoringBatteryOptimizations(getPackageName())) {
+                @SuppressLint("BatteryLife")
+                Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+                intent.setData(Uri.parse("package:" + getPackageName()));
+                try {
+                    startActivity(intent);
+                } catch (Exception e) {
+                    Intent fallback = new Intent(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS);
+                    startActivity(fallback);
+                }
+            }
+        }
+    }
+
+    private void updateCurrentTimeAndDate() {
+        if (tvCurrentTime == null || tvCurrentDate == null) return;
+        SimpleDateFormat timeFormat = new SimpleDateFormat("h:mm a", Locale.getDefault());
+        SimpleDateFormat dateFormat = new SimpleDateFormat("EEEE, MMMM d", Locale.getDefault());
+        Date now = new Date();
+        tvCurrentTime.setText(timeFormat.format(now).toUpperCase());
+        tvCurrentDate.setText(dateFormat.format(now));
     }
 
     private void saveAlarms() {
@@ -194,16 +228,12 @@ private void scheduleAlarm(Alarm alarm) {
 
         long triggerTime = getNextTriggerTime(alarm);
 
+        Intent showIntent = new Intent(this, MainActivity.class);
+        PendingIntent pShowIntent = PendingIntent.getActivity(this, 0, showIntent, PendingIntent.FLAG_IMMUTABLE);
+        AlarmManager.AlarmClockInfo alarmClockInfo = new AlarmManager.AlarmClockInfo(triggerTime, pShowIntent);
+        
         try {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                if (alarmManager.canScheduleExactAlarms()) {
-                    alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, triggerTime, pendingIntent);
-                } else {
-                    alarmManager.setExact(AlarmManager.RTC_WAKEUP, triggerTime, pendingIntent);
-                }
-            } else {
-                alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, triggerTime, pendingIntent);
-            }
+            alarmManager.setAlarmClock(alarmClockInfo, pendingIntent);
         } catch (SecurityException e) {
             Toast.makeText(this, "Permission required for exact alarms", Toast.LENGTH_LONG).show();
         }
@@ -234,13 +264,11 @@ private long getNextTriggerTime(Alarm alarm) {
         for (int i = 0; i < 7; i++) {
             int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
             int dayIndex = dayOfWeek - 1;
-            
             if (days[dayIndex] && calendar.getTimeInMillis() > now) {
                 return calendar.getTimeInMillis();
             }
             calendar.add(Calendar.DAY_OF_YEAR, 1);
         }
-        
         return calendar.getTimeInMillis();
     }
 
@@ -250,10 +278,8 @@ private void cancelAlarm(Alarm alarm) {
 
         Intent intent = new Intent(this, AlarmReceiver.class);
         intent.setData(Uri.parse("alarm://" + alarm.getId()));
-        
         PendingIntent pendingIntent = PendingIntent.getBroadcast(this, alarm.getId(), intent, 
                 PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
-        
         alarmManager.cancel(pendingIntent);
     }
 
diff --git a/app/src/main/res/color/switch_thumb_color.xml b/app/src/main/res/color/switch_thumb_color.xml
new file mode 100644
index 0000000..46f1147
--- /dev/null
+++ b/app/src/main/res/color/switch_thumb_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#00D1B2" android:state_checked="true" />
+    <item android:color="#BDBDBD" android:state_checked="false" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/switch_track_color.xml b/app/src/main/res/color/switch_track_color.xml
new file mode 100644
index 0000000..7fa0549
--- /dev/null
+++ b/app/src/main/res/color/switch_track_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.5" android:color="#00D1B2" android:state_checked="true" />
+    <item android:alpha="0.3" android:color="#000000" android:state_checked="false" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_sun.xml b/app/src/main/res/drawable/ic_sun.xml
new file mode 100644
index 0000000..a4446d1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sun.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5S14.76,7 12,7zM2,13h2c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1H2c-0.55,0 -1,0.45 -1,1S1.45,13 2,13zM20,13h2c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1h-2c-0.55,0 -1,0.45 -1,1S19.45,13 20,13zM11,2v2c0,0.55 0.45,1 1,1s1,-0.45 1,-1V2c0,-0.55 -0.45,-1 -1,-1S11,1.45 11,2zM11,20v2c0,0.55 0.45,1 1,1s1,-0.45 1,-1v-2c0,-0.55 -0.45,-1 -1,-1S11,19.45 11,20zM5.99,4.58c-0.39,-0.39 -1.03,-0.39 -1.41,0s-0.39,1.03 0,1.41l1.06,1.06c0.39,0.39 1.03,0.39 1.41,0s0.39,-1.03 0,-1.41L5.99,4.58zM18.36,16.95c-0.39,-0.39 -1.03,-0.39 -1.41,0s-0.39,1.03 0,1.41l1.06,1.06c0.39,0.39 1.03,0.39 1.41,0s0.39,-1.03 0,-1.41L18.36,16.95zM18.36,5.64c0.39,-0.39 0.39,-1.03 0,-1.41s-1.03,-0.39 -1.41,0l-1.06,1.06c-0.39,0.39 -0.39,1.03 0,1.41s1.03,0.39 1.41,0L18.36,5.64zM7.05,18.36c0.39,-0.39 0.39,-1.03 0,-1.41s-1.03,-0.39 -1.41,0l-1.06,1.06c-0.39,0.39 -0.39,1.03 0,1.41s1.03,0.39 1.41,0L7.05,18.36z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 77a8519..e2ae5bc 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,22 +10,24 @@
     <View
         android:id="@+id/headerBg"
         android:layout_width="0dp"
-        android:layout_height="320dp"
+        android:layout_height="0dp"
         android:background="#4364F7"
+        app:layout_constraintHeight_percent="0.38"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <!-- Gising! Greeting (Now at the top) -->
+    <!-- Gising! Greeting -->
     <TextView
         android:id="@+id/tvGreeting"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="48dp"
+        android:layout_marginTop="24dp"
         android:fontFamily="sans-serif-medium"
         android:text="Gising!"
         android:textColor="#FFFFFF"
         android:textSize="24sp"
+        android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -42,38 +44,48 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvGreeting" />
 
-    <!-- Current Time & Date (Now below the greeting) -->
+    <!-- Current Time -->
     <TextView
         android:id="@+id/tvCurrentTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
+        android:layout_width="0dp"
+        android:layout_height="100dp"
+        android:layout_marginHorizontal="24dp"
         android:fontFamily="sans-serif-thin"
         android:text="11:59 PM"
         android:textColor="#FFFFFF"
-        android:textSize="64sp"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:gravity="center"
+        android:maxLines="1"
+        android:includeFontPadding="false"
+        app:autoSizeTextType="uniform"
+        app:autoSizeMinTextSize="32sp"
+        app:autoSizeMaxTextSize="80sp"
+        app:layout_constraintTop_toBottomOf="@id/tvGreetingSub"
+        app:layout_constraintBottom_toTopOf="@+id/tvCurrentDate"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvGreetingSub" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
 
+    <!-- Current Date -->
     <TextView
         android:id="@+id/tvCurrentDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="2dp"
         android:text="Sunday, March 8"
         android:textColor="#E0E0E0"
         android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="@id/headerBg"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvCurrentTime" />
+        app:layout_constraintTop_toBottomOf="@id/tvCurrentTime"
+        android:layout_marginBottom="16dp" />
 
     <!-- Alarm List -->
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvAlarms"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:padding="16dp"
+        android:padding="12dp"
         android:clipToPadding="false"
         app:layout_constraintTop_toBottomOf="@id/headerBg"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -87,11 +99,12 @@
         android:text="No alarms yet"
         android:textSize="18sp"
         android:textColor="#888888"
-        app:layout_constraintTop_toBottomOf="@id/headerBg"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="@id/rvAlarms"
+        app:layout_constraintBottom_toBottomOf="@id/rvAlarms"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
+    <!-- Add Alarm FAB -->
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/btnAddAlarm"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/item_alarm.xml b/app/src/main/res/layout/item_alarm.xml
index c4d1e5b..25d7239 100644
--- a/app/src/main/res/layout/item_alarm.xml
+++ b/app/src/main/res/layout/item_alarm.xml
@@ -67,8 +67,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:checked="true"
-            app:thumbTint="#00D1B2"
-            app:trackTint="#B2EBF2"
+            app:thumbTint="@color/switch_thumb_color"
+            app:trackTint="@color/switch_track_color"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..b88fb34 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,10 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    
+    <!-- Dark Mode Colors (Gray palette) -->
+    <color name="dark_background">#121212</color>
+    <color name="dark_surface">#1E1E1E</color>
+    <color name="dark_text_primary">#FFFFFF</color>
+    <color name="dark_text_secondary">#B0B0B0</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d9897da..9be7834 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">GISINGv.3</string>
+    <string name="app_name">GisingApp</string>
 </resources>
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 056a3d7..c0aea79 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -19,6 +19,5 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "GISINGv.3"
+rootProject.name = "GisingApp"
 include(":app")
- 
\ No newline at end of file