diff --git a/comfy_extras/nodes_ace.py b/comfy_extras/nodes_ace.py
index ef4c4f125..eaf234d5b 100644
--- a/comfy_extras/nodes_ace.py
+++ b/comfy_extras/nodes_ace.py
@@ -111,8 +111,8 @@ class ReferenceAudio(IO.ComfyNode):
     def define_schema(cls):
         return IO.Schema(
             node_id="ReferenceTimbreAudio",
-            display_name="Reference Audio",
-            category="advanced/conditioning/audio",
+            display_name="Set Reference Audio",
+            category="model/conditioning",
             is_experimental=True,
             description="This node sets the reference audio for ace step 1.5",
             inputs=[
diff --git a/comfy_extras/nodes_clip_sdxl.py b/comfy_extras/nodes_clip_sdxl.py
index 7a001af6f..08fbbd827 100644
--- a/comfy_extras/nodes_clip_sdxl.py
+++ b/comfy_extras/nodes_clip_sdxl.py
@@ -9,7 +9,8 @@ class CLIPTextEncodeSDXLRefiner(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="CLIPTextEncodeSDXLRefiner",
-            category="advanced/conditioning",
+            display_name="CLIP Text Encode (SDXL Refiner)",
+            category="model/conditioning/stable diffusion",
             inputs=[
                 io.Float.Input("ascore", default=6.0, min=0.0, max=1000.0, step=0.01),
                 io.Int.Input("width", default=1024, min=0, max=nodes.MAX_RESOLUTION),
@@ -30,7 +31,8 @@ class CLIPTextEncodeSDXL(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="CLIPTextEncodeSDXL",
-            category="advanced/conditioning",
+            display_name="CLIP Text Encode (SDXL)",
+            category="model/conditioning/stable diffusion",
             inputs=[
                 io.Clip.Input("clip"),
                 io.Int.Input("width", default=1024, min=0, max=nodes.MAX_RESOLUTION),
diff --git a/comfy_extras/nodes_edit_model.py b/comfy_extras/nodes_edit_model.py
index 36da66f34..d0d20ae7a 100644
--- a/comfy_extras/nodes_edit_model.py
+++ b/comfy_extras/nodes_edit_model.py
@@ -8,7 +8,8 @@ class ReferenceLatent(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="ReferenceLatent",
-            category="advanced/conditioning/edit_models",
+            display_name="Set Reference Latent",
+            category="model/conditioning",
             description="This node sets the guiding latent for an edit model. If the model supports it you can chain multiple to set multiple reference images.",
             inputs=[
                 io.Conditioning.Input("conditioning"),
diff --git a/comfy_extras/nodes_flux.py b/comfy_extras/nodes_flux.py
index c0e86515f..e9986c9e7 100644
--- a/comfy_extras/nodes_flux.py
+++ b/comfy_extras/nodes_flux.py
@@ -13,7 +13,7 @@ class CLIPTextEncodeFlux(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="CLIPTextEncodeFlux",
-            category="advanced/conditioning/flux",
+            category="model/conditioning/flux",
             inputs=[
                 io.Clip.Input("clip"),
                 io.String.Input("clip_l", multiline=True, dynamic_prompts=True),
@@ -61,7 +61,7 @@ class FluxGuidance(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="FluxGuidance",
-            category="advanced/conditioning/flux",
+            category="model/conditioning/flux",
             inputs=[
                 io.Conditioning.Input("conditioning"),
                 io.Float.Input("guidance", default=3.5, min=0.0, max=100.0, step=0.1),
@@ -84,7 +84,7 @@ class FluxDisableGuidance(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="FluxDisableGuidance",
-            category="advanced/conditioning/flux",
+            category="model/conditioning/flux",
             description="This node completely disables the guidance embed on Flux and Flux like models",
             inputs=[
                 io.Conditioning.Input("conditioning"),
@@ -128,7 +128,7 @@ class FluxKontextImageScale(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="FluxKontextImageScale",
-            category="advanced/conditioning/flux",
+            category="model/conditioning/flux",
             description="This node resizes the image to one that is more optimal for flux kontext.",
             inputs=[
                 io.Image.Input("image"),
@@ -156,7 +156,7 @@ class FluxKontextMultiReferenceLatentMethod(io.ComfyNode):
         return io.Schema(
             node_id="FluxKontextMultiReferenceLatentMethod",
             display_name="Edit Model Reference Method",
-            category="advanced/conditioning/flux",
+            category="model/conditioning/flux",
             inputs=[
                 io.Conditioning.Input("conditioning"),
                 io.Combo.Input(
diff --git a/comfy_extras/nodes_hidream.py b/comfy_extras/nodes_hidream.py
index e345fe51d..c34bb3196 100644
--- a/comfy_extras/nodes_hidream.py
+++ b/comfy_extras/nodes_hidream.py
@@ -38,8 +38,9 @@ class CLIPTextEncodeHiDream(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="CLIPTextEncodeHiDream",
+            display_name="CLIP Text Encode (HiDream)",
             search_aliases=["hidream prompt"],
-            category="advanced/conditioning",
+            category="model/conditioning/hidream",
             inputs=[
                 io.Clip.Input("clip"),
                 io.String.Input("clip_l", multiline=True, dynamic_prompts=True),
diff --git a/comfy_extras/nodes_hunyuan.py b/comfy_extras/nodes_hunyuan.py
index 21169f5cf..8df2c8908 100644
--- a/comfy_extras/nodes_hunyuan.py
+++ b/comfy_extras/nodes_hunyuan.py
@@ -14,7 +14,8 @@ class CLIPTextEncodeHunyuanDiT(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="CLIPTextEncodeHunyuanDiT",
-            category="advanced/conditioning",
+            display_name="CLIP Text Encode (Hunyuan Image)",
+            category="model/conditioning/hunyuan image",
             inputs=[
                 io.Clip.Input("clip"),
                 io.String.Input("bert", multiline=True, dynamic_prompts=True),
@@ -277,7 +278,7 @@ class TextEncodeHunyuanVideo_ImageToVideo(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="TextEncodeHunyuanVideo_ImageToVideo",
-            category="advanced/conditioning",
+            category="model/conditioning/hunyuan video",
             inputs=[
                 io.Clip.Input("clip"),
                 io.ClipVisionOutput.Input("clip_vision_output"),
diff --git a/comfy_extras/nodes_kandinsky5.py b/comfy_extras/nodes_kandinsky5.py
index c6956c821..96cca0386 100644
--- a/comfy_extras/nodes_kandinsky5.py
+++ b/comfy_extras/nodes_kandinsky5.py
@@ -104,8 +104,9 @@ class CLIPTextEncodeKandinsky5(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="CLIPTextEncodeKandinsky5",
+            display_name="CLIP Text Encode (Kandinsky 5)",
             search_aliases=["kandinsky prompt"],
-            category="advanced/conditioning/kandinsky5",
+            category="model/conditioning/kandinsky",
             inputs=[
                 io.Clip.Input("clip"),
                 io.String.Input("clip_l", multiline=True, dynamic_prompts=True),
diff --git a/comfy_extras/nodes_lumina2.py b/comfy_extras/nodes_lumina2.py
index c060a86a0..c773b4026 100644
--- a/comfy_extras/nodes_lumina2.py
+++ b/comfy_extras/nodes_lumina2.py
@@ -80,8 +80,8 @@ class CLIPTextEncodeLumina2(io.ComfyNode):
         return io.Schema(
             node_id="CLIPTextEncodeLumina2",
             search_aliases=["lumina prompt"],
-            display_name="CLIP Text Encode for Lumina2",
-            category="model/conditioning",
+            display_name="CLIP Text Encode (Lumina 2)",
+            category="model/conditioning/lumina",
             description="Encodes a system prompt and a user prompt using a CLIP model into an embedding "
                         "that can be used to guide the diffusion model towards generating specific images.",
             inputs=[
diff --git a/comfy_extras/nodes_model_patch.py b/comfy_extras/nodes_model_patch.py
index bdccbf8c4..85421dd8b 100644
--- a/comfy_extras/nodes_model_patch.py
+++ b/comfy_extras/nodes_model_patch.py
@@ -479,7 +479,7 @@ class QwenImageDiffsynthControlnet:
     FUNCTION = "diffsynth_controlnet"
     EXPERIMENTAL = True
 
-    CATEGORY = "advanced/loaders/qwen"
+    CATEGORY = "model/patch/qwen"
 
     def diffsynth_controlnet(self, model, model_patch, vae, image=None, strength=1.0, inpaint_image=None, mask=None):
         model_patched = model.clone()
@@ -675,3 +675,11 @@ NODE_CLASS_MAPPINGS = {
     "USOStyleReference": USOStyleReference,
     "SUPIRApply": SUPIRApply,
 }
+
+NODE_DISPLAY_NAMES = {
+    "ModelPatchLoader": "Load Model Patch",
+    "QwenImageDiffsynthControlnet": "Apply Qwen Image DiffSynth ControlNet",
+    "ZImageFunControlnet": "Apply Z-Image Fun ControlNet",
+    "USOStyleReference": "Apply USO Style Reference",
+    "SUPIRApply": "Apply SUPIR Patch",
+}
\ No newline at end of file
diff --git a/comfy_extras/nodes_pid.py b/comfy_extras/nodes_pid.py
index 71855254e..a3ffd9671 100644
--- a/comfy_extras/nodes_pid.py
+++ b/comfy_extras/nodes_pid.py
@@ -14,10 +14,8 @@ class PiDConditioning(io.ComfyNode):
         return io.Schema(
             node_id="PiDConditioning",
             display_name="PiD Conditioning",
-            category="advanced/conditioning",
-            description=(
-                "Attaches a latent and a degrade_sigma scalar to a CONDITIONING for PiD decoding/upscaling"
-            ),
+            category="model/conditioning",
+            description=("Attaches a latent and a degrade_sigma scalar to a CONDITIONING for PiD decoding/upscaling"),
             inputs=[
                 io.Conditioning.Input("positive"),
                 io.Latent.Input("latent", tooltip="latent (from VAEEncode or a KSampler)."),
diff --git a/comfy_extras/nodes_pixart.py b/comfy_extras/nodes_pixart.py
index 2f1b73e60..f878a33b5 100644
--- a/comfy_extras/nodes_pixart.py
+++ b/comfy_extras/nodes_pixart.py
@@ -7,8 +7,9 @@ class CLIPTextEncodePixArtAlpha(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="CLIPTextEncodePixArtAlpha",
+            display_name="CLIP Text Encode (PixArt Alpha)",
             search_aliases=["pixart prompt"],
-            category="advanced/conditioning",
+            category="model/conditioning/pixart",
             description="Encodes text and sets the resolution conditioning for PixArt Alpha. Does not apply to PixArt Sigma.",
             inputs=[
                 io.Int.Input("width", default=1024, min=0, max=nodes.MAX_RESOLUTION),
diff --git a/comfy_extras/nodes_qwen.py b/comfy_extras/nodes_qwen.py
index 5b92814a4..4960774db 100644
--- a/comfy_extras/nodes_qwen.py
+++ b/comfy_extras/nodes_qwen.py
@@ -12,7 +12,7 @@ class TextEncodeQwenImageEdit(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="TextEncodeQwenImageEdit",
-            category="advanced/conditioning",
+            category="model/conditioning/qwen image",
             inputs=[
                 io.Clip.Input("clip"),
                 io.String.Input("prompt", multiline=True, dynamic_prompts=True),
@@ -55,7 +55,7 @@ class TextEncodeQwenImageEditPlus(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="TextEncodeQwenImageEditPlus",
-            category="advanced/conditioning",
+            category="model/conditioning/qwen image",
             inputs=[
                 io.Clip.Input("clip"),
                 io.String.Input("prompt", multiline=True, dynamic_prompts=True),
diff --git a/comfy_extras/nodes_sd3.py b/comfy_extras/nodes_sd3.py
index d66bc2806..7eaf2d4ca 100644
--- a/comfy_extras/nodes_sd3.py
+++ b/comfy_extras/nodes_sd3.py
@@ -66,7 +66,8 @@ class CLIPTextEncodeSD3(io.ComfyNode):
         return io.Schema(
             node_id="CLIPTextEncodeSD3",
             search_aliases=["sd3 prompt"],
-            category="advanced/conditioning",
+            display_name="CLIP Text Encode (SD3)",
+            category="model/conditioning/stable diffusion",
             inputs=[
                 io.Clip.Input("clip"),
                 io.String.Input("clip_l", multiline=True, dynamic_prompts=True),
diff --git a/comfy_extras/nodes_video_model.py b/comfy_extras/nodes_video_model.py
index 8771062af..c7c3efec8 100644
--- a/comfy_extras/nodes_video_model.py
+++ b/comfy_extras/nodes_video_model.py
@@ -138,7 +138,7 @@ class ConditioningSetAreaPercentageVideo:
     RETURN_TYPES = ("CONDITIONING",)
     FUNCTION = "append"
 
-    CATEGORY = "model/conditioning"
+    CATEGORY = "model/conditioning/transform"
 
     def append(self, conditioning, width, height, temporal, x, y, z, strength):
         c = node_helpers.conditioning_set_values(conditioning, {"area": ("percentage", temporal, height, width, z, y, x),
@@ -160,4 +160,5 @@ NODE_DISPLAY_NAME_MAPPINGS = {
     "ImageOnlyCheckpointLoader": "Load Checkpoint Image Only (img2vid model)",
     "VideoLinearCFGGuidance": "Video Linear CFG Guidance",
     "VideoTriangleCFGGuidance": "Video Triangle CFG Guidance",
+    "ConditioningSetAreaPercentageVideo": "Conditioning (Set Area with Percentage for Video)",
 }
diff --git a/comfy_extras/nodes_void.py b/comfy_extras/nodes_void.py
index 88e00736b..7527baf43 100644
--- a/comfy_extras/nodes_void.py
+++ b/comfy_extras/nodes_void.py
@@ -393,7 +393,7 @@ class VOIDWarpedNoiseSource(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="VOIDWarpedNoiseSource",
-            category="model/sampling/void",
+            category="model/latent/void",
             inputs=[
                 io.Latent.Input("warped_noise",
                     tooltip="Warped noise latent from VOIDWarpedNoise"),
diff --git a/comfy_extras/nodes_zimage.py b/comfy_extras/nodes_zimage.py
index 70ddc4afa..ce946b377 100644
--- a/comfy_extras/nodes_zimage.py
+++ b/comfy_extras/nodes_zimage.py
@@ -10,7 +10,7 @@ class TextEncodeZImageOmni(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="TextEncodeZImageOmni",
-            category="advanced/conditioning",
+            category="model/conditioning/z-image",
             is_experimental=True,
             inputs=[
                 io.Clip.Input("clip"),
diff --git a/nodes.py b/nodes.py
index ab8d5b36f..316230b22 100644
--- a/nodes.py
+++ b/nodes.py
@@ -87,7 +87,7 @@ class ConditioningCombine:
     RETURN_TYPES = ("CONDITIONING",)
     FUNCTION = "combine"
 
-    CATEGORY = "model/conditioning"
+    CATEGORY = "model/conditioning/transform"
     SEARCH_ALIASES = ["combine", "merge conditioning", "combine prompts", "merge prompts", "mix prompts", "add prompt"]
 
     def combine(self, conditioning_1, conditioning_2):
@@ -104,7 +104,7 @@ class ConditioningAverage :
     RETURN_TYPES = ("CONDITIONING",)
     FUNCTION = "addWeighted"
 
-    CATEGORY = "model/conditioning"
+    CATEGORY = "model/conditioning/transform"
 
     def addWeighted(self, conditioning_to, conditioning_from, conditioning_to_strength):
         out = []
@@ -143,7 +143,7 @@ class ConditioningConcat:
     RETURN_TYPES = ("CONDITIONING",)
     FUNCTION = "concat"
 
-    CATEGORY = "model/conditioning"
+    CATEGORY = "model/conditioning/transform"
 
     def concat(self, conditioning_to, conditioning_from):
         out = []
@@ -176,7 +176,7 @@ class ConditioningSetArea:
     RETURN_TYPES = ("CONDITIONING",)
     FUNCTION = "append"
 
-    CATEGORY = "model/conditioning"
+    CATEGORY = "model/conditioning/transform"
 
     def append(self, conditioning, width, height, x, y, strength):
         c = node_helpers.conditioning_set_values(conditioning, {"area": (height // 8, width // 8, y // 8, x // 8),
@@ -197,7 +197,7 @@ class ConditioningSetAreaPercentage:
     RETURN_TYPES = ("CONDITIONING",)
     FUNCTION = "append"
 
-    CATEGORY = "model/conditioning"
+    CATEGORY = "model/conditioning/transform"
 
     def append(self, conditioning, width, height, x, y, strength):
         c = node_helpers.conditioning_set_values(conditioning, {"area": ("percentage", height, width, y, x),
@@ -214,7 +214,7 @@ class ConditioningSetAreaStrength:
     RETURN_TYPES = ("CONDITIONING",)
     FUNCTION = "append"
 
-    CATEGORY = "model/conditioning"
+    CATEGORY = "model/conditioning/transform"
 
     def append(self, conditioning, strength):
         c = node_helpers.conditioning_set_values(conditioning, {"strength": strength})
@@ -234,7 +234,7 @@ class ConditioningSetMask:
     RETURN_TYPES = ("CONDITIONING",)
     FUNCTION = "append"
 
-    CATEGORY = "model/conditioning"
+    CATEGORY = "model/conditioning/transform"
 
     def append(self, conditioning, mask, set_cond_area, strength):
         set_area_to_bounds = False
@@ -257,7 +257,7 @@ class ConditioningZeroOut:
     RETURN_TYPES = ("CONDITIONING",)
     FUNCTION = "zero_out"
 
-    CATEGORY = "advanced/conditioning"
+    CATEGORY = "model/conditioning"
 
     def zero_out(self, conditioning):
         c = []
@@ -283,11 +283,10 @@ class ConditioningSetTimestepRange:
     RETURN_TYPES = ("CONDITIONING",)
     FUNCTION = "set_range"
 
-    CATEGORY = "advanced/conditioning"
+    CATEGORY = "model/conditioning/transform"
 
     def set_range(self, conditioning, start, end):
-        c = node_helpers.conditioning_set_values(conditioning, {"start_percent": start,
-                                                                "end_percent": end})
+        c = node_helpers.conditioning_set_values(conditioning, {"start_percent": start, "end_percent": end})
         return (c, )
 
 class VAEDecode:
@@ -576,7 +575,7 @@ class CheckpointLoader:
     RETURN_TYPES = ("MODEL", "CLIP", "VAE")
     FUNCTION = "load_checkpoint"
 
-    CATEGORY = "advanced/loaders"
+    CATEGORY = "model/loaders"
     DEPRECATED = True
 
     def load_checkpoint(self, config_name, ckpt_name):
@@ -622,8 +621,9 @@ class DiffusersLoader:
         return {"required": {"model_path": (paths,), }}
     RETURN_TYPES = ("MODEL", "CLIP", "VAE")
     FUNCTION = "load_checkpoint"
+    DEPRECATED = True
 
-    CATEGORY = "advanced/loaders/deprecated"
+    CATEGORY = "model/loaders"
 
     def load_checkpoint(self, model_path, output_vae=True, output_clip=True):
         for search_path in folder_paths.get_folder_paths("diffusers"):
@@ -1005,7 +1005,7 @@ class DualCLIPLoader:
     RETURN_TYPES = ("CLIP",)
     FUNCTION = "load_clip"
 
-    CATEGORY = "advanced/loaders"
+    CATEGORY = "model/loaders"
 
     DESCRIPTION = "[Recipes]\n\nsdxl: clip-l, clip-g\nsd3: clip-l, clip-g / clip-l, t5 / clip-g, t5\nflux: clip-l, t5\nhidream: at least one of t5 or llama, recommended t5 and llama\nhunyuan_image: qwen2.5vl 7b and byt5 small\nnewbie: gemma-3-4b-it, jina clip v2"
 
@@ -2043,7 +2043,7 @@ NODE_CLASS_MAPPINGS = {
     "ImageBatch": ImageBatch,
     "ImagePadForOutpaint": ImagePadForOutpaint,
     "EmptyImage": EmptyImage,
-    "ConditioningAverage": ConditioningAverage ,
+    "ConditioningAverage": ConditioningAverage,
     "ConditioningCombine": ConditioningCombine,
     "ConditioningConcat": ConditioningConcat,
     "ConditioningSetArea": ConditioningSetArea,
@@ -2106,6 +2106,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {
     "UNETLoader": "Load Diffusion Model",
     "unCLIPCheckpointLoader": "Load unCLIP Checkpoint",
     "GLIGENLoader": "Load GLIGEN Model",
+    "DiffusersLoader": "Load Diffusers Model (DEPRECATED)",
     # Conditioning
     "CLIPVisionEncode": "CLIP Vision Encode",
     "StyleModelApply": "Apply Style Model",
@@ -2113,13 +2114,16 @@ NODE_DISPLAY_NAME_MAPPINGS = {
     "CLIPSetLastLayer": "CLIP Set Last Layer",
     "ConditioningCombine": "Conditioning (Combine)",
     "ConditioningAverage ": "Conditioning (Average)",
+    "ConditioningAverage": "Conditioning (Average)",
     "ConditioningConcat": "Conditioning (Concat)",
     "ConditioningSetArea": "Conditioning (Set Area)",
     "ConditioningSetAreaPercentage": "Conditioning (Set Area with Percentage)",
+    "ConditioningSetAreaStrength": "Conditioning (Set Area Strength)",
     "ConditioningSetMask": "Conditioning (Set Mask)",
     "ControlNetApply": "Apply ControlNet (DEPRECATED)",
     "ControlNetApplyAdvanced": "Apply ControlNet",
     "GLIGENTextBoxApply": "Apply GLIGEN Text Box",
+    "ConditioningZeroOut": "Conditioning Zero Out",
     # Latent
     "VAEEncodeForInpaint": "VAE Encode (for Inpainting)",
     "SetLatentNoiseMask": "Set Latent Noise Mask",