From 7d62db2b3b2ad9995cb3399546baff8f9b1f9e56 Mon Sep 17 00:00:00 2001
From: SimGamerJen <SimGamerJen@gmail.com>
Date: Wed, 12 Aug 2026 00:37:40 +0100
Subject: [PATCH 1/3] Fix appearance binding GUI atlas rendering

---
 gui/HP_AppearanceBindingsScreen.xml | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/gui/HP_AppearanceBindingsScreen.xml b/gui/HP_AppearanceBindingsScreen.xml
index 4959bbe..4c19d88 100644
--- a/gui/HP_AppearanceBindingsScreen.xml
+++ b/gui/HP_AppearanceBindingsScreen.xml
@@ -19,10 +19,9 @@
             </BoxLayout>
             <ThreePartBitmap profile="fs25_lineSeparatorTopHighlighted" position="45px -119px" size="1105px 2px" />
 
-            <Bitmap profile="hpHeaderBox" id="helperHeaderBox" position="45px -135px" size="300px 50px">
+            <GuiElement id="helperHeaderBox" position="45px -135px" size="300px 50px">
                 <Text profile="hpHeaderLeft" position="10px 0px" size="250px 40.77px" text="$l10n_hp_header_helper_binding_state" />
-                <ThreePartBitmap profile="fs25_lineSeparatorBottom" position="0px 2px" />
-            </Bitmap>
+            </GuiElement>
 
             <SmoothList profile="hpList" id="helperTable" position="50px -190px" size="290px 270px" focusInit="onOpen" focusChangeTop="nil" focusChangeBottom="nil">
                 <ListItem profile="hpListItem" name="helperRowTemplate" size="290px 40.77px">
@@ -34,10 +33,9 @@
                 <Slider profile="fs25_listSlider" size="6px 262px" dataElementId="helperTable" id="helperSlider" />
             </ThreePartBitmap>
 
-            <Bitmap profile="hpHeaderBox" id="categoryHeaderBox" position="385px -135px" size="265px 50px">
+            <GuiElement id="categoryHeaderBox" position="385px -135px" size="265px 50px">
                 <Text profile="hpHeaderLeft" position="10px 0px" size="235px 40.77px" text="$l10n_hp_header_category" />
-                <ThreePartBitmap profile="fs25_lineSeparatorBottom" position="0px 2px" />
-            </Bitmap>
+            </GuiElement>
 
             <SmoothList profile="hpList" id="categoryTable" position="390px -190px" size="255px 270px" focusChangeTop="nil" focusChangeBottom="nil">
                 <ListItem profile="hpListItem" name="categoryRowTemplate" size="255px 40.77px">
@@ -49,11 +47,10 @@
                 <Slider profile="fs25_listSlider" size="6px 262px" dataElementId="categoryTable" id="categorySlider" />
             </ThreePartBitmap>
 
-            <Bitmap profile="hpHeaderBox" id="presetHeaderBox" position="695px -135px" size="455px 50px">
+            <GuiElement id="presetHeaderBox" position="695px -135px" size="455px 50px">
                 <Text profile="hpHeaderLeft" position="10px 0px" size="265px 40.77px" text="$l10n_hp_header_appearance" />
                 <Text profile="hpHeaderRight" position="285px 0px" size="155px 40.77px" text="$l10n_hp_header_preset_id" />
-                <ThreePartBitmap profile="fs25_lineSeparatorBottom" position="0px 2px" />
-            </Bitmap>
+            </GuiElement>
 
             <SmoothList profile="hpList" id="presetTable" handleFocus="true" selectedWithoutFocus="false" position="700px -190px" size="445px 270px" focusChangeTop="nil" focusChangeBottom="nil">
                 <ListItem profile="hpListItem" name="presetRowTemplate" size="445px 40.77px">
@@ -66,11 +63,10 @@
                 <Slider profile="fs25_listSlider" size="6px 262px" dataElementId="presetTable" id="presetSlider" />
             </ThreePartBitmap>
 
-            <Bitmap profile="hpDetailBox" id="detailBox" position="45px -470px" size="1105px 145px">
+            <GuiElement id="detailBox" position="45px -470px" size="1105px 145px">
                 <Text profile="hpMetaText" id="detailText" position="10px 8px" size="1085px 35px" text="$l10n_hp_detail_select" textLayoutMode="scrolling" />
                 <Text profile="hpMetaText" id="statusText" position="10px -38px" size="1085px 35px" text="$l10n_hp_status_ready" textLayoutMode="scrolling" />
-                <ThreePartBitmap profile="fs25_lineSeparatorBottom" position="0px 2px" />
-            </Bitmap>
+            </GuiElement>
 
         </GuiElement>
 

From 7eac0aba2dc0103b92e2a9fb60b9496b79d18c5c Mon Sep 17 00:00:00 2001
From: SimGamerJen <SimGamerJen@gmail.com>
Date: Wed, 12 Aug 2026 00:37:52 +0100
Subject: [PATCH 2/3] Fix roster manager GUI atlas rendering

---
 gui/HP_RosterManagerScreen.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gui/HP_RosterManagerScreen.xml b/gui/HP_RosterManagerScreen.xml
index 0a8c805..3ba7203 100644
--- a/gui/HP_RosterManagerScreen.xml
+++ b/gui/HP_RosterManagerScreen.xml
@@ -19,15 +19,14 @@
             </BoxLayout>
             <ThreePartBitmap profile="fs25_lineSeparatorTopHighlighted" position="45px -119px" size="1105px 2px" />
 
-            <Bitmap profile="hpHeaderBox" id="rosterHeaderBox" position="45px -135px" size="1105px 50px">
+            <GuiElement id="rosterHeaderBox" position="45px -135px" size="1105px 50px">
                 <Text profile="hpHeaderLeft" position="10px 0px" size="55px 40.77px" text="$l10n_hp_roster_header_slot" />
                 <Text profile="hpHeaderLeft" position="75px 0px" size="210px 40.77px" text="$l10n_hp_roster_header_worker" />
                 <Text profile="hpHeaderLeft" position="295px 0px" size="270px 40.77px" text="$l10n_hp_roster_header_appearance" />
                 <Text profile="hpHeaderLeft" position="575px 0px" size="170px 40.77px" text="$l10n_hp_roster_header_role" />
                 <Text profile="hpHeaderLeft" position="755px 0px" size="140px 40.77px" text="$l10n_hp_roster_header_work_state" />
                 <Text profile="hpHeaderLeft" position="905px 0px" size="185px 40.77px" text="$l10n_hp_roster_header_roster" />
-                <ThreePartBitmap profile="fs25_lineSeparatorBottom" position="0px 2px" />
-            </Bitmap>
+            </GuiElement>
 
             <SmoothList profile="hpList" id="rosterTable" position="50px -190px" size="1095px 345px" focusInit="onOpen" focusChangeTop="nil" focusChangeBottom="nil">
                 <ListItem profile="hpListItem" name="rosterRowTemplate" size="1095px 40.77px">
@@ -44,11 +43,10 @@
                 <Slider profile="fs25_listSlider" size="6px 337px" dataElementId="rosterTable" id="rosterSlider" />
             </ThreePartBitmap>
 
-            <Bitmap profile="hpDetailBox" id="detailBox" position="45px -545px" size="1105px 110px">
+            <GuiElement id="detailBox" position="45px -545px" size="1105px 110px">
                 <Text profile="hpMetaText" id="detailText" position="10px 8px" size="1085px 35px" text="$l10n_hp_roster_detail" textLayoutMode="scrolling" />
                 <Text profile="hpMetaText" id="statusText" position="10px -38px" size="1085px 35px" text="$l10n_hp_status_ready" textLayoutMode="scrolling" />
-                <ThreePartBitmap profile="fs25_lineSeparatorBottom" position="0px 2px" />
-            </Bitmap>
+            </GuiElement>
         </GuiElement>
 
         <BoxLayout profile="fs25_dialogButtonBox" size="1170px 60px">

From ee3e5fa3b78e85b61ee444805eb92357a84e4ad2 Mon Sep 17 00:00:00 2001
From: SimGamerJen <SimGamerJen@gmail.com>
Date: Wed, 12 Aug 2026 00:38:03 +0100
Subject: [PATCH 3/3] Harden management GUI profiles against atlas bleed

---
 gui/guiProfiles.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gui/guiProfiles.xml b/gui/guiProfiles.xml
index fbd1269..f1dbec3 100644
--- a/gui/guiProfiles.xml
+++ b/gui/guiProfiles.xml
@@ -23,11 +23,14 @@
 
     <Profile name="hpList" extends="emptyPanel" with="anchorStretchingYLeft pivotTopLeft" />
 
+    <!-- Retained for compatibility. Management screens now use plain GuiElement containers for these regions. -->
     <Profile name="hpHeaderBox" extends="emptyPanel" with="anchorStretchingYLeft pivotTopLeft">
+        <imageSliceId value="gui.empty" />
         <imageColor value="$preset_hpColorListHeaderBackground"/>
     </Profile>
 
     <Profile name="hpDetailBox" extends="emptyPanel" with="anchorStretchingYLeft pivotTopLeft">
+        <imageSliceId value="gui.empty" />
         <imageColor value="0 0 0 0.45"/>
     </Profile>