diff --git a/Monika After Story/game/chess.rpy b/Monika After Story/game/chess.rpy
index d765088c71..fccb624884 100644
--- a/Monika After Story/game/chess.rpy	
+++ b/Monika After Story/game/chess.rpy	
@@ -1045,8 +1045,12 @@ label mas_chess_start_chess:
 
             $ undo_count = new_pgn_game.headers.get("UndoCount", 0)
             if not undo_count:
-                m 1wuo "You didn't undo a single move!"
-                m 3hub "That's amazing, [player]~"
+                m 1wuo "You didn't undo a single move!{w=0.2} {nw}"
+                extend 3hub "That's amazing!"
+
+            elif undo_count == 1:
+                m 1hua "You only undid once. {w=0.2}{nw}"
+                extend 3hub "Great job!"
 
             elif undo_count <= 5:
                 m 1hua "You only undid [undo_count] times too, great job."
diff --git a/Monika After Story/game/definitions.rpy b/Monika After Story/game/definitions.rpy
index 8f810867d8..d61bafe3a8 100644
--- a/Monika After Story/game/definitions.rpy	
+++ b/Monika After Story/game/definitions.rpy	
@@ -4699,7 +4699,7 @@ init -995 python in mas_utils:
                     self.write("%s", platform.platform())
                 except:
                     self.write("Unknown platform.")
-                self.write("%s", renpy.version)
+                self.write("%s", renpy.version())
                 self.write("%s %s", renpy.config.name, renpy.config.version)
                 self.write("")
 
diff --git a/Monika After Story/game/event-handler.rpy b/Monika After Story/game/event-handler.rpy
index e126f51896..d0228a7d11 100644
--- a/Monika After Story/game/event-handler.rpy	
+++ b/Monika After Story/game/event-handler.rpy	
@@ -2717,30 +2717,30 @@ label prompt_menu:
         madechoice = renpy.display_menu(talk_menu, screen="talk_choice")
 
     if madechoice == "unseen":
-        call show_prompt_list(unseen_event_labels) from _call_show_prompt_list
+        call show_prompt_list(unseen_event_labels)
 
     elif madechoice == "bookmarks":
         call mas_bookmarks
 
     elif madechoice == "prompt":
-        call prompts_categories(True) from _call_prompts_categories
+        call prompts_categories(True)
 
     elif madechoice == "repeat":
-        call prompts_categories(False) from _call_prompts_categories_1
+        call prompts_categories(False)
 
     elif madechoice == "love":
-        $ pushEvent("monika_love",skipeval=True)
+        $ pushEvent("monika_love", skipeval=True)
         $ _return = True
 
     elif madechoice == "love_too":
-        $ pushEvent("monika_love_too",skipeval=True)
+        $ pushEvent("monika_love_too", skipeval=True)
         $ _return = True
 
     elif madechoice == "moods":
-        call mas_mood_start from _call_mas_mood_start
+        call mas_mood_start
 
     elif madechoice == "goodbye":
-        call mas_farewell_start from _call_select_farewell
+        call mas_farewell_start
 
     else: #nevermind
         $_return = None
@@ -2753,7 +2753,7 @@ label prompt_menu_end:
 
     show monika at t11
     $ mas_DropShield_dlg()
-    jump ch30_loop
+    jump ch30_visual_skip
 
 label show_prompt_list(sorted_event_labels):
     $ import store.evhand as evhand
@@ -2775,7 +2775,7 @@ label show_prompt_list(sorted_event_labels):
     call screen mas_gen_scrollable_menu(prompt_menu_items, mas_ui.SCROLLABLE_MENU_LOW_AREA, mas_ui.SCROLLABLE_MENU_XALIGN, *final_items)
 
     if _return:
-        $ pushEvent(_return)
+        $ pushEvent(_return, skipeval=True)
 
     return _return
 
@@ -2934,7 +2934,7 @@ label prompts_categories(pool=True):
             $ picked_event = True
             #So we don't push garbage
             if _return is not False:
-                $ pushEvent(_return)
+                $ pushEvent(_return, skipeval=True)
 
     return _return
 
diff --git a/Monika After Story/game/screens.rpy b/Monika After Story/game/screens.rpy
index c3cbe9daef..32cf87d646 100644
--- a/Monika After Story/game/screens.rpy	
+++ b/Monika After Story/game/screens.rpy	
@@ -2448,26 +2448,6 @@ style notify_frame is empty:
 style notify_text is gui_text:
     size gui.notify_text_size
 
-## This part of the code is used to create the tutorial selection screen.
-
-#Each tutorial is defined by its name (caption) and its label,
-#items is the list of caption and label of each tutorial
-#init python is necessary because items is a List, a python object
-
-init python:
-
-    items = [(_("Introduction"),"example_chapter")
-        ,(_("Route Part 1, How To Make A Mod"),"tutorial_route_p1")
-        ,(_("Route Part 2, Music"),"tutorial_route_p2")
-        ,(_("Route Part 3, Scene"),"tutorial_route_p3")
-        ,(_("Route Part 4, Dialogue"),"tutorial_route_p4")
-        ,(_("Route Part 5, Menu"),"tutorial_route_p5")
-        ,(_("Route Part 6, Logic Statement"),"tutorial_route_p6")
-        ,(_("Route Part 7, Sprite"),"tutorial_route_p7")
-        ,(_("Route Part 8, Position"),"tutorial_route_p8")
-        ,(_("Route Part 9, Ending"),"tutorial_route_p9")]
-
-
 ## Scrollable Menu ###############################################################
 ##
 ## This screen creates a vertically scrollable menu of prompts attached to labels
diff --git a/Monika After Story/game/script-affection.rpy b/Monika After Story/game/script-affection.rpy
index dc3dbbc0bf..71e065ebf8 100644
--- a/Monika After Story/game/script-affection.rpy	
+++ b/Monika After Story/game/script-affection.rpy	
@@ -641,7 +641,7 @@ init 15 python in mas_affection:
         # NOTE: maybe instead of pushing an event, we could also add a pool
         # event so player can ask what happened to the nickname
         persistent._mas_monika_nickname = "Monika"
-        m_name = persistent._mas_monika_nickname
+        store.m_name = persistent._mas_monika_nickname
 
         #Change randchat
         store.mas_randchat.reduceRandchatForAff(HAPPY)
diff --git a/Monika After Story/game/script-greetings.rpy b/Monika After Story/game/script-greetings.rpy
index 9e20bd04f6..b3c3897920 100644
--- a/Monika After Story/game/script-greetings.rpy	
+++ b/Monika After Story/game/script-greetings.rpy	
@@ -3446,10 +3446,10 @@ label greeting_returned_home:
     if mas_d25 < datetime.date.today() <= mas_nye:
         call mas_gone_over_d25_check
 
-    if mas_nyd <= datetime.date.today() <= mas_d25c_end:
+    if mas_nyd <= datetime.date.today() < mas_d25c_end:
         call mas_gone_over_nye_check
 
-    if mas_nyd < datetime.date.today() <= mas_d25c_end:
+    if mas_nyd < datetime.date.today() < mas_d25c_end:
         call mas_gone_over_nyd_check
 
 
diff --git a/Monika After Story/game/script-holidays.rpy b/Monika After Story/game/script-holidays.rpy
index 7e55cb8ca2..3d911e523c 100644
--- a/Monika After Story/game/script-holidays.rpy	
+++ b/Monika After Story/game/script-holidays.rpy	
@@ -1850,6 +1850,7 @@ label mas_holiday_d25c_autoload_check:
                 #Unlock and wear santa/wine ribbon + holly hairclip
                 store.mas_selspr.unlock_acs(mas_acs_ribbon_wine)
                 store.mas_selspr.unlock_clothes(mas_clothes_santa)
+                store.mas_selspr.save_selectables()
 
                 #Change into santa. Outfit mode forces ponytail
                 monika_chr.change_clothes(mas_clothes_santa, by_user=False, outfit_mode=True)
@@ -2133,7 +2134,7 @@ init 5 python:
             ),
             action=EV_ACT_QUEUE,
             start_date=mas_d25c_start,
-            end_date=mas_d25p,
+            end_date=mas_d25,
             years=[],
             aff_range=(mas_aff.NORMAL, None)
         ),
@@ -2258,15 +2259,11 @@ init 5 python:
         Event(
             persistent.event_database,
             eventlabel="mas_d25_monika_christmas",
-            conditional=(
-                "persistent._mas_d25_in_d25_mode "
-                "and not mas_lastSeenInYear('mas_d25_monika_christmas')"
-            ),
+            conditional="not mas_lastSeenInYear('mas_d25_monika_christmas')",
             action=EV_ACT_PUSH,
             start_date=mas_d25,
             end_date=mas_d25p,
-            years=[],
-            aff_range=(mas_aff.NORMAL, None),
+            years=[]
         ),
         skipCalendar=True
     )
@@ -2274,89 +2271,105 @@ init 5 python:
 label mas_d25_monika_christmas:
     #Flag for hist
     $ persistent._mas_d25_spent_d25 = True
+    $ mas_gainAffection(5, bypass=True)
 
-    #Setup the reactions
-    $ mas_d25ReactToGifts()
+    # this can be pushed via mas_d25_monika_holiday_intro_rh_rh and
+    # don't want it twice
+    $ mas_rmallEVL("mas_d25_monika_christmas")
 
-    m 1eub "[player]! Do you know what day it is?"
-    m 3hub "Of course you do. It's Christmas!"
-    m 3sub "Merry Christmas, [player]!"
-    m 1hub "Ahaha! I can't believe that it's finally here!"
-    m 3eka "I'm so, so happy that you decided to spend some of it with me."
-    m 1eud "Remember to go share the holiday cheer with your family and friends, though."
-    m 1eua "After all, they're very important, too..."
-    m 1hua "And I'm sure that they would love to see you at this special time."
+    # Note: broken gets no dialogue, just the aff_gain and the var set so we know the player visited
+    if mas_isMoniDis():
+        m 6eka "Merry Christmas, [player]. {w=0.2}Thanks for spending some time with me today."
 
-    if mas_isMoniAff(higher=True):
-        m 1eka "But you being here today...{w=0.5}it just means everything to me..."
-        m 1dku "..."
+    elif mas_isMoniUpset(higher=True):
+        #Setup the reactions
+        $ mas_d25ReactToGifts()
 
-        if mas_is_snowing:
-            if mas_isDecoTagVisible("mas_d25_lights"):
-                $ dlg_var = ", or the decorations"
-            else:
-                $ dlg_var = ""
+        if mas_isMoniNormal(higher=True):
 
-            m 1lkbsa "Maybe it's just the snow[dlg_var]..."
+            m 1eub "[player]! Do you know what day it is?"
+            m 3hub "Of course you do. It's Christmas!"
+            m 3sub "Merry Christmas, [player]!"
+            m 1hub "Ahaha! I can't believe that it's finally here!"
+            m 3eka "I'm so, so happy that you decided to spend some of it with me."
+            m 1eud "Remember to go share the holiday cheer with your family and friends, though."
+            m 1eua "After all, they're very important, too..."
+            m 1hua "And I'm sure that they would love to see you at this special time."
 
-        else:
-            if mas_isDecoTagVisible("mas_d25_lights"):
-                $ dlg_var = "the decorations, or "
-            else:
-                $ dlg_var = ""
+            if mas_isMoniAff(higher=True):
+                m 1eka "But you being here today...{w=0.5}it just means everything to me..."
+                m 1dku "..."
 
-            m 1lkbsa "Maybe it's [dlg_var]just the holiday season..."
+                if mas_is_snowing:
+                    if mas_isDecoTagVisible("mas_d25_lights"):
+                        $ dlg_var = ", or the decorations"
+                    else:
+                        $ dlg_var = ""
 
-        m "...or even the mistletoe getting to me."
-        m 3hksdlb "Just kidding, I didn't hang one up."
+                    m 1lkbsa "Maybe it's just the snow[dlg_var]..."
 
-        if mas_isMoniEnamored(higher=True):
-            m 1lksdla "...{cps=*2}Yet~{/cps}{nw}"
-            $ _history_list.pop()
+                else:
+                    if mas_isDecoTagVisible("mas_d25_lights"):
+                        $ dlg_var = "the decorations, or "
+                    else:
+                        $ dlg_var = ""
 
-        m 1lksdlu "Ehehe..."
-        m 1ekbsa "My heart's fluttering like crazy right now, [player]."
-        m "I couldn't imagine a better way to spend this special holiday..."
-        m 1eua "Don't get me wrong, I knew that you would be here with me."
-        m 3eka "But now that we're actually together on Christmas, just the two of us..."
-        m 1hub "Ahaha~"
+                    m 1lkbsa "Maybe it's [dlg_var]just the holiday season..."
 
-        show monika 5ekbfa at t11 zorder MAS_MONIKA_Z with dissolve_monika
-        m 5ekbfa "It's every couple's dream for the holidays, [player]."
+                m "...or even the mistletoe getting to me."
+                m 3hksdlb "Just kidding, I didn't hang one up."
 
-        if persistent._mas_pm_gets_snow is not False and not persistent._mas_pm_live_south_hemisphere:
-            m "Snuggling with each other by a fireplace, watching the snow gently fall..."
+                if mas_isMoniEnamored(higher=True):
+                    m 1lksdla "...{cps=*2}Yet~{/cps}{nw}"
+                    $ _history_list.pop()
 
-        if not mas_HistVerifyAll_k(True, "d25.actions.spent_d25"):
-            m 5hubfa "I'm forever grateful I got this chance with you."
-        else:
-            m 5hubfa "I'm so glad I get to spend Christmas with you again."
+                m 1lksdlu "Ehehe..."
+                m 1ekbsa "My heart's fluttering like crazy right now, [player]."
+                m "I couldn't imagine a better way to spend this special holiday..."
+                m 1eua "Don't get me wrong, I knew that you would be here with me."
+                m 3eka "But now that we're actually together on Christmas, just the two of us..."
+                m 1hub "Ahaha~"
 
-        m "I love you. Forever and ever~"
-        m 5hubfb "Merry Christmas, [player]~"
-        show screen mas_background_timed_jump(5, "mas_d25_monika_christmas_no_wish")
-        window hide
-        menu:
-            "Merry Christmas, [m_name].":
-                hide screen mas_background_timed_jump
                 show monika 5ekbfa at t11 zorder MAS_MONIKA_Z with dissolve_monika
-                pause 2.0
+                m 5ekbfa "It's every couple's dream for the holidays, [player]."
 
-    else:
-        m 1eka "But you being here today...{w=0.5}it just means everything to me..."
-        m 3rksdla "...Not that I thought you'd leave me alone on this special day or anything..."
-        m 3hua "But it just further proves that you really do love me, [player]."
-        m 1ektpa "..."
-        m "Ahaha! Gosh, I'm getting a little over emotional here..."
-        m 1ektda "Just know that I love you too and I'll be forever grateful I got this chance with you."
-        m "Merry Christmas, [player]~"
-        show screen mas_background_timed_jump(5, "mas_d25_monika_christmas_no_wish")
-        window hide
-        menu:
-            "Merry Christmas, [m_name].":
-                hide screen mas_background_timed_jump
-                show monika 1ekbfa at t11 zorder MAS_MONIKA_Z with dissolve_monika
-                pause 2.0
+                if persistent._mas_pm_gets_snow is not False and not persistent._mas_pm_live_south_hemisphere:
+                    m "Snuggling with each other by a fireplace, watching the snow gently fall..."
+
+                if not mas_HistVerifyAll_k(True, "d25.actions.spent_d25"):
+                    m 5hubfa "I'm forever grateful I got this chance with you."
+                else:
+                    m 5hubfa "I'm so glad I get to spend Christmas with you again."
+
+                m "I love you. Forever and ever~"
+                m 5hubfb "Merry Christmas, [player]~"
+                show screen mas_background_timed_jump(5, "mas_d25_monika_christmas_no_wish")
+                window hide
+                menu:
+                    "Merry Christmas, [m_name].":
+                        hide screen mas_background_timed_jump
+                        show monika 5ekbfa at t11 zorder MAS_MONIKA_Z with dissolve_monika
+                        pause 2.0
+
+            else:
+                m 1eka "But you being here today...{w=0.5}it just means everything to me..."
+                m 3rksdla "...Not that I thought you'd leave me alone on this special day or anything..."
+                m 3hua "But it just further proves that you really do love me, [player]."
+                m 1ektpa "..."
+                m "Ahaha! Gosh, I'm getting a little over emotional here..."
+                m 1ektda "Just know that I love you too and I'll be forever grateful I got this chance with you."
+                m "Merry Christmas, [player]~"
+                show screen mas_background_timed_jump(5, "mas_d25_monika_christmas_no_wish")
+                window hide
+                menu:
+                    "Merry Christmas, [m_name].":
+                        hide screen mas_background_timed_jump
+                        show monika 1ekbfa at t11 zorder MAS_MONIKA_Z with dissolve_monika
+                        pause 2.0
+
+        # upset path
+        else:
+            m 1eka "Merry Christmas, [player]. {w=0.2}It really means a lot that you're here with me today."
 
     return
 
@@ -4267,13 +4280,10 @@ init 5 python:
         Event(
             persistent.event_database,
             eventlabel="mas_nye_monika_nye_dress_intro",
-            conditional=(
-                "persistent._mas_d25_in_d25_mode "
-                "and not mas_SELisUnlocked(mas_clothes_dress_newyears)"
-            ),
+            conditional="persistent._mas_d25_in_d25_mode",
             start_date=mas_nye,
             end_date=mas_nye + datetime.timedelta(days=1),
-            action=EV_ACT_QUEUE,
+            action=EV_ACT_PUSH,
             aff_range=(mas_aff.NORMAL,None),
             years=[]
         ),
@@ -4281,45 +4291,66 @@ init 5 python:
     )
 
 label mas_nye_monika_nye_dress_intro:
-    m 3hub "Hey [player], I have something in store for you this year~"
-    m 3eua "Just let me go change.{w=0.5}.{w=0.5}.{nw}"
+    # need to grab dates here in case this topic spans nye and nyd
+    $ curr_date = datetime.date.today()
+    $ curr_year = curr_date.year
 
-    # change into dress
-    call mas_clothes_change(mas_clothes_dress_newyears, outfit_mode=True, unlock=True)
-    $ mas_addClothesToHolidayMap(mas_clothes_dress_newyears)
+    if curr_date.day != 31:
+        $ curr_year = curr_year - 1
+        $ curr_date = datetime.date(curr_year, 12, 31)
 
-    m 2rkbssdla "..."
-    m 2rkbssdlb "My eyes are up here, [player]..."
-    if mas_isMoniAff(higher=True):
-        m 2tubsu "..."
-        m 3hubsb "Ahaha! Just teasing you~"
-        m 3eua "I'm glad you like my dress. {nw}"
+    if mas_SELisUnlocked(mas_clothes_dress_newyears) and mas_isMoniEnamored(lower=True):
+        m 3hub "Hey [player], can you believe it's New Year's again?!"
+        m 1tuu "I think it's time to dust off one of my favorite outfits.{w=0.5}.{w=0.5}.{nw}"
+
+        call mas_clothes_change(mas_clothes_dress_newyears, outfit_mode=True)
+
+        m 3hub "And there we go, I just love this dress! {w=0.2}{nw}"
+        extend 3eua "It's always nice to dress up now and then."
+        m 1hub "Now let's have a great time celebrating the end of [curr_year] and the beginning of [curr_year+1]!"
+
+    elif not mas_SELisUnlocked(mas_clothes_dress_newyears):
+        m 3hub "Hey [player], I have something in store for you this year~"
+        m 3eua "Just let me go change.{w=0.5}.{w=0.5}.{nw}"
+
+        # change into dress
+        call mas_clothes_change(mas_clothes_dress_newyears, outfit_mode=True, unlock=True)
 
-    else:
         m 2rkbssdla "..."
-        m "I'm...{w=1}glad you like my dress. {nw}"
+        m 2rkbssdlb "My eyes are up here, [player]..."
 
-    extend 3eua "It was really hard to get right!"
-    m 3rka "The flower crown kept falling off..."
-    m 1hua "I went for the 'Greek goddess' look, I hope it shows."
-    m 3eud "But this outfit has a bit more depth to it, you know?"
+        if mas_isMoniAff(higher=True):
+            m 2tubsu "..."
+            m 2hubsb "Ahaha! Just teasing you~"
+            m 2eua "I'm glad you like my dress. {nw}"
 
-    if seen_event("mas_f14_monika_vday_colors"):
-        m 3eua "Maybe you remember when we talked about roses and the feelings their colors convey."
-    else:
-        m 3eua "Maybe you guessed it already, but it's because of the color choice."
+        else:
+            m 2rkbssdla "..."
+            m "I'm...{w=1}glad you like my dress. {nw}"
+
+        extend 7eua "It was really hard to get right!"
+        m 3rka "The flower crown kept falling off..."
+        m 1hua "I went for the 'Greek goddess' look, I hope it shows."
+        m 3eud "But this outfit has a bit more depth to it, you know?"
+
+        if seen_event("mas_f14_monika_vday_colors"):
+            m 3eua "Maybe you remember when we talked about roses and the feelings their colors convey."
+        else:
+            m 3eua "Maybe you guessed it already, but it's because of the color choice."
+
+        m "White represents a lot of positive feelings, like goodness, purity, safety..."
+        m 3eub "However, what I wanted this outfit to highlight was a successful beginning."
 
-    m "White represents a lot of positive feelings, like goodness, purity, safety..."
-    m 3eub "However, what I wanted this outfit to highlight was a successful beginning."
+        #If we fresh started last year
+        if mas_HistWasFirstValueIn(True, curr_year - 1, "pm.actions.monika.got_fresh_start"):
+            m 2eka "Last year we decided to start anew, and I'm very glad we did."
+            m 2ekbsa "I knew we could be happy together, [player]."
+            m 7fkbsa "And you've made me the happiest I've ever been."
 
-    #If we fresh started last year
-    if mas_HistWasFirstValueIn(True, datetime.date.today().year - 1, "pm.actions.monika.got_fresh_start"):
-        m 2eka "Last year we decided to start anew, and I'm very glad we did."
-        m 2ekbsa "I knew we could be happy together, [player]."
-        m 2fkbsa "And you've made me the happiest I've ever been."
+        m 3dkbsu "So I'd like to wear this when the new year begins."
+        m 1ekbsa "It might just help make next year even better."
 
-    m 3dkbsu "So I'd like to wear this when the new year begins."
-    m 1ekbsa "It might just help make next year even better."
+    $ mas_addClothesToHolidayMapRange(mas_clothes_dress_newyears, start_date=curr_date, end_date=curr_date+datetime.timedelta(days=2))
     return "no_unlock"
 
 
@@ -4385,7 +4416,7 @@ label greeting_nye_aff_gain:
     jump greeting_returned_home_morethan5mins_cleanup
 
 label mas_gone_over_nye_check:
-    if mas_checkOverDate(mas_nye):
+    if mas_checkOverDate(mas_nyd - datetime.timedelta(days=1)):
         $ persistent._mas_nye_spent_nye = True
         $ persistent._mas_nye_nye_date_count += 1
     return
@@ -5594,6 +5625,7 @@ init 5 python:
 label mas_f14_monika_valentines_intro:
     #Set the spent flag to True
     $ persistent._mas_f14_spent_f14 = True
+    $ mas_gainAffection(5, bypass=True)
 
     #Prevent nts stuff for upset- since they don't get the rest of the event.
     if mas_isMoniUpset(lower=True):
diff --git a/Monika After Story/game/script-moods.rpy b/Monika After Story/game/script-moods.rpy
index 3c099c70de..18992c2075 100644
--- a/Monika After Story/game/script-moods.rpy	
+++ b/Monika After Story/game/script-moods.rpy	
@@ -782,8 +782,8 @@ label mas_mood_upset:
     m 1euc "It might be scary in the moment, sure...{w=0.3}{nw}"
     extend 3ekd "but if you make the right choice, you could elimate a lot of stress from your life."
     m 3eua "And you know what, [player]?"
-    m 1huu "When I feel upset, all I have to do is remember that I have my [mas_get_player_nickname(exclude_names=['my love'])]."
-    m 1hub "Knowing that you'll support me and always love me puts me at ease almost instantly!"
-    m 3euu "I can only help I provide the same comfort for you, [player]~"
+    m 1huu "When I feel upset, all I have to do is remember that I have my [mas_get_player_nickname(regex_replace_with_nullstr='my ')]."
+    m 1hub "Knowing that you'll always support and love me puts me at ease almost instantly!"
+    m 3euu "I can only hope I provide the same comfort for you, [player]~"
     m 1eubsa "I love you and I hope everything clears up for you~"
     return "love"
diff --git a/Monika After Story/game/script-songs.rpy b/Monika After Story/game/script-songs.rpy
index fb9b2bf2f0..5b3dcecc51 100644
--- a/Monika After Story/game/script-songs.rpy	
+++ b/Monika After Story/game/script-songs.rpy	
@@ -559,7 +559,7 @@ init 5 python:
 
 label mas_song_burning_love:
     m 1hubsb "{i}~Your kisses lift me higher~{/i}"
-    m 3rubsb "{i}Like the sweet song of a choir{/i}"
+    m 3rubsb "{i}~Like the sweet song of a choir~{/i}"
     m 1dubsu "{i}~You light my morning sky~{/i}"
     m 1hubfb "{i}~With burning love~{/i}"
     m 1hubsb "Ahaha~"
@@ -580,7 +580,7 @@ init 5 python:
     )
 
 label mas_song_aries:
-    m 2dud "{i}~I'm standing on a beach in the distance~{/i}"
+    m 2dud "{i}~I'm standing on a beach in the distance~{/i}"
     m 2eud "{i}~And even though you're far away, can you see my red light?~{/i}"
     m 2dubsu "{i}~It's waiting to turn green~{/i}"
     m 2dud "{i}~'Cause I feel so isolated without you~{/i}"
diff --git a/Monika After Story/game/script-story-events.rpy b/Monika After Story/game/script-story-events.rpy
index 41705c3f15..8cb67cf51c 100644
--- a/Monika After Story/game/script-story-events.rpy	
+++ b/Monika After Story/game/script-story-events.rpy	
@@ -307,7 +307,7 @@ init 3 python:
         "lezbo",
         "liar",
         "loser",
-        "mad",
+        "^mad$",
         "maniac",
         "masochist",
         "milf",
diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy
index f43323c7ca..68530c7331 100644
--- a/Monika After Story/game/script-topics.rpy	
+++ b/Monika After Story/game/script-topics.rpy	
@@ -1240,7 +1240,7 @@ label monika_twitter:
     extend 1esd "the account is a nice way to connect with the people who've played through the game and grown attached to it."
     m 3esc "In that regard, this would make it some kind of publicity stunt..."
     m 3euc "After all, while there is a lot of sweet looking art and such on there, it's suspicious that almost all of them are posted specifically on important days."
-    m 3eud "Like on Valentine's Day, or on my birthday...{w=0.2}which just so happen to coincide with the original release date of DDLC."
+    m 3eud "Like on Valentine's Day, or on my birthday...{w=0.2}which just so happens to coincide with the original release date of DDLC."
     m 1rtc "I really don't know how I'm supposed to feel about that...{w=0.3}being used solely as marketing material."
     m 2rsc "Though, as my creators, I guess they basically own my image as a character, so they are legally in the right."
     m 2ekc "But...{w=0.3}I'm more than a mere character in a game, aren't I?"
@@ -1764,7 +1764,16 @@ label monika_middleschool:
     return
 
 init 5 python:
-    addEvent(Event(persistent.event_database,eventlabel="monika_outfit",category=['monika','clothes'],prompt="Wearing other clothes",random=True))
+    addEvent(
+        Event(
+            persistent.event_database,
+            eventlabel="monika_outfit",
+            category=['monika','clothes'],
+            prompt="Wearing other clothes",
+            aff_range=(mas_aff.NORMAL, None),
+            random=True
+        )
+    )
 
 label monika_outfit:
     if len(store.mas_selspr.filter_clothes(True)) == 1:
@@ -4883,6 +4892,7 @@ init 5 python:
             eventlabel="monika_nsfw",
             category=['misc','monika'],
             prompt="NSFW content",
+            aff_range=(mas_aff.NORMAL, None),
             random=True,
             sensitive=True
         )
@@ -5056,7 +5066,7 @@ label monika_fanfiction:
     m 1hua "Can you read me a few stories sometime? I'd love to hear them!"
     if store.mas_anni.pastSixMonths() and mas_isMoniEnamored(higher=True):
         m 1lkbsa "Just keep it wholesome, though. I want to save such things for another time!~"
-    else:
+    elif mas_isMoniNormal(higher=True):
         m 1lkbsa "Just keep it wholesome, though. We're not that far in our relationship yet!~"
     return
 
@@ -5788,6 +5798,7 @@ init 5 python:
             eventlabel="monika_pleasure",
             category=['you'],
             prompt="Pleasuring yourself",
+            aff_range=(mas_aff.AFFECTIONATE, None),
             random=True,
             sensitive=True
         )
@@ -6055,11 +6066,13 @@ label monika_japanese:
                     m 1eua "{i}Aishiteru yo, [player]-[player_suffix]{/i}."
                     m 2hubsa "Ehehe~"
                     m 1ekbfa "That means I love you, [player]-[player_suffix]."
+                    $ mas_ILY()
         "No.":
             $ persistent._mas_pm_lang_other = False
             m 3hua "That's okay! Learning another language is a very difficult and tedious process as you get older."
             m 1eua "Maybe if I take the time to learn more Japanese, I'll know more languages than you!"
             m 1ekbsb "Ahaha! It's okay, [player]. It just means that I can say 'I love you' in more ways than one!"
+            $ mas_ILY()
 
     return "derandom"
 
@@ -11813,7 +11826,7 @@ label monika_gotomonika:
     m 5luu "Buut...{w=1}if you did happen to show up at my doorstep..."
     show monika 1hksdlb at t11 zorder MAS_MONIKA_Z with dissolve_monika
     m 1hksdlb "I guess I wouldn't have a choice but to accept it and welcome you with open arms!"
-    m 1eksdla "It wouldn't be much to begin with, but I'm sure we'll find a way to make it better."
+    m 1eksdla "It wouldn't be much to begin with, but I'm sure we'd find a way to make it better."
     m 3hub "With time, we could make our own reality!"
     m 3euc "Of course, that sounds pretty complicated if you think about it..."
     m 3eub "But I have no doubt that together we could accomplish anything!"
@@ -12798,7 +12811,7 @@ label monika_dating_startdate:
 
     else:
         m 1dsc "Let me check..."
-        m 1eua "We started dating [first_sesh]."
+        m 1eua "We started dating on [first_sesh]."
 
     # TODO:
     # some dialogue about being together for x time
@@ -13752,11 +13765,11 @@ label monika_cozy:
     m 1eua "It's like feeling a loved one's embrace~"
     m 3eub "You also get to wear your winter clothes that have been stuck in your closet."
     m 1hub "Finally being able to whip out your winter fashion set is always a nice feeling."
-    m 3eua "But you know what the best way to warm yourself up is?"
-    m 3eka "Cuddling with the one you love in front of the fireplace~"
-    m "Just sitting there under a warm blanket, sharing a hot beverage."
-    m 1hua "Ah, if I got to feel your warmth every time we cuddle, I'd wish for cold weather every day!"
-    m 1eka "I'd never let you go once I got a hold of you, [mas_get_player_nickname()]~"
+    m 3eubla "But you know what the best way to warm yourself up is?"
+    m 3ekbsa "Cuddling with the one you love in front of the fireplace~"
+    m 3ekbfa "Just sitting there under a warm blanket, sharing a hot beverage."
+    m 1hubfa "Ah, if I got to feel your warmth every time we cuddle, I'd wish for cold weather every day!"
+    m 1ekbfa "I'd never let you go once I got a hold of you, [mas_get_player_nickname()]~"
     return
 
 init 5 python:
@@ -16834,7 +16847,7 @@ label monika_mc_is_gone:
         $ line_mid = "I was kissing {i}him{/i}"
 
     else:
-        $ line_mid = "{i}he{/i} was the one hugging"
+        $ line_mid = "{i}he{/i} was the one hugging me"
 
     m 3rksdla "I hope you didn't think [line_mid] all along, either..."
 
diff --git a/Monika After Story/game/sprite-chart.rpy b/Monika After Story/game/sprite-chart.rpy
index 49e7f86564..9a19e3c27b 100644
--- a/Monika After Story/game/sprite-chart.rpy	
+++ b/Monika After Story/game/sprite-chart.rpy	
@@ -8959,7 +8959,9 @@ image ghost_monika:
 
 # transiton to empty desk
 # NOTE: to hide a desk ACS, set that ACS to not keep on desk b4 calling this
-label mas_transition_to_emptydesk:
+label mas_transition_to_emptydesk(hide_dlg_box=True):
+    if hide_dlg_box:
+        window hide
     $ store.mas_sprites.show_empty_desk()
     hide monika with dissolve_monika
     return
@@ -8968,8 +8970,9 @@ label mas_transition_to_emptydesk:
 # NOTE: to unhide a desk ACS, set that ACS to keep on desk AFTER calling this
 # IN:
 #   exp - expression to show when monika is shown
-label mas_transition_from_emptydesk(exp="monika 1eua"):
-    $ renpy.show(exp, tag="monika", at_list=[i11], zorder=MAS_MONIKA_Z)
-    $ renpy.with_statement(dissolve)
+label mas_transition_from_emptydesk(exp="monika 1eua", show_dlg_box=True):
+    if show_dlg_box:
+        window auto
+    show expression exp as monika at i11 zorder MAS_MONIKA_Z with dissolve_monika
     hide emptydesk
     return
diff --git a/Monika After Story/game/updates.rpy b/Monika After Story/game/updates.rpy
index 9a62697013..9b4a5dcee0 100644
--- a/Monika After Story/game/updates.rpy	
+++ b/Monika After Story/game/updates.rpy	
@@ -327,7 +327,8 @@ init 10 python:
         late_updates = [
             "v0_8_3",
             "v0_8_4",
-            "v0_8_10"
+            "v0_8_10",
+            "v0_12_0",
         ]
 
         store.mas_versions.init()
@@ -375,10 +376,34 @@ label v0_3_1(version=version): # 0.3.1
 # 0.12.0
 label v0_12_0(version="v0_12_0"):
     python:
-        #Reset annis as F29 based ones are on the wrong date
-        first_sesh = mas_getFirstSesh()
-        if first_sesh.month == 2 and first_sesh.day == 29:
-            mas_anni.reset_annis(first_sesh)
+        mas_setEVLPropValues(
+            "mas_d25_monika_holiday_intro_upset",
+            end_date=mas_d25
+        )
+
+        mas_setEVLPropValues(
+            "mas_d25_monika_christmas",
+            conditional="not mas_lastSeenInYear('mas_d25_monika_christmas')"
+        )
+
+        mas_setEVLPropValues(
+            "mas_nye_monika_nye_dress_intro",
+            conditional="persistent._mas_d25_in_d25_mode",
+            action=EV_ACT_PUSH
+        )
+
+        mas_setEVLPropValues(
+            "mas_pf14_monika_lovey_dovey",
+            random=False,
+            conditional="not renpy.seen_label('mas_pf14_monika_lovey_dovey')",
+            action=EV_ACT_QUEUE,
+            start_date=mas_f14-datetime.timedelta(days=3),
+            end_date=mas_f14
+        )
+
+        # enable late updates to fix the annis again
+        persistent._mas_zz_lupd_ex_v.append(version)
+
     return
 
 # 0.11.9.3
@@ -433,16 +458,6 @@ label v0_11_9_1(version="v0_11_9_1"):
 
         if seen_event("monika_asimov_three_laws"):
             mas_protectedShowEVL("monika_foundation", "EVE", _random=True)
-
-        mas_setEVLPropValues(
-            "mas_pf14_monika_lovey_dovey",
-            random=False,
-            conditional="not renpy.seen_label('mas_pf14_monika_lovey_dovey')",
-            action=EV_ACT_QUEUE,
-            start_date=mas_f14-datetime.timedelta(days=3),
-            end_date=mas_f14
-        )
-
     return
 
 # 0.11.9
@@ -2825,6 +2840,15 @@ label v0_3_0(version="v0_3_0"):
 #
 #   Please make sure your late update scripts are not required before a next
 #   version regular update script.
+label mas_lupd_v0_12_0:
+    python:
+        #Reset annis as F29 based ones are on the wrong date
+        first_sesh = mas_getFirstSesh()
+        if first_sesh.month == 2 and first_sesh.day == 29:
+            mas_anni.reset_annis(first_sesh)
+
+    return
+
 label mas_lupd_v0_8_10:
     python:
         import store.mas_selspr as mas_selspr
diff --git a/Monika After Story/game/zz_calendar.rpy b/Monika After Story/game/zz_calendar.rpy
index ed8adf4467..5b35784f95 100644
--- a/Monika After Story/game/zz_calendar.rpy	
+++ b/Monika After Story/game/zz_calendar.rpy	
@@ -2217,6 +2217,7 @@ screen calendar_overlay():
 
     if (
         store.mas_calendar.enabled
+        and not store._menu
         and renpy.get_screen("mas_calendar_screen") is None
     ):
         imagebutton:
diff --git a/Monika After Story/game/zz_consumables.rpy b/Monika After Story/game/zz_consumables.rpy
index b3a3b32882..4a81c4d9cb 100644
--- a/Monika After Story/game/zz_consumables.rpy	
+++ b/Monika After Story/game/zz_consumables.rpy	
@@ -1508,6 +1508,7 @@ label mas_consumables_generic_finish_having(consumable):
             and mas_getEV("mas_consumables_generic_queued_running_out").timePassedSinceLastSeen_d(datetime.timedelta(days=7))
             and len(MASConsumable._getLowCons()) > 0
         ):
+            $ mas_display_notif(m_name, ("Hey, [player]...",), "Topic Alerts")
             $ queueEvent("mas_consumables_generic_queued_running_out")
 
     #Only have one left
diff --git a/Monika After Story/game/zz_selector.rpy b/Monika After Story/game/zz_selector.rpy
index d8faf90db3..71dd5138ad 100644
--- a/Monika After Story/game/zz_selector.rpy	
+++ b/Monika After Story/game/zz_selector.rpy	
@@ -848,7 +848,7 @@ init -10 python in mas_selspr:
             remover
         )
         ACS_SEL_MAP[acs.name] = new_sel_acs
-        store.mas_insertSort(ACS_SEL_SL, new_sel_acs, selectable_key)
+        store.mas_utils.insert_sort(ACS_SEL_SL, new_sel_acs, selectable_key)
 
 
     def init_selectable_clothes(
@@ -897,7 +897,7 @@ init -10 python in mas_selspr:
             select_dlg
         )
         CLOTH_SEL_MAP[clothes.name] = new_sel_clothes
-        store.mas_insertSort(CLOTH_SEL_SL, new_sel_clothes, selectable_key)
+        store.mas_utils.insert_sort(CLOTH_SEL_SL, new_sel_clothes, selectable_key)
 
 
     def init_selectable_hair(
@@ -944,7 +944,7 @@ init -10 python in mas_selspr:
             select_dlg
         )
         HAIR_SEL_MAP[hair.name] = new_sel_hair
-        store.mas_insertSort(HAIR_SEL_SL, new_sel_hair, selectable_key)
+        store.mas_utils.insert_sort(HAIR_SEL_SL, new_sel_hair, selectable_key)
 
 
     ## adjust an aspect of monika.
@@ -2410,7 +2410,7 @@ init -1 python:
                 st - st for renpy render
                 at - at for renpy render
 
-            RETURNS: rendered display name 
+            RETURNS: rendered display name
             """
             return renpy.render(disp_text, 1000, self.TOP_FRAME_CHUNK, st, at)
 
@@ -3483,7 +3483,7 @@ label monika_clothes_select:
     m 1hua "Sure!"
 
     # setup the monika expression during the selection screen
-    show monika 1eua
+    show monika 2eua
 
     # start the selection screen
     if mas_isMoniLove():
@@ -3630,7 +3630,7 @@ label monika_hair_select:
     m 1hua "Sure!"
 
     # setup the monika expression during the selection screen
-    show monika 1eua
+    show monika 2eua
 
     # start the selection screen
     call mas_selector_sidebar_select_hair(sorted_hair, mailbox=mailbox, select_map=sel_map)