diff --git a/Source/mas/theme/comfy_ui/calendar.rpy b/Source/mas/theme/comfy_ui/calendar.rpy
new file mode 100644
index 0000000..14050d2
--- /dev/null
+++ b/Source/mas/theme/comfy_ui/calendar.rpy
@@ -0,0 +1,24 @@
+################################################################################
+#
+# Copyright (c) 2020–2021 Dominus Iniquitatis <zerosaiko@gmail.com>
+#
+# See LICENSE file for the licensing information
+#
+################################################################################
+
+# MASFIX: monkey patch for calendar close button
+init 999 python in comfy_ui.calendar:
+    from renpy.text.text import Text
+    from store import MASCalendar
+
+    old_init = MASCalendar.__init__
+
+    def monkey_init(self, *args, **kwargs):
+        old_init(self, *args, **kwargs)
+
+        empty_text = Text("")
+
+        btn = self.button_exit
+        btn._button_states = {k: (empty_text, v[1]) for k, v in btn._button_states.items()}
+
+    MASCalendar.__init__ = monkey_init
diff --git a/Source/mas/theme/comfy_ui/categories.rpy b/Source/mas/theme/comfy_ui/categories.rpy
new file mode 100644
index 0000000..d28878f
--- /dev/null
+++ b/Source/mas/theme/comfy_ui/categories.rpy
@@ -0,0 +1,46 @@
+################################################################################
+#
+# Copyright (c) 2020–2021 Dominus Iniquitatis <zerosaiko@gmail.com>
+#
+# See LICENSE file for the licensing information
+#
+################################################################################
+label comfy_ui_category_fix:
+    python:
+        unlocked_events = Event.filterEvents(
+            evhand.event_database,
+            unlocked = True,
+            pool = pool,
+            aff = mas_curr_affection,
+            flag_ban = EV_FLAG_HFM
+        )
+
+        main_cat_list = list()
+        no_cat_list = list()
+
+        for key in unlocked_events:
+            event = unlocked_events[key]
+
+            if event.category:
+                evhand.addIfNew(event.category, main_cat_list)
+            else:
+                no_cat_list.append(event)
+
+        main_cat_list.sort()
+        no_cat_list.sort(key = Event.getSortPrompt)
+
+        # MASFIX: map category IDs to the actual human-readable names
+        cat_names = {
+            "ddlc": "DDLC",
+        }
+        dis_cat_list = [(cat_names.get(x, x.capitalize()) + "...", x) for x in main_cat_list]
+
+        no_cat_list = [(x.prompt, x.eventlabel) for x in no_cat_list]
+
+        dis_cat_list.extend(no_cat_list)
+
+        cat_lists.append(evhand._NT_CAT_PANE(dis_cat_list, main_cat_list))
+
+init 999 python:
+    namemap = renpy.game.script.namemap
+    namemap["prompts_categories"].block[4].code = namemap["comfy_ui_category_fix"].block[0].code
diff --git a/Source/mas/theme/comfy_ui/definitions.rpy b/Source/mas/theme/comfy_ui/definitions.rpy
index e450be9..675870c 100644
--- a/Source/mas/theme/comfy_ui/definitions.rpy
+++ b/Source/mas/theme/comfy_ui/definitions.rpy
@@ -115,22 +115,12 @@ define comfy_ui.option_button_text.dark.hover_color        = "CUI_SCD_COLOR(230,
 define comfy_ui.option_button_text.dark.selected_color     = "CUI_SCD_COLOR(209, 123, 157)"
 define comfy_ui.option_button_text.dark.insensitive_color  = "CUI_SCD_COLOR(115, 115, 115, 127)"
 
-define comfy_ui.fancy_check_button.light.idle_background_color     = "CUI_PRM_COLOR(0, 0, 0, 0)"
-define comfy_ui.fancy_check_button.light.hover_background_color    = "CUI_PRM_COLOR(255, 189, 225)"
-define comfy_ui.fancy_check_button.light.selected_background_color = "CUI_PRM_COLOR(255, 189, 225)"
-define comfy_ui.fancy_check_button.dark.idle_background_color      = "CUI_PRM_COLOR(0, 0, 0, 0)"
-define comfy_ui.fancy_check_button.dark.hover_background_color     = "CUI_PRM_COLOR(206, 126, 160)"
-define comfy_ui.fancy_check_button.dark.selected_background_color  = "CUI_PRM_COLOR(206, 126, 160)"
-
-define comfy_ui.fancy_check_button_text.font                    = "CUI_OPTION_FONT()"
-define comfy_ui.fancy_check_button_text.font_kerning            = 0.0
-define comfy_ui.fancy_check_button_text.font_size               = 24
-define comfy_ui.fancy_check_button_text.light.idle_color        = "CUI_PRM_COLOR(191, 191, 191)"
-define comfy_ui.fancy_check_button_text.light.hover_color       = "CUI_PRM_COLOR(56, 56, 56)"
-define comfy_ui.fancy_check_button_text.light.selected_color    = "CUI_PRM_COLOR(56, 56, 56)"
-define comfy_ui.fancy_check_button_text.dark.idle_color         = "CUI_PRM_COLOR(191, 191, 191)"
-define comfy_ui.fancy_check_button_text.dark.hover_color        = "CUI_PRM_COLOR(235, 173, 185)"
-define comfy_ui.fancy_check_button_text.dark.selected_color     = "CUI_PRM_COLOR(235, 173, 185)"
+define comfy_ui.fancy_check_button_text.light.idle_color     = "CUI_PRM_COLOR(191, 191, 191)"
+define comfy_ui.fancy_check_button_text.light.hover_color    = "CUI_PRM_COLOR(56, 56, 56)"
+define comfy_ui.fancy_check_button_text.light.selected_color = "CUI_PRM_COLOR(56, 56, 56)"
+define comfy_ui.fancy_check_button_text.dark.idle_color      = "CUI_PRM_COLOR(191, 191, 191)"
+define comfy_ui.fancy_check_button_text.dark.hover_color     = "CUI_PRM_COLOR(56, 56, 56)"
+define comfy_ui.fancy_check_button_text.dark.selected_color  = "CUI_PRM_COLOR(56, 56, 56)"
 
 define comfy_ui.scrollable_menu_button_spacing = 6
 define comfy_ui.choice_button_spacing          = 12
diff --git a/Source/mas/theme/comfy_ui/fonts.rpy b/Source/mas/theme/comfy_ui/fonts.rpy
index eee4aeb..ce965bd 100644
--- a/Source/mas/theme/comfy_ui/fonts.rpy
+++ b/Source/mas/theme/comfy_ui/fonts.rpy
@@ -49,6 +49,19 @@ init 999 style radio_button_text_dark:
     kerning comfy_ui.option_button_text.font_kerning
     size    comfy_ui.option_button_text.font_size
 
+# Fancy check button
+init 999 style generic_fancy_check_button_text:
+    yoffset comfy_ui.button_text.vertical_offset
+    font    comfy_ui.common.font
+    kerning comfy_ui.common.font_kerning
+    size    comfy_ui.common.font_size
+
+init 999 style generic_fancy_check_button_text_dark:
+    yoffset comfy_ui.button_text.vertical_offset
+    font    comfy_ui.common.font
+    kerning comfy_ui.common.font_kerning
+    size    comfy_ui.common.font_size
+
 
 
 ################################################################################
diff --git a/Source/mas/theme/comfy_ui/hangman.rpy b/Source/mas/theme/comfy_ui/hangman.rpy
new file mode 100644
index 0000000..389a3f5
--- /dev/null
+++ b/Source/mas/theme/comfy_ui/hangman.rpy
@@ -0,0 +1,26 @@
+################################################################################
+#
+# Copyright (c) 2020–2021 Dominus Iniquitatis <zerosaiko@gmail.com>
+#
+# See LICENSE file for the licensing information
+#
+################################################################################
+init 999 transform hangman_board:
+    xanchor 0
+    yanchor 0
+    xpos 675
+    ypos 100
+    alpha 1.0
+
+init 999 transform hangman_hangman:
+    xanchor 0
+    yanchor 0
+    # MASFIX: hangman sensitive mode image
+    xpos (880 if not persistent._mas_sensitive_mode else 836)
+    ypos 125
+
+init 999 python in mas_hangman:
+    WORD_FONT = "mod_assets/font/m1_fixed.ttf"
+    WORD_SIZE = 36
+    WORD_COLOR = "#202020"
+    WORD_COLOR_GET = "#000000"
diff --git a/Source/mas/theme/comfy_ui/islands_event.rpy b/Source/mas/theme/comfy_ui/islands_event.rpy
new file mode 100644
index 0000000..f637817
--- /dev/null
+++ b/Source/mas/theme/comfy_ui/islands_event.rpy
@@ -0,0 +1,23 @@
+################################################################################
+#
+# Copyright (c) 2020–2021 Dominus Iniquitatis <zerosaiko@gmail.com>
+#
+# See LICENSE file for the licensing information
+#
+################################################################################
+screen comfy_ui_islands_event_button_fix:
+    hbox:
+        xalign 0.96
+        yalign 0.98
+
+        # MASFIX: using ToggleVariable turns normal button into a "checkbox"
+        if _mas_island_window_open:
+            textbutton "Close Window" action SetVariable("_mas_island_window_open", False)
+        else:
+            textbutton "Open Window" action SetVariable("_mas_island_window_open", True)
+
+        textbutton "Go Back" action Return(False)
+
+init 999 python:
+    screens = renpy.display.screen.screens
+    screens[("mas_show_islands", None)].ast.children[2] = screens[("comfy_ui_islands_event_button_fix", None)].ast.children[0]
diff --git a/Source/mas/theme/comfy_ui/pref_screen.rpy b/Source/mas/theme/comfy_ui/pref_screen.rpy
new file mode 100644
index 0000000..efd8297
--- /dev/null
+++ b/Source/mas/theme/comfy_ui/pref_screen.rpy
@@ -0,0 +1,25 @@
+################################################################################
+#
+# Copyright (c) 2020–2021 Dominus Iniquitatis <zerosaiko@gmail.com>
+#
+# See LICENSE file for the licensing information
+#
+################################################################################
+screen comfy_ui_pref_labels:
+    hbox:
+        label _("Sunrise: ")
+        label _(sr_display)
+
+    hbox:
+        label _("Sunset: ")
+        label _(ss_display)
+
+    hbox:
+        label _("Random Chatter: ")
+        label _(rc_display)
+
+init 999 python:
+    screens = renpy.display.screen.screens
+    screens[("preferences", None)].ast.children[2].block.children[0].children[2].children[1].children[0] = screens[("comfy_ui_pref_labels", None)].ast.children[0]
+    screens[("preferences", None)].ast.children[2].block.children[0].children[2].children[1].children[2] = screens[("comfy_ui_pref_labels", None)].ast.children[1]
+    screens[("preferences", None)].ast.children[2].block.children[0].children[2].children[2].children[0] = screens[("comfy_ui_pref_labels", None)].ast.children[2]
diff --git a/Source/mas/theme/comfy_ui/replacers/mod_assets/buttons/checkbox/fancy_check_bg.svg b/Source/mas/theme/comfy_ui/replacers/mod_assets/buttons/checkbox/fancy_check_bg.svg
new file mode 100644
index 0000000..399e93b
--- /dev/null
+++ b/Source/mas/theme/comfy_ui/replacers/mod_assets/buttons/checkbox/fancy_check_bg.svg
@@ -0,0 +1,12 @@
+<!--============================================================================
+=
+= Copyright (c) 2020–2021 Dominus Iniquitatis <zerosaiko@gmail.com>
+=
+= See LICENSE file for the licensing information
+=
+=============================================================================-->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="35" height="35">
+    <g fill="CUI_PRM_COLOR(255, 189, 225)">
+        <rect x="0" y="0" width="35" height="35" rx="CUI_BTN_ROUNDING()" />
+    </g>
+</svg>
diff --git a/Source/mas/theme/comfy_ui/replacers/mod_assets/buttons/checkbox/fancy_check_bg_d.svg b/Source/mas/theme/comfy_ui/replacers/mod_assets/buttons/checkbox/fancy_check_bg_d.svg
new file mode 100644
index 0000000..cfe58b8
--- /dev/null
+++ b/Source/mas/theme/comfy_ui/replacers/mod_assets/buttons/checkbox/fancy_check_bg_d.svg
@@ -0,0 +1,12 @@
+<!--============================================================================
+=
+= Copyright (c) 2020–2021 Dominus Iniquitatis <zerosaiko@gmail.com>
+=
+= See LICENSE file for the licensing information
+=
+=============================================================================-->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="35" height="35">
+    <g fill="CUI_PRM_COLOR(206, 126, 160)">
+        <rect x="0" y="0" width="35" height="35" rx="CUI_BTN_ROUNDING()" />
+    </g>
+</svg>
diff --git a/Source/mas/theme/comfy_ui/replacers/mod_assets/calendar/calendar_close-n.svg b/Source/mas/theme/comfy_ui/replacers/mod_assets/calendar/calendar_close-n.svg
index 0902063..21a7c48 100644
--- a/Source/mas/theme/comfy_ui/replacers/mod_assets/calendar/calendar_close-n.svg
+++ b/Source/mas/theme/comfy_ui/replacers/mod_assets/calendar/calendar_close-n.svg
@@ -6,7 +6,9 @@
 =
 =============================================================================-->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="74" height="74">
-    <g fill="rgb(150, 107, 128)" stroke="rgb(150, 79, 123)" stroke-width="3">
-        <circle cx="50%" cy="50%" r="35.5" />
+    <g fill="rgb(150, 107, 128)" stroke="rgb(150, 79, 123)" stroke-linecap="round">
+        <circle cx="50%" cy="50%" r="35.5" stroke-width="3" />
+        <line x1="24" y1="24" x2="50" y2="50" stroke-width="4" />
+        <line x1="24" y1="50" x2="50" y2="24" stroke-width="4" />
     </g>
 </svg>
diff --git a/Source/mas/theme/comfy_ui/replacers/mod_assets/calendar/calendar_close.svg b/Source/mas/theme/comfy_ui/replacers/mod_assets/calendar/calendar_close.svg
index 0fcd9cf..408247d 100644
--- a/Source/mas/theme/comfy_ui/replacers/mod_assets/calendar/calendar_close.svg
+++ b/Source/mas/theme/comfy_ui/replacers/mod_assets/calendar/calendar_close.svg
@@ -6,7 +6,9 @@
 =
 =============================================================================-->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="74" height="74">
-    <g fill="rgb(255, 216, 235)" stroke="rgb(255, 160, 225)" stroke-width="3">
-        <circle cx="50%" cy="50%" r="35.5" />
+    <g fill="rgb(255, 216, 235)" stroke="rgb(255, 160, 225)" stroke-linecap="round">
+        <circle cx="50%" cy="50%" r="35.5" stroke-width="3" />
+        <line x1="24" y1="24" x2="50" y2="50" stroke-width="4" />
+        <line x1="24" y1="50" x2="50" y2="24" stroke-width="4" />
     </g>
 </svg>
diff --git a/Source/mas/theme/comfy_ui/replacers/mod_assets/calendar/calendar_close_hover-n.svg b/Source/mas/theme/comfy_ui/replacers/mod_assets/calendar/calendar_close_hover-n.svg
index a214dca..f437ebe 100644
--- a/Source/mas/theme/comfy_ui/replacers/mod_assets/calendar/calendar_close_hover-n.svg
+++ b/Source/mas/theme/comfy_ui/replacers/mod_assets/calendar/calendar_close_hover-n.svg
@@ -6,7 +6,9 @@
 =
 =============================================================================-->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="74" height="74">
-    <g fill="rgb(150, 117, 135)" stroke="rgb(150, 94, 132)" stroke-width="3">
-        <circle cx="50%" cy="50%" r="35.5" />
+    <g fill="rgb(150, 117, 135)" stroke="rgb(150, 94, 132)" stroke-linecap="round">
+        <circle cx="50%" cy="50%" r="35.5" stroke-width="3" />
+        <line x1="24" y1="24" x2="50" y2="50" stroke-width="4" />
+        <line x1="24" y1="50" x2="50" y2="24" stroke-width="4" />
     </g>
 </svg>
diff --git a/Source/mas/theme/comfy_ui/replacers/mod_assets/calendar/calendar_close_hover.svg b/Source/mas/theme/comfy_ui/replacers/mod_assets/calendar/calendar_close_hover.svg
index 8e8de2d..55aeb0f 100644
--- a/Source/mas/theme/comfy_ui/replacers/mod_assets/calendar/calendar_close_hover.svg
+++ b/Source/mas/theme/comfy_ui/replacers/mod_assets/calendar/calendar_close_hover.svg
@@ -6,7 +6,9 @@
 =
 =============================================================================-->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="74" height="74">
-    <g fill="rgb(255, 236, 247)" stroke="rgb(255, 189, 242)" stroke-width="3">
-        <circle cx="50%" cy="50%" r="35.5" />
+    <g fill="rgb(255, 236, 247)" stroke="rgb(255, 189, 242)" stroke-linecap="round">
+        <circle cx="50%" cy="50%" r="35.5" stroke-width="3" />
+        <line x1="24" y1="24" x2="50" y2="50" stroke-width="4" />
+        <line x1="24" y1="50" x2="50" y2="24" stroke-width="4" />
     </g>
 </svg>
diff --git a/Source/mas/theme/comfy_ui/replacers/mod_assets/frames/search_bar.svg b/Source/mas/theme/comfy_ui/replacers/mod_assets/frames/search_bar.svg
new file mode 100644
index 0000000..5dac31d
--- /dev/null
+++ b/Source/mas/theme/comfy_ui/replacers/mod_assets/frames/search_bar.svg
@@ -0,0 +1,12 @@
+<!--============================================================================
+=
+= Copyright (c) 2020–2021 Dominus Iniquitatis <zerosaiko@gmail.com>
+=
+= See LICENSE file for the licensing information
+=
+=============================================================================-->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="35" height="35">
+    <g fill="CUI_PRM_COLOR(255, 170, 153)" fill-opacity="0.666">
+        <rect x="0" y="0" width="35" height="35" rx="CUI_BTN_ROUNDING()" />
+    </g>
+</svg>
diff --git a/Source/mas/theme/comfy_ui/replacers/mod_assets/frames/selector_overlay_hover.svg b/Source/mas/theme/comfy_ui/replacers/mod_assets/frames/selector_overlay_hover.svg
new file mode 100644
index 0000000..003915f
--- /dev/null
+++ b/Source/mas/theme/comfy_ui/replacers/mod_assets/frames/selector_overlay_hover.svg
@@ -0,0 +1,13 @@
+<!--============================================================================
+=
+= Copyright (c) 2020–2021 Dominus Iniquitatis <zerosaiko@gmail.com>
+=
+= See LICENSE file for the licensing information
+=
+=============================================================================-->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="180" height="180">
+    <g fill="CUI_PRM_COLOR(255, 170, 153)" fill-opacity="0.666" stroke="CUI_PRM_COLOR(255, 189, 225)" stroke-width="3">
+        <rect x="1.5" y="-8.5" width="177" height="187" rx="CUI_FRM_ROUNDING()" />
+        <line x1="3" y1="1.5" x2="177" y2="1.5" />
+    </g>
+</svg>
diff --git a/Source/mas/theme/comfy_ui/replacers/mod_assets/frames/selector_overlay_hover_d.svg b/Source/mas/theme/comfy_ui/replacers/mod_assets/frames/selector_overlay_hover_d.svg
new file mode 100644
index 0000000..fa1cc53
--- /dev/null
+++ b/Source/mas/theme/comfy_ui/replacers/mod_assets/frames/selector_overlay_hover_d.svg
@@ -0,0 +1,13 @@
+<!--============================================================================
+=
+= Copyright (c) 2020–2021 Dominus Iniquitatis <zerosaiko@gmail.com>
+=
+= See LICENSE file for the licensing information
+=
+=============================================================================-->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="180" height="180">
+    <g fill="CUI_PRM_COLOR(255, 170, 153)" fill-opacity="0.666" stroke="CUI_PRM_COLOR(206, 126, 160)" stroke-width="3">
+        <rect x="1.5" y="-8.5" width="177" height="187" rx="CUI_FRM_ROUNDING()" />
+        <line x1="3" y1="1.5" x2="177" y2="1.5" />
+    </g>
+</svg>
diff --git a/Source/mas/theme/comfy_ui/search_bar.rpy b/Source/mas/theme/comfy_ui/search_bar.rpy
new file mode 100644
index 0000000..86ac7cb
--- /dev/null
+++ b/Source/mas/theme/comfy_ui/search_bar.rpy
@@ -0,0 +1,16 @@
+################################################################################
+#
+# Copyright (c) 2020–2021 Dominus Iniquitatis <zerosaiko@gmail.com>
+#
+# See LICENSE file for the licensing information
+#
+################################################################################
+init 999 python:
+    # MASFIX: replace basic search bar Solid() by an actual image
+    screens = renpy.display.screen.screens
+    screens[("twopane_scrollable_menu", None)].ast.children[3].keyword[4] = (
+        "background", "Frame('mod_assets/frames/search_bar.png', Borders(5, 5, 5, 5))"
+    )
+    screens[("mas_selector_sidebar", None)].ast.children[2].keyword[4] = (
+        "background", "Frame('mod_assets/frames/search_bar.png', Borders(5, 5, 5, 5))"
+    )
diff --git a/Source/mas/theme/comfy_ui/selector.rpy b/Source/mas/theme/comfy_ui/selector.rpy
new file mode 100644
index 0000000..6eafa9b
--- /dev/null
+++ b/Source/mas/theme/comfy_ui/selector.rpy
@@ -0,0 +1,119 @@
+################################################################################
+#
+# Copyright (c) 2020–2021 Dominus Iniquitatis <zerosaiko@gmail.com>
+#
+# See LICENSE file for the licensing information
+#
+################################################################################
+
+# MASFIX: monkey patch for selector image buttons
+init 999 python in comfy_ui.selector:
+    from renpy.display.im import Image
+    from renpy.display.imagelike import Borders, Frame
+    from renpy.display.transform import Transform
+    from store import MASSelectableImageButtonDisplayable, mas_getTimeFile
+
+    old_init = MASSelectableImageButtonDisplayable.__init__
+
+    def monkey_init(self, *args, **kwargs):
+        old_init(self, *args, **kwargs)
+
+        self.thumb_overlay = Image(mas_getTimeFile("mod_assets/frames/selector_overlay.png"))
+        self.thumb_overlay_locked = Image(mas_getTimeFile("mod_assets/frames/selector_overlay_disabled.png"))
+        self.hover_overlay = Image(mas_getTimeFile("mod_assets/frames/selector_overlay_hover.png"))
+        self.top_frame = Frame(mas_getTimeFile("mod_assets/frames/selector_top_frame.png"), Borders(10, 10, 10, 10))
+        self.top_frame_selected = Frame(mas_getTimeFile("mod_assets/frames/selector_top_frame_selected.png"), Borders(10, 10, 10, 10))
+        self.top_frame_locked = Frame(mas_getTimeFile("mod_assets/frames/selector_top_frame_disabled.png"), Borders(10, 10, 10, 10))
+
+    def monkey_render_bottom_frame(self, hover, st, at):
+        thumb = Transform(self.thumb, pos = (3, 3), crop = (3, 3, self.WIDTH - 6, self.SELECTOR_HEIGHT - 6))
+        thumb_render = renpy.Render(self.WIDTH, self.SELECTOR_HEIGHT)
+        thumb_render.place(thumb)
+
+        renders = [thumb_render]
+
+        if hover:
+            renders.append(self._render_bottom_frame_piece(self.hover_overlay, st, at))
+        else:
+            renders.append(self._render_bottom_frame_piece(self.thumb_overlay, st, at))
+
+        return renders
+
+    MASSelectableImageButtonDisplayable.__init__ = monkey_init
+    MASSelectableImageButtonDisplayable._render_bottom_frame = monkey_render_bottom_frame
+
+# MASFIX: broken layout in the clothing/hairstyle selector
+screen comfy_ui_selector_fix:
+    frame:
+        area (1075, 50, 200, sel_frame_vsize - 45)
+        background Frame(store.mas_ui.sel_sb_frame, Borders(10, 10, 10, 10))
+        ypadding 10
+
+        vbox:
+            xsize 200
+            xalign 0.5
+            spacing 5
+
+            viewport id "sidebar_scroll":
+                mousewheel True
+                arrowkeys True
+
+                vbox:
+                    xsize 200
+                    spacing 10
+
+                    if remover is not None:
+                        add remover:
+                            xalign 0.5
+
+                    for selectable in flt_items:
+                        add selectable:
+                            xalign 0.5
+
+            null height 5
+
+            if mailbox.read_outfit_checkbox_visible():
+                $ ocb_checked = mailbox.read_outfit_checkbox_checked()
+
+                textbutton _("Outfit Mode"):
+                    style "generic_fancy_check_button"
+                    xsize 200
+                    activate_sound gui.activate_sound
+                    action [
+                        ToggleField(persistent, "_mas_setting_ocb"),
+                        Function(
+                            mailbox.send_outfit_checkbox_checked,
+                            not ocb_checked
+                        )
+                    ]
+                    selected ocb_checked
+
+        vbar value YScrollValue("sidebar_scroll"):
+            style "mas_selector_sidebar_vbar"
+            xoffset -25
+            # NOTE: compensating the frame padding
+            yoffset -10
+            ysize (sel_frame_vsize - 45)
+
+    vbox:
+        style_prefix "hkb"
+        xpos 1115
+        yanchor 1.0
+        ypos 715
+
+        if mailbox.read_conf_enable():
+            textbutton _("Confirm") action Jump(confirm)
+        else:
+            textbutton _("Confirm")
+
+        if mailbox.read_restore_enable():
+            textbutton _("Restore") action Jump(restore)
+        else:
+            textbutton _("Restore")
+
+        textbutton _("Cancel") action Jump(cancel)
+
+init 999 python:
+    screens = renpy.display.screen.screens
+    screens[("mas_selector_sidebar", None)].ast.children[3] = screens[("comfy_ui_selector_fix", None)].ast.children[0]
+    screens[("mas_selector_sidebar", None)].ast.children.append(screens[("comfy_ui_selector_fix", None)].ast.children[1])
diff --git a/Source/mas/theme/comfy_ui/styles.rpy b/Source/mas/theme/comfy_ui/styles.rpy
index 96e6abe..bd70f51 100644
--- a/Source/mas/theme/comfy_ui/styles.rpy
+++ b/Source/mas/theme/comfy_ui/styles.rpy
@@ -54,27 +54,29 @@ init 999 style radio_button_text_dark:
 
 # Fancy check button
 init 999 style generic_fancy_check_button:
-    idle_background     Solid(comfy_ui.fancy_check_button.light.idle_background_color)
-    hover_background    Solid(comfy_ui.fancy_check_button.light.hover_background_color)
-    selected_background Solid(comfy_ui.fancy_check_button.light.selected_background_color)
+    ysize               36
+    foreground          Transform("mod_assets/buttons/checkbox/[prefix_]fancy_check.png", yalign = 0.5)
+    idle_background     Null()
+    hover_background    Frame("mod_assets/buttons/checkbox/fancy_check_bg.png", Borders(5, 5, 5, 5))
+    selected_background Frame("mod_assets/buttons/checkbox/fancy_check_bg.png", Borders(5, 5, 5, 5))
 
 init 999 style generic_fancy_check_button_dark:
-    idle_background     Solid(comfy_ui.fancy_check_button.dark.idle_background_color)
-    hover_background    Solid(comfy_ui.fancy_check_button.dark.hover_background_color)
-    selected_background Solid(comfy_ui.fancy_check_button.dark.selected_background_color)
+    ysize               36
+    foreground          Transform("mod_assets/buttons/checkbox/[prefix_]fancy_check.png", yalign = 0.5)
+    idle_background     Null()
+    hover_background    Frame("mod_assets/buttons/checkbox/fancy_check_bg_d.png", Borders(5, 5, 5, 5))
+    selected_background Frame("mod_assets/buttons/checkbox/fancy_check_bg_d.png", Borders(5, 5, 5, 5))
 
 init 999 style generic_fancy_check_button_text:
-    font           comfy_ui.fancy_check_button_text.font
-    kerning        comfy_ui.fancy_check_button_text.font_kerning
-    size           comfy_ui.fancy_check_button_text.font_size
+    yalign         0.5
+    font           gui.default_font
     color          comfy_ui.fancy_check_button_text.light.idle_color
     hover_color    comfy_ui.fancy_check_button_text.light.hover_color
     selected_color comfy_ui.fancy_check_button_text.light.selected_color
 
 init 999 style generic_fancy_check_button_text_dark:
-    font           comfy_ui.fancy_check_button_text.font
-    kerning        comfy_ui.fancy_check_button_text.font_kerning
-    size           comfy_ui.fancy_check_button_text.font_size
+    yalign         0.5
+    font           gui.default_font
     color          comfy_ui.fancy_check_button_text.dark.idle_color
     hover_color    comfy_ui.fancy_check_button_text.dark.hover_color
     selected_color comfy_ui.fancy_check_button_text.dark.selected_color
@@ -531,20 +533,3 @@ init 999 image input_caret:
         linear 0.35 alpha 0
         linear 0.35 alpha 1
         repeat
-
-
-
-################################################################################
-# Hangman game
-################################################################################
-init 999 transform hangman_board:
-    xanchor 0
-    yanchor 0
-    xpos 675
-    ypos 100
-    alpha 1.0
-
-init 999 python in mas_hangman:
-    WORD_FONT = "mod_assets/font/m1_fixed.ttf"
-    WORD_SIZE = 36
-    WORD_COLOR = "#202020"