diff --git a/export_presets.cfg b/export_presets.cfg
index e13c804..11ed2d4 100644
--- a/export_presets.cfg
+++ b/export_presets.cfg
@@ -416,7 +416,7 @@ capabilities/access_wifi=false
 capabilities/performance_gaming_tier=false
 capabilities/performance_a12=false
 capabilities/additional=PackedStringArray()
-shader_baker/enabled=false
+shader_baker/enabled=true
 user_data/accessible_from_files_app=false
 user_data/accessible_from_itunes_sharing=false
 privacy/camera_usage_description=""
diff --git a/scenes/main/alarm.gd b/scenes/main/alarm.gd
index 724e24c..2501d4a 100644
--- a/scenes/main/alarm.gd
+++ b/scenes/main/alarm.gd
@@ -9,7 +9,6 @@ var playing := false
 @onready var snooze_button = $VBoxContainer/HBoxContainer/snooze
 @onready var sleep_mode = $"../sleep_mode"
 
-var _day
 var _weather
 
 func popup(alarm_in: Alarm):
@@ -26,7 +25,6 @@ func popup(alarm_in: Alarm):
 	var json = await weather_api_node.get_forecast()
 	if json is Dictionary:
 		_weather = Constants.code_to_weather(json['current']['condition']['code'])
-	_day = Time.get_date_dict_from_system()['weekday']
 	show()
 	_play()
 
@@ -34,7 +32,9 @@ func popup(alarm_in: Alarm):
 func _play():
 	playing = true
 	if !time_talker.is_playing():
-		time_talker.play(alarm.moment, _day, _weather, alarm.weather_music if alarm.override_weather_music else null, alarm.play_music, alarm.speak_time)
+		var moment = Constants.current_moment()
+		var day = Time.get_date_dict_from_system()['weekday']
+		time_talker.play(moment, day, _weather, alarm.weather_music if alarm.override_weather_music else null, alarm.play_music, alarm.speak_time)
 
 func _on_snooze_timer_timeout():
 	if alarm != null and !alarm.active:
diff --git a/scenes/main/main.gd b/scenes/main/main.gd
index 729903f..c1923bd 100644
--- a/scenes/main/main.gd
+++ b/scenes/main/main.gd
@@ -93,7 +93,8 @@ func _on_minute_timer_timeout():
 	var time = Time.get_time_dict_from_system()
 	get_tree().call_group("minute_timer_updates", "minute_timer_update", time)
 	_check_dark_mode(time)
-	minute_timer.start(60.0)
+	var seconds = Time.get_time_dict_from_system()['second']
+	minute_timer.start(max(1.0, 60.0 - seconds))
 
 func _check_dark_mode(time):
 	var ctrans = foreground.material.get_shader_parameter('transition')