diff --git a/apps/wr/AGENTS.md b/apps/wr/AGENTS.md
index 5b690843c..3acdf0cfd 100644
--- a/apps/wr/AGENTS.md
+++ b/apps/wr/AGENTS.md
@@ -19,6 +19,9 @@ Main technologies:
 - UTF-8 
 - 한글이 깨지지 않도록 주의할 것
 
+## 수정 불가
+- `packages/common/components`는 수정하면 안된다.
+  
 ## 주석 comment
 - 한글 주석을 삭제하지 말 것
 - 신규 component나 함수 자동 생성시 주석을 추가할 것(기본 함수의 역할과 인수 설명)
diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/pbnstReg/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/pbnstReg/page.tsx
index a93575f33..ad2e4d44b 100644
--- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/pbnstReg/page.tsx
+++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/pbnstReg/page.tsx
@@ -364,7 +364,7 @@ export default function PublicReuseFaciltyInsert() {
                 headlist={pubFacHeadList}
                 pageSize={DEFAULT_LIST_SIZE}
                 total={pbnstHasuResCount || 20}
-                headName={"공공 하수처리시설 목록"}
+                headName={"시설물 목록"}
                 cellClick={cellClick}
                 onPageChange={(page) => {
                   setSelectRow(undefined);
diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rainReg/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rainReg/page.tsx
index 37fcab7fc..07b604f9c 100644
--- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rainReg/page.tsx
+++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rainReg/page.tsx
@@ -165,7 +165,7 @@ export default function Home() {
                 headlist={rain.upHeadList}
                 pageSize={rainRegSize}
                 total={rainResCount}
-                headName={"건축물 목록"}
+                headName={"시설물 목록"}
                 cellClick={(val) => {
                   cellClick(val);
                 }}
diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rswtReg/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rswtReg/page.tsx
index 8cdfa1866..95e8702d7 100644
--- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rswtReg/page.tsx
+++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/rswtReg/page.tsx
@@ -142,7 +142,7 @@ export default function Home() {
                   <Button
                     className={btnClass}
                     onClick={() => {
-                      rswtBdstSearch(searchTxt || "", pageNation,laeSeCd);
+                      rswtBdstSearch(searchTxt || "", 1, laeSeCd);
                     }}
                   >
                     조회
@@ -171,7 +171,7 @@ export default function Home() {
                 headlist={rswt.upHeadList}
                 pageSize={rswtRegSize}
                 total={rswtResCount}
-                headName={"건축물 목록"}
+                headName={"시설물 목록"}
                 cellClick={cellClick}
                 onPageChange={setPageNation}
                 index={rswtTableIndex}
diff --git a/packages/common/business_components/src/ui/map/GisTree.js b/packages/common/business_components/src/ui/map/GisTree.js
index cdf67af25..b402d7b47 100644
--- a/packages/common/business_components/src/ui/map/GisTree.js
+++ b/packages/common/business_components/src/ui/map/GisTree.js
@@ -526,7 +526,7 @@ export default React.memo(function GisTree({
 		<>
 			{/* 사이드 패널 */}
 			<div
-				className={`gis-layer-panel absolute left-0 top-0 z-40 flex h-full w-[250px] flex-col overflow-hidden border-r border-gray-300 bg-white transition-all duration-300 ${visible
+				className={`gis-layer-panel absolute left-0 top-0 z-40 flex h-full w-[250px] flex-col overflow-hidden border-r border-border bg-background text-foreground transition-all duration-300 ${visible
 					? "translate-x-0 opacity-100"
 					: "pointer-events-none -translate-x-full opacity-0"
 					}`}
@@ -537,8 +537,8 @@ export default React.memo(function GisTree({
 				>
 					{showLayerPanelTitle && (
 						<>
-							<h3 className="gis-layer-panel-title mx-2 my-4 text-3xl font-bold text-gray-600 text-center">시설물</h3>
-							<hr className="mb-4" />
+							<h3 className="gis-layer-panel-title mx-2 my-4 text-center text-3xl font-bold text-label">시설물</h3>
+							<hr className="mb-4 border-border" />
 						</>
 					)}
 					{/* DnD Tree */}
@@ -570,7 +570,7 @@ export default React.memo(function GisTree({
 								return (
 									<div style={{ display: isVisible ? "block" : "none" }}>
 										<div
-											className="gis-layer-row flex w-full items-center gap-2 rounded px-2 py-1 hover:bg-gray-100"
+											className="gis-layer-row flex w-full items-center gap-2 rounded px-2 py-1 hover:bg-accent"
 											style={{
 												marginInlineStart: depth * 16,
 												width: `calc(100% - ${depth * 16}px)`,
@@ -602,7 +602,7 @@ export default React.memo(function GisTree({
 											{showLayerActionButton && (
 												<button
 													type="button"
-													className="gis-layer-action-button ml-auto shrink-0 rounded-sm border border-[#9cc6f0] bg-white px-2 py-[1px] text-[1.1rem] font-medium leading-5 text-[#2c6fb7] transition-colors hover:bg-[#eef6ff]"
+													className="gis-layer-action-button ml-auto shrink-0 rounded-sm border border-primary bg-background px-2 py-[1px] text-[1.1rem] font-medium leading-5 text-primary transition-colors hover:bg-accent"
 													onClick={() =>
 														handleLayerImgClick(
 															node.data.lyrTyNm,
@@ -652,14 +652,14 @@ export default React.memo(function GisTree({
 					</div>
 				</div>
 				{LayerSettingView && (
-					<div className="gis-layer-setting shrink-0 bg-white px-2 pb-3">
+					<div className="gis-layer-setting shrink-0 bg-background px-2 pb-3">
 						<LayerSettingView />
 					</div>
 				)}
 				{!detachedToggleButton && (
 					<button
 						onClick={() => setVisible(false)}
-						className={`gis-layer-toggle absolute right-[-3px] z-50 transform rounded-l-none rounded-r border border-l border-gray-300 bg-white px-1 py-2 shadow-sm ${toggleButtonPositionClass}`}
+						className={`gis-layer-toggle absolute right-[-3px] z-50 transform rounded-l-none rounded-r border border-l border-border bg-background px-1 py-2 text-foreground shadow-sm ${toggleButtonPositionClass}`}
 					>
 						<ChevronLeft size={16} />
 					</button>
@@ -668,7 +668,7 @@ export default React.memo(function GisTree({
 			{detachedToggleButton && visible && (
 				<button
 					onClick={() => setVisible(false)}
-					className={`gis-layer-toggle absolute left-[250px] z-50 flex h-[36px] w-[20px] transform items-center justify-center rounded-[4px] border border-[#d8dee8] bg-[rgba(255,255,255,0.96)] text-[#1e88e5] shadow-[0_8px_18px_rgba(15,23,42,0.14)] transition hover:bg-[#eaf4ff] ${toggleButtonPositionClass}`}
+					className={`gis-layer-toggle absolute left-[250px] z-50 flex h-[36px] w-[20px] transform items-center justify-center rounded-[4px] border border-border bg-background text-primary shadow-[0_8px_18px_rgba(15,23,42,0.14)] transition hover:bg-accent ${toggleButtonPositionClass}`}
 					title="접기"
 				>
 					<ChevronLeft className="h-4 w-4" />
@@ -678,8 +678,8 @@ export default React.memo(function GisTree({
 				<button
 					onClick={() => setVisible(true)}
 					className={detachedToggleButton
-						? `gis-layer-toggle absolute left-0 z-50 flex h-[36px] w-[20px] transform items-center justify-center rounded-[4px] border border-[#d8dee8] bg-[rgba(255,255,255,0.96)] text-[#1e88e5] shadow-[0_8px_18px_rgba(15,23,42,0.14)] transition hover:bg-[#eaf4ff] ${toggleButtonPositionClass}`
-						: `gis-layer-toggle absolute left-[-3px] z-50 transform rounded-r border border-r border-gray-300 bg-white px-1 py-2 shadow-sm ${toggleButtonPositionClass}`}
+						? `gis-layer-toggle absolute left-0 z-50 flex h-[36px] w-[20px] transform items-center justify-center rounded-[4px] border border-border bg-background text-primary shadow-[0_8px_18px_rgba(15,23,42,0.14)] transition hover:bg-accent ${toggleButtonPositionClass}`
+						: `gis-layer-toggle absolute left-[-3px] z-50 transform rounded-r border border-r border-border bg-background px-1 py-2 text-foreground shadow-sm ${toggleButtonPositionClass}`}
 					title="열기"
 				>
 					{detachedToggleButton ? <ChevronRight className="h-4 w-4" /> : <ChevronRight size={16} />}