diff --git a/OP_brushes.py b/OP_brushes.py
index b4f4741..a1adb73 100644
--- a/OP_brushes.py
+++ b/OP_brushes.py
@@ -89,12 +89,12 @@ def register():
     for cl in classes:
         bpy.utils.register_class(cl)
 
-    bpy.types.VIEW3D_MT_brush_gpencil_context_menu.append(load_brush_ui)
+    bpy.types.VIEW3D_MT_brush_gpencil_context_menu.append(load_brush_ui) # FIXME
     bpy.types.VIEW3D_HT_tool_header.append(load_brush_top_bar_ui)
 
 def unregister():
     bpy.types.VIEW3D_HT_tool_header.remove(load_brush_top_bar_ui)
-    bpy.types.VIEW3D_MT_brush_gpencil_context_menu.remove(load_brush_ui)
+    bpy.types.VIEW3D_MT_brush_gpencil_context_menu.remove(load_brush_ui) # FIXME
     
     for cl in reversed(classes):
         bpy.utils.unregister_class(cl)
diff --git a/OP_flat_reproject.py b/OP_flat_reproject.py
index 69ec22b..726b91e 100644
--- a/OP_flat_reproject.py
+++ b/OP_flat_reproject.py
@@ -149,12 +149,12 @@ def register():
     for cl in classes:
         bpy.utils.register_class(cl)
 
-    # bpy.types.VIEW3D_MT_gpencil_edit_context_menu.append(flat_reproject_context_menu)
+    # bpy.types.VIEW3D_MT_grease_pencil_edit_context_menu.append(flat_reproject_context_menu)
     # bpy.types.GPENCIL_MT_cleanup.append(flat_reproject_clean_menu)
 
 def unregister():
     # bpy.types.GPENCIL_MT_cleanup.remove(flat_reproject_clean_menu)
-    # bpy.types.VIEW3D_MT_gpencil_edit_context_menu.remove(flat_reproject_context_menu)
+    # bpy.types.VIEW3D_MT_grease_pencil_edit_context_menu.remove(flat_reproject_context_menu)
     
     for cl in reversed(classes):
         bpy.utils.unregister_class(cl)
\ No newline at end of file
diff --git a/OP_layer_manager.py b/OP_layer_manager.py
index b53da05..5bc5fcb 100644
--- a/OP_layer_manager.py
+++ b/OP_layer_manager.py
@@ -548,7 +548,7 @@ class GPTB_OT_rename_gp_layer(Operator):
 ## --- UI layer panel---
 
 def layer_name_builder_ui(self, context):
-    '''appended to DATA_PT_gpencil_layers'''
+    '''appended to DATA_PT_grease_pencil_layers'''
 
     prefs = get_addon_prefs()
     if not prefs.show_prefix_buttons:
@@ -817,7 +817,7 @@ def register():
     for cls in classes:
         bpy.utils.register_class(cls)
 
-    bpy.types.DATA_PT_gpencil_layers.prepend(layer_name_builder_ui)
+    bpy.types.DATA_PT_grease_pencil_layers.prepend(layer_name_builder_ui)
     bpy.types.DOPESHEET_HT_header.append(gpencil_dopesheet_header)
     bpy.types.GPENCIL_MT_layer_context_menu.append(gpencil_layer_dropdown_menu)
     bpy.app.handlers.load_post.append(subscribe_layer_change_handler)
@@ -831,7 +831,7 @@ def unregister():
     bpy.app.handlers.load_post.remove(subscribe_layer_change_handler)
     bpy.types.GPENCIL_MT_layer_context_menu.remove(gpencil_layer_dropdown_menu)
     bpy.types.DOPESHEET_HT_header.remove(gpencil_dopesheet_header)
-    bpy.types.DATA_PT_gpencil_layers.remove(layer_name_builder_ui)
+    bpy.types.DATA_PT_grease_pencil_layers.remove(layer_name_builder_ui)
 
     for cls in reversed(classes):
         bpy.utils.unregister_class(cls)
diff --git a/OP_realign.py b/OP_realign.py
index 6d83899..37ae019 100644
--- a/OP_realign.py
+++ b/OP_realign.py
@@ -450,12 +450,12 @@ def register():
     for cl in classes:
         bpy.utils.register_class(cl)
 
-    bpy.types.VIEW3D_MT_gpencil_edit_context_menu.append(reproject_context_menu)
+    bpy.types.VIEW3D_MT_grease_pencil_edit_context_menu.append(reproject_context_menu)
     bpy.types.GPENCIL_MT_cleanup.append(reproject_clean_menu)
 
 def unregister():
     bpy.types.GPENCIL_MT_cleanup.remove(reproject_clean_menu)
-    bpy.types.VIEW3D_MT_gpencil_edit_context_menu.remove(reproject_context_menu)
+    bpy.types.VIEW3D_MT_grease_pencil_edit_context_menu.remove(reproject_context_menu)
     
     for cl in reversed(classes):
         bpy.utils.unregister_class(cl)
\ No newline at end of file
diff --git a/UI_tools.py b/UI_tools.py
index 02859f8..d9d1618 100644
--- a/UI_tools.py
+++ b/UI_tools.py
@@ -20,7 +20,7 @@ class GPTB_PT_dataprop_panel(Panel):
     # bl_category = "Tool"
     # bl_idname = "ADDONID_PT_panel_name"# identifier, if ommited, takes the name of the class.
     bl_label = "Pseudo color"# title
-    bl_parent_id = "DATA_PT_gpencil_layers"#subpanel of this ID
+    bl_parent_id = "DATA_PT_grease_pencil_layers"#subpanel of this ID
     bl_options = {'DEFAULT_CLOSED'}
 
     def draw(self, context):
@@ -768,7 +768,10 @@ def register():
     for cls in classes:
         bpy.utils.register_class(cls)
     bpy.types.GPENCIL_MT_material_context_menu.append(palette_manager_menu)
-    bpy.types.DOPESHEET_PT_gpencil_layer_display.append(expose_use_channel_color_pref)
+    bpy.types.DOPESHEET_PT_grease_pencil_mode.append(expose_use_channel_color_pref)
+    # bpy.types.GPENCIL_MT_material_context_menu.append(palette_manager_menu)
+    # bpy.types.DOPESHEET_PT_gpencil_layer_display.append(expose_use_channel_color_pref)
+    
     # bpy.types.VIEW3D_HT_header.append(interpolate_header_ui) # WIP
 
     # if bpy.app.version >= (3,0,0):
@@ -777,8 +780,13 @@ def register():
 
 def unregister():
     # bpy.types.VIEW3D_HT_header.remove(interpolate_header_ui) # WIP
-    bpy.types.DOPESHEET_PT_gpencil_layer_display.remove(expose_use_channel_color_pref)
+    
+    bpy.types.DOPESHEET_PT_grease_pencil_mode.remove(expose_use_channel_color_pref)
     bpy.types.GPENCIL_MT_material_context_menu.remove(palette_manager_menu)
+    # bpy.types.DOPESHEET_PT_gpencil_layer_display.remove(expose_use_channel_color_pref)
+    # bpy.types.GPENCIL_MT_material_context_menu.remove(palette_manager_menu)
+    
+    
     # if bpy.app.version >= (3,0,0):
     #     bpy.types.ASSETBROWSER_PT_metadata.remove(asset_browser_ui)