diff --git a/leenkx/blender/lnx/lightmapper/utility/encoding.py b/leenkx/blender/lnx/lightmapper/utility/encoding.py
index 96e442bb..1fa6de35 100644
--- a/leenkx/blender/lnx/lightmapper/utility/encoding.py
+++ b/leenkx/blender/lnx/lightmapper/utility/encoding.py
@@ -1,9 +1,12 @@
-import bpy, math, os, gpu, bgl, importlib
+import bpy, math, os, gpu, importlib
 import numpy as np
 from . import utility
 from fractions import Fraction
 from gpu_extras.batch import batch_for_shader
 
+if bpy.app.version < (4, 0, 0):
+    import bgl
+
 def splitLogLuvAlphaAtlas(imageIn, outDir, quality):
     pass
 
diff --git a/leenkx/blender/lnx/lightmapper/utility/gui/Viewport.py b/leenkx/blender/lnx/lightmapper/utility/gui/Viewport.py
index 4e1484ab..f338f824 100644
--- a/leenkx/blender/lnx/lightmapper/utility/gui/Viewport.py
+++ b/leenkx/blender/lnx/lightmapper/utility/gui/Viewport.py
@@ -1,6 +1,9 @@
-import bpy, blf, bgl, os, gpu
+import bpy, blf, os, gpu
 from gpu_extras.batch import batch_for_shader
 
+if bpy.app.version < (4, 0, 0):
+    import bgl
+
 class ViewportDraw:
 
     def __init__(self, context, text):
diff --git a/leenkx/blender/lnx/material/cycles_nodes/nodes_color.py b/leenkx/blender/lnx/material/cycles_nodes/nodes_color.py
index c5913a19..f910a25e 100644
--- a/leenkx/blender/lnx/material/cycles_nodes/nodes_color.py
+++ b/leenkx/blender/lnx/material/cycles_nodes/nodes_color.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 import bpy
 
 import lnx
diff --git a/leenkx/blender/lnx/material/cycles_nodes/nodes_converter.py b/leenkx/blender/lnx/material/cycles_nodes/nodes_converter.py
index 5df58ec6..7aaaab23 100644
--- a/leenkx/blender/lnx/material/cycles_nodes/nodes_converter.py
+++ b/leenkx/blender/lnx/material/cycles_nodes/nodes_converter.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 from typing import Union
 
 import bpy
diff --git a/leenkx/blender/lnx/material/cycles_nodes/nodes_input.py b/leenkx/blender/lnx/material/cycles_nodes/nodes_input.py
index 506be344..6780a86e 100644
--- a/leenkx/blender/lnx/material/cycles_nodes/nodes_input.py
+++ b/leenkx/blender/lnx/material/cycles_nodes/nodes_input.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 from typing import Union
 
 import bpy
diff --git a/leenkx/blender/lnx/material/cycles_nodes/nodes_shader.py b/leenkx/blender/lnx/material/cycles_nodes/nodes_shader.py
index f0d0e9d1..c8f35bc1 100644
--- a/leenkx/blender/lnx/material/cycles_nodes/nodes_shader.py
+++ b/leenkx/blender/lnx/material/cycles_nodes/nodes_shader.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 import bpy
 from bpy.types import NodeSocket
 
diff --git a/leenkx/blender/lnx/material/cycles_nodes/nodes_texture.py b/leenkx/blender/lnx/material/cycles_nodes/nodes_texture.py
index e771577b..c16da813 100644
--- a/leenkx/blender/lnx/material/cycles_nodes/nodes_texture.py
+++ b/leenkx/blender/lnx/material/cycles_nodes/nodes_texture.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 import math
 import os
 from typing import Union
diff --git a/leenkx/blender/lnx/material/cycles_nodes/nodes_vector.py b/leenkx/blender/lnx/material/cycles_nodes/nodes_vector.py
index 7cbe9cd4..94ec7dc1 100644
--- a/leenkx/blender/lnx/material/cycles_nodes/nodes_vector.py
+++ b/leenkx/blender/lnx/material/cycles_nodes/nodes_vector.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 from typing import Union
 
 import bpy