   analogWrite(AlarmLED,matrixBrightness*255/16+1);
   display_ALAr();
   delay(1000);
-  updateTimeDisplay(alarmTime,true,true);
+  updateTimeDisplay(alarmTime,true,alarmMasterSwitchEnabled);
   waitForButtonDepress(AlarmButton, LOW);
   unsigned long modeActive = millis();
   bool normalExit = true;

unsigned long alarmStartMillis = 0;
const unsigned lightUpdateInterval = 50;
unsigned long lastLightUpdate = millis();
void updateLight() {
  if (!isTimeNow(lastLightUpdate,lightUpdateInterval)) {
    return;
  }
  if (digitalRead(AlarmEnabledSwitch) == LOW) return;
  ClockTime current = current_clock_time;
  int32_t seconds = secondsBtwDates(current,startTime);
  if ((seconds < 0) || (seconds >= maxTime)) {
    if (alarmActive) {
      turnLightOff();
      alarmActive = false;
    }
    alarmEnabled = true;

      alarmActive = false;
      alarmEnabled = false;
      turnLightOff();
      sfx.stop();
      waitForButtonDepress(OffButton, HIGH);
    } 
    else if (sunSetActive) {
