Update Add-ons class properties to annotations

This should take care of most of the class property conversions to
use the new annotation format (colon instead of equals) for
assignment. There may still be a few edge cases that were missed.

14 files changed, 359 insertions, 359 deletions

diff --git a/archimesh/__init__.py b/archimesh/__init__.py
index 0208b944..bb8f1da2 100644
--- a/archimesh/__init__.py
+++ b/archimesh/__init__.py
@@ -170,7 +170,7 @@ class Archi_Pref(AddonPreferences):
     # when defining this in a submodule of a python package.
     bl_idname = __name__
 
-    category = StringProperty(
+    category: StringProperty(
             name="Tab Category",
             description="Choose a name for the category of the panel",
             default="Create",
diff --git a/archimesh/achm_books_maker.py b/archimesh/achm_books_maker.py
index 1c78f8b7..f7fa58ee 100644
--- a/archimesh/achm_books_maker.py
+++ b/archimesh/achm_books_maker.py
@@ -45,52 +45,52 @@ class AchmBooks(Operator):
     bl_category = 'Archimesh'
     bl_options = {'REGISTER', 'UNDO'}
 
-    width = FloatProperty(
+    width: FloatProperty(
             name='Width', min=0.001, max=1, default=0.045, precision=3,
             description='Bounding book width',
             )
-    depth = FloatProperty(
+    depth: FloatProperty(
             name='Depth', min=0.001, max=1, default=0.22, precision=3,
             description='Bounding book depth',
             )
-    height = FloatProperty(
+    height: FloatProperty(
             name='Height', min=0.001, max=1, default=0.30, precision=3,
             description='Bounding book height',
             )
-    num = IntProperty(
+    num: IntProperty(
             name='Number of books', min=1, max=100, default=20,
             description='Number total of books',
             )
 
-    rX = FloatProperty(
+    rX: FloatProperty(
             name='X', min=0.000, max=0.999, default=0, precision=3,
             description='Randomness for X axis',
             )
-    rY = FloatProperty(
+    rY: FloatProperty(
             name='Y', min=0.000, max=0.999, default=0, precision=3,
             description='Randomness for Y axis',
             )
-    rZ = FloatProperty(
+    rZ: FloatProperty(
             name='Z', min=0.000, max=0.999, default=0, precision=3,
             description='Randomness for Z axis',
             )
 
-    rot = FloatProperty(
+    rot: FloatProperty(
             name='Rotation', min=0.000, max=1, default=0, precision=3,
             description='Randomness for vertical position (0-> All straight)',
             )
-    afn = IntProperty(
+    afn: IntProperty(
             name='Affinity', min=0, max=10, default=5,
             description='Number of books with same rotation angle',
             )
 
     # Materials
-    crt_mat = BoolProperty(
+    crt_mat: BoolProperty(
             name="Create default Cycles materials",
             description="Create default materials for Cycles render",
             default=True,
             )
-    objcol = FloatVectorProperty(
+    objcol: FloatVectorProperty(
             name="Color",
             description="Color for material",
             default=(1.0, 1.0, 1.0, 1.0),
@@ -98,7 +98,7 @@ class AchmBooks(Operator):
             subtype='COLOR',
             size=4,
             )
-    rC = FloatProperty(
+    rC: FloatProperty(
             name='Randomness',
             min=0.000, max=1, default=0, precision=3,
             description='Randomness for color ',
diff --git a/archimesh/achm_column_maker.py b/archimesh/achm_column_maker.py
index 6bae7efa..e9b66639 100644
--- a/archimesh/achm_column_maker.py
+++ b/archimesh/achm_column_maker.py
@@ -41,7 +41,7 @@ class AchmColumn(bpy.types.Operator):
     bl_options = {'REGISTER', 'UNDO'}
 
     # Define properties
-    model = bpy.props.EnumProperty(
+    model: bpy.props.EnumProperty(
             name="Model",
             items=(
                 ('1', "Circular", ""),
@@ -49,185 +49,185 @@ class AchmColumn(bpy.types.Operator):
                 ),
             description="Type of column",
             )
-    keep_size = bpy.props.BoolProperty(
+    keep_size: bpy.props.BoolProperty(
             name="Keep radius equal",
             description="Keep all radius (top, mid and bottom) to the same size",
             default=True,
             )
 
-    rad_top = bpy.props.FloatProperty(
+    rad_top: bpy.props.FloatProperty(
             name='Top radius',
             min=0.001, max=10, default=0.15, precision=3,
             description='Radius of the column in the top',
             )
-    rad_mid = bpy.props.FloatProperty(
+    rad_mid: bpy.props.FloatProperty(
             name='Middle radius',
             min=0.001, max=10, default=0.15, precision=3,
             description='Radius of the column in the middle',
             )
-    shift = bpy.props.FloatProperty(
+    shift: bpy.props.FloatProperty(
             name='',
             min=-1, max=1, default=0, precision=3,
             description='Middle displacement',
             )
 
-    rad_bottom = bpy.props.FloatProperty(
+    rad_bottom: bpy.props.FloatProperty(
             name='Bottom radius',
             min=0.001, max=10, default=0.15, precision=3,
             description='Radius of the column in the bottom',
             )
 
-    col_height = bpy.props.FloatProperty(
+    col_height: bpy.props.FloatProperty(
             name='Total height',
             min=0.001, max=10, default=2.4, precision=3,
             description='Total height of column, including bases and tops',
             )
-    col_sx = bpy.props.FloatProperty(
+    col_sx: bpy.props.FloatProperty(
             name='X size',
             min=0.001, max=10, default=0.30, precision=3,
             description='Column size for x axis',
             )
-    col_sy = bpy.props.FloatProperty(
+    col_sy: bpy.props.FloatProperty(
             name='Y size',
             min=0.001, max=10, default=0.30, precision=3,
             description='Column size for y axis',
             )
 
-    cir_base = bpy.props.BoolProperty(
+    cir_base: bpy.props.BoolProperty(
             name="Include circular base",
             description="Include a base with circular form",
             default=False,
             )
-    cir_base_r = bpy.props.FloatProperty(
+    cir_base_r: bpy.props.FloatProperty(
             name='Radio',
             min=0.001, max=10, default=0.08, precision=3,
             description='Rise up radio of base',
             )
-    cir_base_z = bpy.props.FloatProperty(
+    cir_base_z: bpy.props.FloatProperty(
             name='Height',
             min=0.001, max=10, default=0.05, precision=3,
             description='Size for z axis',
             )
 
-    cir_top = bpy.props.BoolProperty(
+    cir_top: bpy.props.BoolProperty(
             name="Include circular top",
             description="Include a top with circular form",
             default=False,
             )
-    cir_top_r = bpy.props.FloatProperty(
+    cir_top_r: bpy.props.FloatProperty(
             name='Radio',
             min=0.001, max=10, default=0.08, precision=3,
             description='Rise up radio of top',
             )
-    cir_top_z = bpy.props.FloatProperty(
+    cir_top_z: bpy.props.FloatProperty(
             name='Height',
             min=0.001, max=10, default=0.05, precision=3,
             description='Size for z axis',
             )
 
-    box_base = bpy.props.BoolProperty(
+    box_base: bpy.props.BoolProperty(
             name="Include rectangular base",
             description="Include a base with rectangular form",
             default=True,
             )
-    box_base_x = bpy.props.FloatProperty(
+    box_base_x: bpy.props.FloatProperty(
             name='X size',
             min=0.001, max=10, default=0.40, precision=3,
             description='Size for x axis',
             )
-    box_base_y = bpy.props.FloatProperty(
+    box_base_y: bpy.props.FloatProperty(
             name='Y size',
             min=0.001, max=10, default=0.40, precision=3,
             description='Size for y axis',
             )
-    box_base_z = bpy.props.FloatProperty(
+    box_base_z: bpy.props.FloatProperty(
             name='Height',
             min=0.001, max=10, default=0.05, precision=3,
             description='Size for z axis',
             )
 
-    box_top = bpy.props.BoolProperty(
+    box_top: bpy.props.BoolProperty(
             name="Include rectangular top",
             description="Include a top with rectangular form",
             default=True,
             )
-    box_top_x = bpy.props.FloatProperty(
+    box_top_x: bpy.props.FloatProperty(
             name='X size',
             min=0.001, max=10, default=0.40, precision=3,
             description='Size for x axis',
             )
-    box_top_y = bpy.props.FloatProperty(
+    box_top_y: bpy.props.FloatProperty(
             name='Y size',
             min=0.001, max=10, default=0.40, precision=3,
             description='Size for y axis',
             )
-    box_top_z = bpy.props.FloatProperty(
+    box_top_z: bpy.props.FloatProperty(
             name='Height',
             min=0.001, max=10, default=0.05, precision=3,
             description='Size for z axis',
             )
 
-    arc_top = bpy.props.BoolProperty(
+    arc_top: bpy.props.BoolProperty(
             name="Create top arch",
             description="Include an arch in the top of the column",
             default=False,
             )
-    arc_radio = bpy.props.FloatProperty(
+    arc_radio: bpy.props.FloatProperty(
             name='Arc Radio',
             min=0.001, max=10, default=1, precision=1,
             description='Radio of the arch',
             )
-    arc_width = bpy.props.FloatProperty(
+    arc_width: bpy.props.FloatProperty(
             name='Thickness',
             min=0.01, max=10, default=0.15, precision=2,
             description='Thickness of the arch wall',
             )
-    arc_gap = bpy.props.FloatProperty(
+    arc_gap: bpy.props.FloatProperty(
             name='Arc gap',
             min=0.01, max=10, default=0.25, precision=2,
             description='Size of the gap in the arch sides',
             )
 
-    crt_mat = bpy.props.BoolProperty(
+    crt_mat: bpy.props.BoolProperty(
             name="Create default Cycles materials",
             description="Create default materials for Cycles render",
             default=True,
             )
-    crt_array = bpy.props.BoolProperty(
+    crt_array: bpy.props.BoolProperty(
             name="Create array of elements",
             description="Create a modifier array for all elemnst",
             default=False,
             )
-    array_num_x = bpy.props.IntProperty(
+    array_num_x: bpy.props.IntProperty(
             name='Count X',
             min=0, max=100, default=3,
             description='Number of elements in array',
             )
-    array_space_x = bpy.props.FloatProperty(
+    array_space_x: bpy.props.FloatProperty(
             name='Distance X',
             min=0.000, max=10, default=1, precision=3,
             description='Distance between elements (only arc disabled)',
             )
-    array_num_y = bpy.props.IntProperty(
+    array_num_y: bpy.props.IntProperty(
             name='Count Y',
             min=0, max=100, default=0,
             description='Number of elements in array',
             )
-    array_space_y = bpy.props.FloatProperty(
+    array_space_y: bpy.props.FloatProperty(
             name='Distance Y',
             min=0.000, max=10, default=1, precision=3,
             description='Distance between elements (only arc disabled)',
             )
-    array_space_z = bpy.props.FloatProperty(
+    array_space_z: bpy.props.FloatProperty(
             name='Distance Z',
             min=-10, max=10, default=0, precision=3,
             description='Combined X/Z distance between elements (only arc disabled)',
             )
-    ramp = bpy.props.BoolProperty(
+    ramp: bpy.props.BoolProperty(
             name="Deform",
             description="Deform top base with Z displacement", default=True,
             )
-    array_space_factor = bpy.props.FloatProperty(
+    array_space_factor: bpy.props.FloatProperty(
             name='Move Y center',
             min=0.00, max=1, default=0.0, precision=3,
             description='Move the center of the arch in Y axis. (0 centered)',
diff --git a/archimesh/achm_curtain_maker.py b/archimesh/achm_curtain_maker.py
index cc63c3af..0b4bb84b 100644
--- a/archimesh/achm_curtain_maker.py
+++ b/archimesh/achm_curtain_maker.py
@@ -42,55 +42,55 @@ class AchmJapan(Operator):
     bl_category = 'Archimesh'
     bl_options = {'REGISTER', 'UNDO'}
 
-    width = bpy.props.FloatProperty(
+    width: bpy.props.FloatProperty(
             name='Width',
             min=0.30, max=4, default=1, precision=3,
             description='Total width',
             )
-    height = bpy.props.FloatProperty(
+    height: bpy.props.FloatProperty(
             name='Height',
             min=0.20, max=50, default=1.8, precision=3,
             description='Total height',
             )
-    num = bpy.props.IntProperty(
+    num: bpy.props.IntProperty(
             name='Rails',
             min=2, max=5, default=2,
             description='Number total of rails',
             )
-    palnum = bpy.props.IntProperty(
+    palnum: bpy.props.IntProperty(
             name='Panels',
             min=1, max=2, default=1,
             description='Panels by rail',
             )
 
-    open01 = bpy.props.FloatProperty(
+    open01: bpy.props.FloatProperty(
             name='Position 01',
             min=0, max=1, default=0, precision=3,
             description='Position of the panel',
             )
-    open02 = bpy.props.FloatProperty(
+    open02: bpy.props.FloatProperty(
             name='Position 02',
             min=0, max=1, default=0, precision=3,
             description='Position of the panel',
             )
-    open03 = bpy.props.FloatProperty(
+    open03: bpy.props.FloatProperty(
             name='Position 03',
             min=0, max=1, default=0, precision=3,
             description='Position of the panel',
             )
-    open04 = bpy.props.FloatProperty(
+    open04: bpy.props.FloatProperty(
             name='Position 04',
             min=0, max=1, default=0, precision=3,
             description='Position of the panel',
             )
-    open05 = bpy.props.FloatProperty(
+    open05: bpy.props.FloatProperty(
             name='Position 05',
             min=0, max=1, default=0, precision=3,
             description='Position of the panel',
             )
 
     # Materials
-    crt_mat = bpy.props.BoolProperty(
+    crt_mat: bpy.props.BoolProperty(
             name="Create default Cycles materials",
             description="Create default materials for Cycles render",
             default=True,
@@ -183,19 +183,19 @@ class AchmRoller(Operator):
     bl_category = 'Archimesh'
     bl_options = {'REGISTER', 'UNDO'}
 
-    width = bpy.props.FloatProperty(
+    width: bpy.props.FloatProperty(
             name='Width',
             min=0.30, max=4, default=1, precision=3,
             description='Total width',
             )
-    height = bpy.props.FloatProperty(
+    height: bpy.props.FloatProperty(
             name='Height',
             min=0.01, max=50, default=1.7, precision=3,
             description='Total height',
             )
 
     # Materials
-    crt_mat = bpy.props.BoolProperty(
+    crt_mat: bpy.props.BoolProperty(
             name="Create default Cycles materials",
             description="Create default materials for Cycles render",
             default=True,
diff --git a/archimesh/achm_door_maker.py b/archimesh/achm_door_maker.py
index 4ef99373..baf3ac98 100644
--- a/archimesh/achm_door_maker.py
+++ b/archimesh/achm_door_maker.py
@@ -281,49 +281,49 @@ def shape_children(mainobject, update=False):
 # Define property group class to create or modify
 # ------------------------------------------------------------------
 class ObjectProperties(PropertyGroup):
-    frame_width = FloatProperty(
+    frame_width: FloatProperty(
             name='Frame width',
             min=0.25, max=10,
             default=1, precision=2,
             description='Doorframe width', update=update_object,
             )
-    frame_height = FloatProperty(
+    frame_height: FloatProperty(
             name='Frame height',
             min=0.25, max=10,
             default=2.1, precision=2,
             description='Doorframe height', update=update_object,
             )
-    frame_thick = FloatProperty(
+    frame_thick: FloatProperty(
             name='Frame thickness',
             min=0.05, max=0.50,
             default=0.08, precision=2,
             description='Doorframe thickness', update=update_object,
             )
-    frame_size = FloatProperty(
+    frame_size: FloatProperty(
             name='Frame size',
             min=0.05, max=0.25,
             default=0.08, precision=2,
             description='Doorframe size', update=update_object,
             )
-    crt_mat = BoolProperty(
+    crt_mat: BoolProperty(
             name="Create default Cycles materials",
             description="Create default materials for Cycles render",
             default=True,
             update=update_object,
             )
-    factor = FloatProperty(
+    factor: FloatProperty(
             name='',
             min=0.2, max=1,
             default=0.5, precision=3, description='Door ratio',
             update=update_object,
             )
-    r = FloatProperty(
+    r: FloatProperty(
             name='Rotation', min=0, max=360,
             default=0, precision=1,
             description='Door rotation', update=update_object,
             )
 
-    openside = EnumProperty(
+    openside: EnumProperty(
             name="Open side",
             items=(
                 ('1', "Right open", ""),
@@ -334,7 +334,7 @@ class ObjectProperties(PropertyGroup):
             update=update_object,
             )
 
-    model = EnumProperty(
+    model: EnumProperty(
             name="Model",
             items=(
                 ('1', "Model 01", ""),
@@ -348,7 +348,7 @@ class ObjectProperties(PropertyGroup):
             update=update_object,
             )
 
-    handle = EnumProperty(
+    handle: EnumProperty(
             name="Handle",
             items=(
                 ('1', "Handle 01", ""),
@@ -362,27 +362,27 @@ class ObjectProperties(PropertyGroup):
             )
 
     # opengl internal data
-    glpoint_a = FloatVectorProperty(
+    glpoint_a: FloatVectorProperty(
             name="glpointa",
             description="Hidden property for opengl",
             default=(0, 0, 0),
             )
-    glpoint_b = FloatVectorProperty(
+    glpoint_b: FloatVectorProperty(
             name="glpointb",
             description="Hidden property for opengl",
             default=(0, 0, 0),
             )
-    glpoint_c = FloatVectorProperty(
+    glpoint_c: FloatVectorProperty(
             name="glpointc",
             description="Hidden property for opengl",
             default=(0, 0, 0),
             )
-    glpoint_d = FloatVectorProperty(
+    glpoint_d: FloatVectorProperty(
             name="glpointc",
             description="Hidden property for opengl",
             default=(0, 0, 0),
             )
-    glpoint_e = FloatVectorProperty(
+    glpoint_e: FloatVectorProperty(
             name="glpointc",
             description="Hidden property for opengl",
             default=(0, 0, 0),
diff --git a/archimesh/achm_kitchen_maker.py b/archimesh/achm_kitchen_maker.py
index f9d98180..994714b1 100644
--- a/archimesh/achm_kitchen_maker.py
+++ b/archimesh/achm_kitchen_maker.py
@@ -54,12 +54,12 @@ class AchmExportInventory(Operator, ExportHelper):
 
     # From ExportHelper. Filter filenames.
     filename_ext = ".txt"
-    filter_glob = StringProperty(
+    filter_glob: StringProperty(
             default="*.txt",
             options={'HIDDEN'},
             )
 
-    filepath = StringProperty(
+    filepath: StringProperty(
             name="File Path",
             description="File path used for exporting room data file",
             maxlen=1024, default="",
@@ -251,35 +251,35 @@ def getinventory():
 # ------------------------------------------------------------------
 class CabinetProperties(PropertyGroup):
     # Cabinet width
-    sX = FloatProperty(
+    sX: FloatProperty(
             name='width', min=0.001, max=10, default=0.60, precision=3,
             description='Cabinet width',
             )
-    wY = FloatProperty(
+    wY: FloatProperty(
             name='', min=-10, max=10, default=0, precision=3,
             description='Modify depth size',
             )
-    wZ = FloatProperty(
+    wZ: FloatProperty(
             name='', min=-10, max=10, default=0, precision=3,
             description='Modify height size',
             )
 
     # Cabinet position shift
-    pX = FloatProperty(
+    pX: FloatProperty(
             name='', min=-10, max=10, default=0, precision=3,
             description='Position x shift',
             )
-    pY = FloatProperty(
+    pY: FloatProperty(
             name='', min=-10, max=10, default=0, precision=3,
             description='Position y shift',
             )
-    pZ = FloatProperty(
+    pZ: FloatProperty(
             name='', min=-10, max=10, default=0, precision=3,
             description='Position z shift',
             )
 
     # Door type
-    dType = EnumProperty(
+    dType: EnumProperty(
             items=(
                 ('1', "Single R", ""),
                 ('2', "Single L", ""),
@@ -298,47 +298,47 @@ class CabinetProperties(PropertyGroup):
             )
 
     # Shelves
-    sNum = IntProperty(
+    sNum: IntProperty(
             name='Shelves', min=0, max=10, default=1,
             description='Number total of shelves',
             )
     # Drawers
-    dNum = IntProperty(
+    dNum: IntProperty(
             name='Num', min=1, max=10, default=3,
             description='Number total of drawers',
             )
     # Glass Factor
-    gF = FloatProperty(
+    gF: FloatProperty(
             name='', min=0.001, max=1, default=0.1, precision=3,
             description='Glass ratio',
             )
     # Handle flag
-    hand = BoolProperty(
+    hand: BoolProperty(
             name="Handle",
             description="Create a handle", default=True,
             )
     # Left baseboard
-    bL = BoolProperty(
+    bL: BoolProperty(
             name="Left Baseboard",
             description="Create a left baseboard", default=False,
             )
     # Right baseboard
-    bR = BoolProperty(
+    bR: BoolProperty(
             name="Right Baseboard",
             description="Create a left baseboard", default=False,
             )
     # Fill countertop spaces
-    tC = BoolProperty(
+    tC: BoolProperty(
             name="Countertop fill",
             description="Fill empty spaces with countertop", default=True,
             )
     # Add countertop edge
-    tE = BoolProperty(
+    tE: BoolProperty(
             name="Countertop edge",
             description="Add edge to countertop", default=True,
             )
     # cabinet rotation
-    rotate = EnumProperty(
+    rotate: EnumProperty(
             items=(
                 ('9', "Default", ""),
                 ('1', "90 CW", ""),
@@ -365,7 +365,7 @@ class AchmKitchen(Operator):
     bl_options = {'REGISTER', 'UNDO'}
 
     # Define properties
-    type_cabinet = EnumProperty(
+    type_cabinet: EnumProperty(
             items=(('1', "Floor", ""),
                 ('2', "Wall", "")),
             name="Type",
@@ -373,19 +373,19 @@ class AchmKitchen(Operator):
             )
     oldtype = type_cabinet
 
-    thickness = FloatProperty(
+    thickness: FloatProperty(
             name='Thickness', min=0.001, max=5, default=0.018, precision=3,
             description='Board thickness',
             )
-    depth = FloatProperty(
+    depth: FloatProperty(
             name='Depth', min=0.001, max=50, default=0.59, precision=3,
             description='Default cabinet depth',
             )
-    height = FloatProperty(
+    height: FloatProperty(
             name='Height', min=0.001, max=50, default=0.70, precision=3,
             description='Default cabinet height',
             )
-    handle = EnumProperty(
+    handle: EnumProperty(
             items=(
                 ('1', "Model 1", ""),
                 ('2', "Model 2", ""),
@@ -400,69 +400,69 @@ class AchmKitchen(Operator):
             name="Handle",
             description="Type of handle",
             )
-    handle_x = FloatProperty(
+    handle_x: FloatProperty(
             name='', min=0.001, max=10,
             default=0.05, precision=3,
             description='Displacement in X relative position (limited to door size)',
             )
-    handle_z = FloatProperty(
+    handle_z: FloatProperty(
             name='', min=0.001, max=10,
             default=0.05, precision=3,
             description='Displacement in Z relative position (limited to door size)',
             )
 
-    baseboard = BoolProperty(
+    baseboard: BoolProperty(
             name="Baseboard",
             description="Create a baseboard automatically",
             default=True,
             )
-    baseheight = FloatProperty(
+    baseheight: FloatProperty(
             name='height', min=0.001, max=10,
             default=0.16, precision=3,
             description='Baseboard height',
             )
-    basefactor = FloatProperty(
+    basefactor: FloatProperty(
             name='sink', min=0, max=1,
             default=0.90, precision=3,
             description='Baseboard sink',
             )
 
-    countertop = BoolProperty(
+    countertop: BoolProperty(
             name="Countertop",
             description="Create a countertop automatically (only default cabinet height)",
             default=True,
             )
-    counterheight = FloatProperty(
+    counterheight: FloatProperty(
             name='height', min=0.001, max=10,
             default=0.02, precision=3,
             description='Countertop height',
             )
-    counterextend = FloatProperty(
+    counterextend: FloatProperty(
             name='extend', min=0.001, max=10,
             default=0.03, precision=3,
             description='Countertop extent',
             )
 
-    fitZ = BoolProperty(
+    fitZ: BoolProperty(
             name="Floor origin in Z=0",
             description="Use Z=0 axis as vertical origin floor position",
             default=True,
             )
-    moveZ = FloatProperty(
+    moveZ: FloatProperty(
             name='Z position', min=0.001, max=10,
             default=1.5, precision=3,
             description='Wall cabinet Z position from floor',
             )
 
-    cabinet_num = IntProperty(
+    cabinet_num: IntProperty(
             name='Number of Cabinets', min=1, max=30,
             default=1,
             description='Number total of cabinets in the Kitchen',
             )
-    cabinets = CollectionProperty(type=CabinetProperties)
+    cabinets: CollectionProperty(type=CabinetProperties)
 
     # Materials
-    crt_mat = BoolProperty(
+    crt_mat: BoolProperty(
             name="Create default Cycles materials",
             description="Create default materials for Cycles render",
             default=True,
diff --git a/archimesh/achm_lamp_maker.py b/archimesh/achm_lamp_maker.py
index 67fbfc1e..d9e7f64e 100644
--- a/archimesh/achm_lamp_maker.py
+++ b/archimesh/achm_lamp_maker.py
@@ -136,7 +136,7 @@ class AchmLamp(Operator):
     bl_category = 'Archimesh'
     bl_options = {'REGISTER', 'UNDO'}
     # preset
-    preset = EnumProperty(
+    preset: EnumProperty(
             items=(
                 ('0', "None", ""),
                 ('1', "Sphere", ""),
@@ -149,107 +149,107 @@ class AchmLamp(Operator):
             )
     oldpreset = preset
 
-    base_height = FloatProperty(
+    base_height: FloatProperty(
             name='Height',
             min=0.01, max=10, default=0.20, precision=3,
             description='lamp base height',
             )
-    base_segments = IntProperty(
+    base_segments: IntProperty(
             name='Segments',
             min=3, max=128, default=16,
             description='Number of segments (vertical)',
             )
-    base_rings = IntProperty(
+    base_rings: IntProperty(
             name='Rings',
             min=2, max=12, default=6,
             description='Number of rings (horizontal)',
             )
-    holder = FloatProperty(
+    holder: FloatProperty(
             name='Lampholder',
             min=0.001, max=10, default=0.02, precision=3,
             description='Lampholder height',
             )
-    smooth = BoolProperty(
+    smooth: BoolProperty(
             name="Smooth",
             description="Use smooth shader",
             default=True,
             )
-    subdivide = BoolProperty(
+    subdivide: BoolProperty(
             name="Subdivide",
             description="Add subdivision modifier",
             default=True,
             )
 
-    bz01 = FloatProperty(name='S1', min=-1, max=1, default=0, precision=3, description='Z shift factor')
-    bz02 = FloatProperty(name='S2', min=-1, max=1, default=0, precision=3, description='Z shift factor')
-    bz03 = FloatProperty(name='S3', min=-1, max=1, default=0, precision=3, description='Z shift factor')
-    bz04 = FloatProperty(name='S4', min=-1, max=1, default=0, precision=3, description='Z shift factor')
-    bz05 = FloatProperty(name='S5', min=-1, max=1, default=0, precision=3, description='Z shift factor')
-    bz06 = FloatProperty(name='S6', min=-1, max=1, default=0, precision=3, description='Z shift factor')
-    bz07 = FloatProperty(name='S7', min=-1, max=1, default=0, precision=3, description='Z shift factor')
-    bz08 = FloatProperty(name='S8', min=-1, max=1, default=0, precision=3, description='Z shift factor')
-    bz09 = FloatProperty(name='S9', min=-1, max=1, default=0, precision=3, description='Z shift factor')
-    bz10 = FloatProperty(name='S10', min=-1, max=1, default=0, precision=3, description='Z shift factor')
-    bz11 = FloatProperty(name='S11', min=-1, max=1, default=0, precision=3, description='Z shift factor')
-    bz12 = FloatProperty(name='S12', min=-1, max=1, default=0, precision=3, description='Z shift factor')
-
-    br01 = FloatProperty(name='R1', min=0.001, max=10, default=0.06, precision=3, description='Ring radio')
-    br02 = FloatProperty(name='R2', min=0.001, max=10, default=0.08, precision=3, description='Ring radio')
-    br03 = FloatProperty(name='R3', min=0.001, max=10, default=0.09, precision=3, description='Ring radio')
-    br04 = FloatProperty(name='R4', min=0.001, max=10, default=0.08, precision=3, description='Ring radio')
-    br05 = FloatProperty(name='R5', min=0.001, max=10, default=0.06, precision=3, description='Ring radio')
-    br06 = FloatProperty(name='R6', min=0.001, max=10, default=0.03, precision=3, description='Ring radio')
-    br07 = FloatProperty(name='R7', min=0.001, max=10, default=0.10, precision=3, description='Ring radio')
-    br08 = FloatProperty(name='R8', min=0.001, max=10, default=0.10, precision=3, description='Ring radio')
-    br09 = FloatProperty(name='R9', min=0.001, max=10, default=0.10, precision=3, description='Ring radio')
-    br10 = FloatProperty(name='R10', min=0.001, max=10, default=0.10, precision=3, description='Ring radio')
-    br11 = FloatProperty(name='R11', min=0.001, max=10, default=0.10, precision=3, description='Ring radio')
-    br12 = FloatProperty(name='R12', min=0.001, max=10, default=0.10, precision=3, description='Ring radio')
-
-    top_height = FloatProperty(
+    bz01: FloatProperty(name='S1', min=-1, max=1, default=0, precision=3, description='Z shift factor')
+    bz02: FloatProperty(name='S2', min=-1, max=1, default=0, precision=3, description='Z shift factor')
+    bz03: FloatProperty(name='S3', min=-1, max=1, default=0, precision=3, description='Z shift factor')
+    bz04: FloatProperty(name='S4', min=-1, max=1, default=0, precision=3, description='Z shift factor')
+    bz05: FloatProperty(name='S5', min=-1, max=1, default=0, precision=3, description='Z shift factor')
+    bz06: FloatProperty(name='S6', min=-1, max=1, default=0, precision=3, description='Z shift factor')
+    bz07: FloatProperty(name='S7', min=-1, max=1, default=0, precision=3, description='Z shift factor')
+    bz08: FloatProperty(name='S8', min=-1, max=1, default=0, precision=3, description='Z shift factor')
+    bz09: FloatProperty(name='S9', min=-1, max=1, default=0, precision=3, description='Z shift factor')
+    bz10: FloatProperty(name='S10', min=-1, max=1, default=0, precision=3, description='Z shift factor')
+    bz11: FloatProperty(name='S11', min=-1, max=1, default=0, precision=3, description='Z shift factor')
+    bz12: FloatProperty(name='S12', min=-1, max=1, default=0, precision=3, description='Z shift factor')
+
+    br01: FloatProperty(name='R1', min=0.001, max=10, default=0.06, precision=3, description='Ring radio')
+    br02: FloatProperty(name='R2', min=0.001, max=10, default=0.08, precision=3, description='Ring radio')
+    br03: FloatProperty(name='R3', min=0.001, max=10, default=0.09, precision=3, description='Ring radio')
+    br04: FloatProperty(name='R4', min=0.001, max=10, default=0.08, precision=3, description='Ring radio')
+    br05: FloatProperty(name='R5', min=0.001, max=10, default=0.06, precision=3, description='Ring radio')
+    br06: FloatProperty(name='R6', min=0.001, max=10, default=0.03, precision=3, description='Ring radio')
+    br07: FloatProperty(name='R7', min=0.001, max=10, default=0.10, precision=3, description='Ring radio')
+    br08: FloatProperty(name='R8', min=0.001, max=10, default=0.10, precision=3, description='Ring radio')
+    br09: FloatProperty(name='R9', min=0.001, max=10, default=0.10, precision=3, description='Ring radio')
+    br10: FloatProperty(name='R10', min=0.001, max=10, default=0.10, precision=3, description='Ring radio')
+    br11: FloatProperty(name='R11', min=0.001, max=10, default=0.10, precision=3, description='Ring radio')
+    br12: FloatProperty(name='R12', min=0.001, max=10, default=0.10, precision=3, description='Ring radio')
+
+    top_height: FloatProperty(
             name='Height', min=0.01, max=10,
             default=0.20, precision=3,
             description='lampshade height',
             )
-    top_segments = IntProperty(
+    top_segments: IntProperty(
             name='Segments', min=3, max=128,
             default=32,
             description='Number of segments (vertical)',
             )
-    tr01 = FloatProperty(
+    tr01: FloatProperty(
             name='R1', min=0.001, max=10,
             default=0.16, precision=3,
             description='lampshade bottom radio',
             )
-    tr02 = FloatProperty(name='R2', min=0.001, max=10,
+    tr02: FloatProperty(name='R2', min=0.001, max=10,
                          default=0.08, precision=3,
                          description='lampshade top radio')
-    pleats = BoolProperty(
+    pleats: BoolProperty(
             name="Pleats", description="Create pleats in the lampshade",
             default=False,
             )
-    tr03 = FloatProperty(
+    tr03: FloatProperty(
             name='R3', min=0.001, max=1,
             default=0.01, precision=3, description='Pleats size',
             )
-    energy = FloatProperty(
+    energy: FloatProperty(
             name='Light', min=0.00, max=1000,
             default=15, precision=3,
             description='Light intensity',
             )
-    opacity = FloatProperty(
+    opacity: FloatProperty(
             name='Translucency', min=0.00, max=1,
             default=0.3, precision=3,
             description='Lampshade translucency factor (1 completely translucent)',
             )
 
     # Materials
-    crt_mat = BoolProperty(
+    crt_mat: BoolProperty(
             name="Create default Cycles materials",
             description="Create default materials for Cycles render",
             default=True,
             )
-    objcol = FloatVectorProperty(
+    objcol: FloatVectorProperty(
             name="Color",
             description="Color for material",
             default=(1.0, 1.0, 1.0, 1.0),
diff --git a/archimesh/achm_roof_maker.py b/archimesh/achm_roof_maker.py
index d88b5763..0cf6d222 100644
--- a/archimesh/achm_roof_maker.py
+++ b/archimesh/achm_roof_maker.py
@@ -43,38 +43,38 @@ class AchmRoof(Operator):
     bl_options = {'REGISTER', 'UNDO'}
 
     # Define properties
-    roof_width = IntProperty(
+    roof_width: IntProperty(
             name='Num tiles X',
             min=1, max=100, default=6,
             description='Tiles in X axis',
             )
-    roof_height = IntProperty(
+    roof_height: IntProperty(
             name='Num tiles Y',
             min=1, max=100, default=3,
             description='Tiles in Y axis',
             )
 
-    roof_thick = FloatProperty(
+    roof_thick: FloatProperty(
             name='Tile thickness',
             min=0.000, max=0.50, default=0.012, precision=3,
             description='Thickness of the roof tile',
             )
-    roof_angle = FloatProperty(
+    roof_angle: FloatProperty(
             name='Roof slope', min=0.0, max=70.0, default=0.0, precision=1,
             description='Roof angle of slope',
             )
-    roof_scale = FloatProperty(
+    roof_scale: FloatProperty(
             name='Tile scale', min=0.001, max=10, default=1, precision=3,
             description='Scale of roof tile',
             )
 
-    crt_mat = BoolProperty(
+    crt_mat: BoolProperty(
             name="Create default Cycles materials",
             description="Create default materials for Cycles render",
             default=True,
             )
 
-    model = EnumProperty(
+    model: EnumProperty(
             items=(
                 ('1', "Model 01", ""),
                 ('2', "Model 02", ""),
diff --git a/archimesh/achm_room_maker.py b/archimesh/achm_room_maker.py
index 71243ca2..11a259be 100644
--- a/archimesh/achm_room_maker.py
+++ b/archimesh/achm_room_maker.py
@@ -48,12 +48,12 @@ class AchmExportRoom(Operator, ExportHelper):
 
     # From ExportHelper. Filter filenames.
     filename_ext = ".dat"
-    filter_glob = StringProperty(
+    filter_glob: StringProperty(
             default="*.dat",
             options={'HIDDEN'},
             )
 
-    filepath = StringProperty(
+    filepath: StringProperty(
             name="File Path",
             description="File path used for exporting room data file",
             maxlen=1024, default="",
@@ -160,12 +160,12 @@ class AchmImportRoom(Operator, ImportHelper):
 
     # From Helper. Filter filenames.
     filename_ext = ".dat"
-    filter_glob = StringProperty(
+    filter_glob: StringProperty(
             default="*.dat",
             options={'HIDDEN'},
             )
 
-    filepath = StringProperty(
+    filepath: StringProperty(
             name="File Path",
             description="File path used for exporting room data file",
             maxlen=1024, default="",
@@ -835,7 +835,7 @@ def create_floor(rp, typ, myroom):
 # Define property group class to create, or modify, room walls.
 # ------------------------------------------------------------------
 class WallProperties(PropertyGroup):
-    w = FloatProperty(
+    w: FloatProperty(
             name='Length',
             min=-150, max=150,
             default=1, precision=3,
@@ -843,33 +843,33 @@ class WallProperties(PropertyGroup):
             update=update_room,
             )
 
-    a = BoolProperty(
+    a: BoolProperty(
             name="Advanced",
             description="Define advanced parameters of the wall",
             default=False,
             update=update_room,
             )
 
-    curved = BoolProperty(
+    curved: BoolProperty(
             name="Curved",
             description="Enable curved wall parameters",
             default=False,
             update=update_room,
             )
-    curve_factor = FloatProperty(
+    curve_factor: FloatProperty(
             name='Factor',
             min=-5, max=5,
             default=1, precision=1,
             description='Curvature variation',
             update=update_room,
             )
-    curve_arc_deg = FloatProperty(
+    curve_arc_deg: FloatProperty(
             name='Degrees', min=1, max=359,
             default=180, precision=1,
             description='Degrees of the curve arc (must be >= steps)',
             update=update_room,
             )
-    curve_steps = IntProperty(
+    curve_steps: IntProperty(
             name='Steps',
             min=2, max=50,
             default=12,
@@ -877,19 +877,19 @@ class WallProperties(PropertyGroup):
             update=update_room,
             )
 
-    m = FloatProperty(
+    m: FloatProperty(
             name='Peak', min=0, max=50,
             default=0, precision=3,
             description='Middle height variation',
             update=update_room,
             )
-    f = FloatProperty(
+    f: FloatProperty(
             name='Factor', min=-1, max=1,
             default=0, precision=3,
             description='Middle displacement',
             update=update_room,
             )
-    r = FloatProperty(
+    r: FloatProperty(
             name='Angle',
             min=-180, max=180,
             default=0, precision=1,
@@ -897,7 +897,7 @@ class WallProperties(PropertyGroup):
             update=update_room,
             )
 
-    h = EnumProperty(
+    h: EnumProperty(
             items=(
                 ('0', "Visible", ""),
                 ('1', "Baseboard", ""),
@@ -910,12 +910,12 @@ class WallProperties(PropertyGroup):
             )
 
     # opengl internal data
-    glpoint_a = FloatVectorProperty(
+    glpoint_a: FloatVectorProperty(
             name="glpointa",
             description="Hidden property for opengl",
             default=(0, 0, 0),
             )
-    glpoint_b = FloatVectorProperty(
+    glpoint_b: FloatVectorProperty(
             name="glpointb",
             description="Hidden property for opengl",
             default=(0, 0, 0),
@@ -1492,90 +1492,90 @@ def is_in_nextface(idx, activefaces, verts, x, y):
 # Define property group class to create or modify a rooms.
 # ------------------------------------------------------------------
 class RoomProperties(PropertyGroup):
-    room_height = FloatProperty(
+    room_height: FloatProperty(
             name='Height', min=0.001, max=50,
             default=2.4, precision=3,
             description='Room height', update=update_room,
             )
-    wall_width = FloatProperty(
+    wall_width: FloatProperty(
             name='Thickness', min=0.000, max=10,
             default=0.0, precision=3,
             description='Thickness of the walls', update=update_room,
             )
-    inverse = BoolProperty(
+    inverse: BoolProperty(
             name="Inverse", description="Inverse normals to outside",
             default=False,
             update=update_room,
             )
-    crt_mat = BoolProperty(
+    crt_mat: BoolProperty(
             name="Create default Cycles materials",
             description="Create default materials for Cycles render",
             default=True,
             update=update_room,
             )
 
-    wall_num = IntProperty(
+    wall_num: IntProperty(
             name='Number of Walls', min=1, max=50,
             default=1,
             description='Number total of walls in the room', update=add_room_wall,
             )
 
-    baseboard = BoolProperty(
+    baseboard: BoolProperty(
             name="Baseboard", description="Create a baseboard automatically",
             default=True,
             update=update_room,
             )
 
-    base_width = FloatProperty(
+    base_width: FloatProperty(
             name='Width', min=0.001, max=10,
             default=0.015, precision=3,
             description='Baseboard width', update=update_room,
             )
-    base_height = FloatProperty(
+    base_height: FloatProperty(
             name='Height', min=0.05, max=20,
             default=0.12, precision=3,
             description='Baseboard height', update=update_room,
             )
 
-    ceiling = BoolProperty(
+    ceiling: BoolProperty(
             name="Ceiling", description="Create a ceiling",
             default=False, update=update_room,
             )
-    floor = BoolProperty(
+    floor: BoolProperty(
             name="Floor", description="Create a floor automatically",
             default=False,
             update=update_room,
             )
 
-    merge = BoolProperty(
+    merge: BoolProperty(
             name="Close walls", description="Close walls to create a full closed room",
             default=False, update=update_room,
             )
 
-    walls = CollectionProperty(
+    walls: CollectionProperty(
             type=WallProperties,
             )
 
-    shell = BoolProperty(
+    shell: BoolProperty(
             name="Wall cover", description="Create a cover of boards",
             default=False, update=update_room,
             )
-    shell_thick = FloatProperty(
+    shell_thick: FloatProperty(
             name='Thickness', min=0.001, max=1,
             default=0.025, precision=3,
             description='Cover board thickness', update=update_room,
             )
-    shell_height = FloatProperty(
+    shell_height: FloatProperty(
             name='Height', min=0.05, max=1,
             default=0.20, precision=3,
             description='Cover board height', update=update_room,
             )
-    shell_factor = FloatProperty(
+    shell_factor: FloatProperty(
             name='Top', min=0.1, max=1,
             default=1, precision=1,
             description='Percentage for top covering (1 Full)', update=update_room,
             )
-    shell_bfactor = FloatProperty(
+    shell_bfactor: FloatProperty(
             name='Bottom', min=0.1, max=1,
             default=1, precision=1,
             description='Percentage for bottom covering (1 Full)', update=update_room,
diff --git a/archimesh/achm_shelves_maker.py b/archimesh/achm_shelves_maker.py
index 6cbab554..c9351a07 100644
--- a/archimesh/achm_shelves_maker.py
+++ b/archimesh/achm_shelves_maker.py
@@ -34,34 +34,34 @@ from .achm_tools import *
 # Define property group class for shelves properties
 # ------------------------------------------------------------------
 class ShelvesProperties(PropertyGroup):
-    sX = FloatProperty(name='width', min=0.001, max=10, default=1,
+    sX: FloatProperty(name='width', min=0.001, max=10, default=1,
                        precision=3, description='Furniture width')
-    wY = FloatProperty(name='', min=-10, max=10, default=0, precision=3, description='Modify y size')
-    wZ = FloatProperty(name='', min=-10, max=10, default=0, precision=3, description='Modify z size')
+    wY: FloatProperty(name='', min=-10, max=10, default=0, precision=3, description='Modify y size')
+    wZ: FloatProperty(name='', min=-10, max=10, default=0, precision=3, description='Modify z size')
     # Cabinet position shift
-    pX = FloatProperty(name='', min=0, max=10, default=0, precision=3, description='Position x shift')
-    pY = FloatProperty(name='', min=-10, max=10, default=0, precision=3, description='Position y shift')
-    pZ = FloatProperty(name='', min=-10, max=10, default=0, precision=3, description='Position z shift')
+    pX: FloatProperty(name='', min=0, max=10, default=0, precision=3, description='Position x shift')
+    pY: FloatProperty(name='', min=-10, max=10, default=0, precision=3, description='Position y shift')
+    pZ: FloatProperty(name='', min=-10, max=10, default=0, precision=3, description='Position z shift')
 
     # Shelves
-    sNum = IntProperty(name='Shelves', min=0, max=12, default=6, description='Number total of shelves')
+    sNum: IntProperty(name='Shelves', min=0, max=12, default=6, description='Number total of shelves')
 
     # 12 shelves (shelf)
-    Z01 = FloatProperty(name='zS1', min=-10, max=10, default=0, precision=3, description='Position z shift')
-    Z02 = FloatProperty(name='zS2', min=-10, max=10, default=0, precision=3, description='Position z shift')
-    Z03 = FloatProperty(name='zS3', min=-10, max=10, default=0, precision=3, description='Position z shift')
-    Z04 = FloatProperty(name='zS4', min=-10, max=10, default=0, precision=3, description='Position z shift')
-    Z05 = FloatProperty(name='zS5', min=-10, max=10, default=0, precision=3, description='Position z shift')
-    Z06 = FloatProperty(name='zS6', min=-10, max=10, default=0, precision=3, description='Position z shift')
-    Z07 = FloatProperty(name='zS7', min=-10, max=10, default=0, precision=3, description='Position z shift')
-    Z08 = FloatProperty(name='zS8', min=-10, max=10, default=0, precision=3, description='Position z shift')
-    Z09 = FloatProperty(name='zS9', min=-10, max=10, default=0, precision=3, description='Position z shift')
-    Z10 = FloatProperty(name='zS10', min=-10, max=10, default=0, precision=3, description='Position z shift')
-    Z11 = FloatProperty(name='zS11', min=-10, max=10, default=0, precision=3, description='Position z shift')
-    Z12 = FloatProperty(name='zS12', min=-10, max=10, default=0, precision=3, description='Position z shift')
-
-    right = BoolProperty(name="Right", description="Create right side", default=True)
-    left = BoolProperty(name="Left", description="Create left side", default=True)
+    Z01: FloatProperty(name='zS1', min=-10, max=10, default=0, precision=3, description='Position z shift')
+    Z02: FloatProperty(name='zS2', min=-10, max=10, default=0, precision=3, description='Position z shift')
+    Z03: FloatProperty(name='zS3', min=-10, max=10, default=0, precision=3, description='Position z shift')
+    Z04: FloatProperty(name='zS4', min=-10, max=10, default=0, precision=3, description='Position z shift')
+    Z05: FloatProperty(name='zS5', min=-10, max=10, default=0, precision=3, description='Position z shift')
+    Z06: FloatProperty(name='zS6', min=-10, max=10, default=0, precision=3, description='Position z shift')
+    Z07: FloatProperty(name='zS7', min=-10, max=10, default=0, precision=3, description='Position z shift')
+    Z08: FloatProperty(name='zS8', min=-10, max=10, default=0, precision=3, description='Position z shift')
+    Z09: FloatProperty(name='zS9', min=-10, max=10, default=0, precision=3, description='Position z shift')
+    Z10: FloatProperty(name='zS10', min=-10, max=10, default=0, precision=3, description='Position z shift')
+    Z11: FloatProperty(name='zS11', min=-10, max=10, default=0, precision=3, description='Position z shift')
+    Z12: FloatProperty(name='zS12', min=-10, max=10, default=0, precision=3, description='Position z shift')
+
+    right: BoolProperty(name="Right", description="Create right side", default=True)
+    left: BoolProperty(name="Left", description="Create left side", default=True)
 
 bpy.utils.register_class(ShelvesProperties)
 
@@ -77,37 +77,37 @@ class AchmShelves(Operator):
     bl_category = 'Archimesh'
     bl_options = {'REGISTER', 'UNDO'}
 
-    thickness = FloatProperty(
+    thickness: FloatProperty(
             name='Side Thickness', min=0.001, max=5,
             default=0.03, precision=3,
             description='Board thickness',
             )
-    sthickness = FloatProperty(
+    sthickness: FloatProperty(
             name='Shelves Thickness', min=0.001, max=5,
             default=0.03, precision=3,
             description='Board thickness',
             )
-    depth = FloatProperty(
+    depth: FloatProperty(
             name='Depth', min=0.001, max=50,
             default=0.28, precision=3,
             description='Default unit depth',
             )
-    height = FloatProperty(
+    height: FloatProperty(
             name='Height', min=0.001, max=50,
             default=2, precision=3,
             description='Default unit height',
             )
-    top = FloatProperty(
+    top: FloatProperty(
             name='Top', min=0, max=50,
             default=0.03, precision=3,
             description='Default top shelf position',
             )
-    bottom = FloatProperty(
+    bottom: FloatProperty(
             name='Bottom', min=0, max=50,
             default=0.07, precision=3,
             description='Default bottom self position',
             )
-    stype = EnumProperty(
+    stype: EnumProperty(
             items=(
                 ('1', "Full side", ""),
                 ('4', "4 Legs", ""),
@@ -116,22 +116,22 @@ class AchmShelves(Operator):
             description="Type of side construction",
             )
 
-    fitZ = BoolProperty(
+    fitZ: BoolProperty(
             name="Floor origin in Z=0",
             description="Use Z=0 axis as vertical origin floor position",
             default=True,
             )
 
-    shelves_num = IntProperty(
+    shelves_num: IntProperty(
             name='Number of Units',
             min=1, max=10,
             default=1,
             description='Number total of shelves units',
             )
-    shelves = CollectionProperty(type=ShelvesProperties)
+    shelves: CollectionProperty(type=ShelvesProperties)
 
     # Materials
-    crt_mat = BoolProperty(
+    crt_mat: BoolProperty(
             name="Create default Cycles materials",
             description="Create default materials for Cycles render",
             default=True,
diff --git a/archimesh/achm_stairs_maker.py b/archimesh/achm_stairs_maker.py
index d5b1f82e..2d687a72 100644
--- a/archimesh/achm_stairs_maker.py
+++ b/archimesh/achm_stairs_maker.py
@@ -43,7 +43,7 @@ class AchmStairs(Operator):
     bl_options = {'REGISTER', 'UNDO'}
 
     # Define properties
-    model = EnumProperty(
+    model: EnumProperty(
             items=(
                 ('1', "Rectangular", ""),
                 ('2', "Rounded", ""),
@@ -51,85 +51,85 @@ class AchmStairs(Operator):
             name="Model",
             description="Type of steps",
             )
-    radio = FloatProperty(
+    radio: FloatProperty(
             name='',
             min=0.001, max=0.500,
             default=0.20, precision=3,
             description='Radius factor for rounded',
             )
-    curve = BoolProperty(
+    curve: BoolProperty(
             name="Include deformation handles",
             description="Include a curve to modify the stairs curve",
             default=False,
             )
 
-    step_num = IntProperty(
+    step_num: IntProperty(
             name='Number of steps',
             min=1, max=1000,
             default=3,
             description='Number total of steps',
             )
-    max_width = FloatProperty(
+    max_width: FloatProperty(
             name='Width',
             min=0.001, max=10,
             default=1, precision=3,
             description='Step maximum width',
             )
-    depth = FloatProperty(
+    depth: FloatProperty(
             name='Depth',
             min=0.001, max=10,
             default=0.30, precision=3,
             description='Depth of the step',
             )
-    shift = FloatProperty(
+    shift: FloatProperty(
             name='Shift',
             min=0.001, max=1,
             default=1, precision=3,
             description='Step shift in Y axis',
             )
-    thickness = FloatProperty(
+    thickness: FloatProperty(
             name='Thickness',
             min=0.001, max=10,
             default=0.03, precision=3,
             description='Step thickness',
             )
-    sizev = BoolProperty(
+    sizev: BoolProperty(
             name="Variable width",
             description="Steps are not equal in width",
             default=False,
             )
-    back = BoolProperty(
+    back: BoolProperty(
             name="Close sides",
             description="Close all steps side to make a solid structure",
             default=False,
             )
-    min_width = FloatProperty(
+    min_width: FloatProperty(
             name='',
             min=0.001, max=10,
             default=1, precision=3,
             description='Step minimum width',
             )
 
-    height = FloatProperty(
+    height: FloatProperty(
             name='height',
             min=0.001, max=10,
             default=0.14, precision=3,
             description='Step height',
             )
-    front_gap = FloatProperty(
+    front_gap: FloatProperty(
             name='Front',
             min=0, max=10,
             default=0.03,
             precision=3,
             description='Front gap',
             )
-    side_gap = FloatProperty(
+    side_gap: FloatProperty(
             name='Side',
             min=0, max=10,
             default=0, precision=3,
             description='Side gap',
             )
-    crt_mat = BoolProperty(
+    crt_mat: BoolProperty(
             name="Create default Cycles materials",
             description="Create default materials for Cycles render",
             default=True,
diff --git a/archimesh/achm_venetian_maker.py b/archimesh/achm_venetian_maker.py
index 57adf0ef..01d0c422 100644
--- a/archimesh/achm_venetian_maker.py
+++ b/archimesh/achm_venetian_maker.py
@@ -328,38 +328,38 @@ def shape_mesh_and_create_children(mainobject, tmp_mesh, update=False):
 # Define property group class to create or modify
 # ------------------------------------------------------------------
 class ObjectProperties(PropertyGroup):
-    width = FloatProperty(
+    width: FloatProperty(
             name='Width',
             min=0.30, max=4, default=1, precision=3,
             description='Total width', update=update_object,
             )
-    height = FloatProperty(
+    height: FloatProperty(
             name='Height',
             min=0.20, max=10, default=1.7, precision=3,
             description='Total height',
             update=update_object,
             )
-    depth = FloatProperty(
+    depth: FloatProperty(
             name='Slat depth', min=0.02, max=0.30, default=0.04,
             precision=3,
             description='Slat depth', update=update_object,
             )
-    angle = FloatProperty(
+    angle: FloatProperty(
             name='Angle', min=0, max=85, default=0, precision=1,
             description='Angle of the slats', update=update_object,
             )
-    ratio = IntProperty(
+    ratio: IntProperty(
             name='Extend', min=0, max=100, default=100,
             description='% of extension (100 full extend)', update=update_object,
             )
 
     # Materials
-    crt_mat = BoolProperty(
+    crt_mat: BoolProperty(
             name="Create default Cycles materials",
             description="Create default materials for Cycles render",
             default=True, update=update_object,
             )
-    objcol = FloatVectorProperty(
+    objcol: FloatVectorProperty(
             name="Color",
             description="Color for material",
             default=(0.616, 0.435, 1.0, 1.0),
diff --git a/archimesh/achm_window_maker.py b/archimesh/achm_window_maker.py
index 1e43c792..a026232a 100644
--- a/archimesh/achm_window_maker.py
+++ b/archimesh/achm_window_maker.py
@@ -242,40 +242,40 @@ def shape_mesh_and_create_children(mainobject, tmp_mesh, update=False):
 # Define property group class to create or modify
 # ------------------------------------------------------------------
 class ObjectProperties(PropertyGroup):
-    width = FloatProperty(
+    width: FloatProperty(
             name='Width',
             min=0.20, max=50,
             default=1.20, precision=3,
             description='window width',
             update=update_object,
             )
-    depth = FloatProperty(
+    depth: FloatProperty(
             name='Depth',
             min=0.07, max=1,
             default=0.10, precision=3,
             description='window depth',
             update=update_object,
             )
-    height = FloatProperty(
+    height: FloatProperty(
             name='Height',
             min=0.20, max=50,
             default=1, precision=3,
             description='window height',
             update=update_object,
             )
-    r = FloatProperty(
+    r: FloatProperty(
             name='Rotation', min=0, max=360, default=0, precision=1,
             description='Window rotation',
             update=update_object,
             )
 
-    external = BoolProperty(
+    external: BoolProperty(
             name="External frame",
             description="Create an external front frame",
             default=True,
             update=update_object,
             )
-    frame = FloatProperty(
+    frame: FloatProperty(
             name='External Frame',
             min=0.001, max=1,
             default=0.01, precision=3,
@@ -283,21 +283,21 @@ class ObjectProperties(PropertyGroup):
             update=update_object,
             )
 
-    frame_L = FloatProperty(
+    frame_L: FloatProperty(
             name='Frame',
             min=0.02, max=1,
             default=0.06, precision=3,
             description='Frame size',
             update=update_object,
             )
-    wf = FloatProperty(
+    wf: FloatProperty(
             name='WinFrame',
             min=0.001, max=1,
             default=0.05, precision=3,
             description='Window Frame size',
             update=update_object,
             )
-    leafratio = FloatProperty(
+    leafratio: FloatProperty(
             name='Leaf ratio',
             min=0.001, max=0.999,
             default=0.50,
@@ -305,7 +305,7 @@ class ObjectProperties(PropertyGroup):
             description='Leaf thickness ratio',
             update=update_object,
             )
-    opentype = EnumProperty(
+    opentype: EnumProperty(
             items=(
                 ('1', "Rail window", ""),
                 ('2', "Two leaf", ""),
@@ -315,34 +315,34 @@ class ObjectProperties(PropertyGroup):
             description="Defines type of window",
             update=update_object,
             )
-    handle = BoolProperty(
+    handle: BoolProperty(
             name="Create handles",
             description="Create default handle to the leaf",
             default=True,
             update=update_object,
             )
 
-    sill = BoolProperty(
+    sill: BoolProperty(
             name="Sill",
             description="Add sill to window",
             default=True,
             update=update_object,
             )
-    sill_thickness = FloatProperty(
+    sill_thickness: FloatProperty(
             name='Thickness',
             min=0, max=50,
             default=0.01, precision=3,
             description='Sill thickness',
             update=update_object,
             )
-    sill_back = FloatProperty(
+    sill_back: FloatProperty(
             name='Back',
             min=0, max=10,
             default=0.0, precision=3,
             description='Extrusion in back side',
             update=update_object,
             )
-    sill_front = FloatProperty(
+    sill_front: FloatProperty(
             name='Front',
             min=0, max=10,
             default=0.12, precision=3,
@@ -350,39 +350,39 @@ class ObjectProperties(PropertyGroup):
             update=update_object,
             )
 
-    blind = BoolProperty(
+    blind: BoolProperty(
             name="Blind",
             description="Create an external blind",
             default=False,
             update=update_object,
             )
-    blind_box = BoolProperty(
+    blind_box: BoolProperty(
             name="Blind box", description="Create a box over frame for blind",
             default=True,
             update=update_object,
             )
-    blind_height = FloatProperty(
+    blind_height: FloatProperty(
             name='Height',
             min=0.001, max=10,
             default=0.12, precision=3,
             description='Blind box height',
             update=update_object,
             )
-    blind_back = FloatProperty(
+    blind_back: FloatProperty(
             name='Back',
             min=0.001, max=10,
             default=0.002, precision=3,
             description='Extrusion in back side',
             update=update_object,
             )
-    blind_rail = FloatProperty(
+    blind_rail: FloatProperty(
             name='Separation',
             min=0.001, max=10,
             default=0.10, precision=3,
             description='Separation from frame',
             update=update_object,
             )
-    blind_ratio = IntProperty(
+    blind_ratio: IntProperty(
             name='Extend',
             min=0, max=100,
             default=20,
@@ -391,24 +391,24 @@ class ObjectProperties(PropertyGroup):
             )
 
     # Materials
-    crt_mat = BoolProperty(
+    crt_mat: BoolProperty(
             name="Create default Cycles materials",
             description="Create default materials for Cycles render",
             default=True,
             update=update_object,
             )
     # opengl internal data
-    glpoint_a = FloatVectorProperty(
+    glpoint_a: FloatVectorProperty(
             name="glpointa",
             description="Hidden property for opengl",
             default=(0, 0, 0),
             )
-    glpoint_b = FloatVectorProperty(
+    glpoint_b: FloatVectorProperty(
             name="glpointb",
             description="Hidden property for opengl",
             default=(0, 0, 0),
             )
-    glpoint_c = FloatVectorProperty(
+    glpoint_c: FloatVectorProperty(
             name="glpointc",
             description="Hidden property for opengl",
             default=(0, 0, 0),
diff --git a/archimesh/achm_window_panel.py b/archimesh/achm_window_panel.py
index 16c9209b..34911734 100644
--- a/archimesh/achm_window_panel.py
+++ b/archimesh/achm_window_panel.py
@@ -1553,7 +1553,7 @@ def create_ctrl_box(parentobj, objname):
 # Define property group class to create or modify
 # ------------------------------------------------------------------
 class GeneralPanelProperties(PropertyGroup):
-    prs = EnumProperty(
+    prs: EnumProperty(
             items=(
                 ('1', "WINDOW 250X200", ""),
                 ('2', "WINDOW 200X200", ""),
@@ -1569,40 +1569,40 @@ class GeneralPanelProperties(PropertyGroup):
             update=update_using_default,
             )
     son = prs
-    gen = IntProperty(
+    gen: IntProperty(
             name='H Count', min=1, max=8, default=3,
             description='Horizontal Panes',
             update=update_window,
             )
-    yuk = IntProperty(
+    yuk: IntProperty(
             name='V Count', min=1, max=5, default=1,
             description='Vertical Panes',
             update=update_window,
             )
-    kl1 = IntProperty(
+    kl1: IntProperty(
             name='Outer Frame', min=2, max=50, default=5,
             description='Outside Frame Thickness',
             update=update_window,
             )
-    kl2 = IntProperty(
+    kl2: IntProperty(
             name='Risers', min=2, max=50, default=5,
             description='Risers Width',
             update=update_window,
             )
-    fk = IntProperty(
+    fk: IntProperty(
             name='Inner Frame', min=1, max=20, default=2,
             description='Inside Frame Thickness',
             update=update_window,
             )
 
-    mr = BoolProperty(name='Sill', default=True, description='Window Sill', update=update_window)
-    mr1 = IntProperty(name='', min=1, max=20, default=4, description='Height', update=update_window)
-    mr2 = IntProperty(name='', min=0, max=20, default=4, description='First Depth', update=update_window)
-    mr3 = IntProperty(name='', min=1, max=50, default=20, description='Second Depth', update=update_window)
-    mr4 = IntProperty(name='', min=0, max=50, default=0, description='Extrusion for Jamb',
+    mr: BoolProperty(name='Sill', default=True, description='Window Sill', update=update_window)
+    mr1: IntProperty(name='', min=1, max=20, default=4, description='Height', update=update_window)
+    mr2: IntProperty(name='', min=0, max=20, default=4, description='First Depth', update=update_window)
+    mr3: IntProperty(name='', min=1, max=50, default=20, description='Second Depth', update=update_window)
+    mr4: IntProperty(name='', min=0, max=50, default=0, description='Extrusion for Jamb',
                                 update=update_window)
 
-    mt1 = EnumProperty(
+    mt1: EnumProperty(
             items=(
                 ('1', "PVC", ""),
                 ('2', "WOOD", ""),
@@ -1613,7 +1613,7 @@ class GeneralPanelProperties(PropertyGroup):
             description='Material to use',
             update=update_window,
             )
-    mt2 = EnumProperty(
+    mt2: EnumProperty(
             items=(
                 ('1', "PVC", ""),
                 ('2', "WOOD", ""),
@@ -1625,14 +1625,14 @@ class GeneralPanelProperties(PropertyGroup):
             update=update_window,
             )
 
-    r = FloatProperty(
+    r: FloatProperty(
             name='Rotation',
             min=0, max=360, default=0, precision=1,
             description='Panel rotation',
             update=update_window,
             )
 
-    UST = EnumProperty(
+    UST: EnumProperty(
             items=(
                 ('1', "Flat", ""),
                 ('2', "Arch", ""),
@@ -1643,7 +1643,7 @@ class GeneralPanelProperties(PropertyGroup):
             description='Type of window upper section',
             update=update_window,
             )
-    DT2 = EnumProperty(
+    DT2: EnumProperty(
             items=(
                 ('1', "Difference", ""),
                 ('2', "Radius", ""),
@@ -1652,7 +1652,7 @@ class GeneralPanelProperties(PropertyGroup):
             default='1',
             update=update_window,
             )
-    DT3 = EnumProperty(
+    DT3: EnumProperty(
             items=(
                 ('1', "Difference", ""),
                 ('2', "Incline %", ""),
@@ -1662,102 +1662,102 @@ class GeneralPanelProperties(PropertyGroup):
             default='1', update=update_window,
             )
 
-    VL1 = IntProperty(name='', min=-10000, max=10000, default=30, update=update_window)  # Fark
-    VL2 = IntProperty(name='', min=1, max=10000, default=30, update=update_window)  # Cap
-    VL3 = IntProperty(name='', min=-100, max=100, default=30, update=update_window)  # Egim %
-    VL4 = IntProperty(name='', min=-45, max=45, default=30, update=update_window)  # Egim Aci
+    VL1: IntProperty(name='', min=-10000, max=10000, default=30, update=update_window)  # Fark
+    VL2: IntProperty(name='', min=1, max=10000, default=30, update=update_window)  # Cap
+    VL3: IntProperty(name='', min=-100, max=100, default=30, update=update_window)  # Egim %
+    VL4: IntProperty(name='', min=-45, max=45, default=30, update=update_window)  # Egim Aci
 
-    res = IntProperty(name='Resolution', min=2, max=360, default=36, update=update_window)  # Res
+    res: IntProperty(name='Resolution', min=2, max=360, default=36, update=update_window)  # Res
 
-    gnx0 = IntProperty(name='', min=1, max=300, default=60, description='1st Window Width',
+    gnx0: IntProperty(name='', min=1, max=300, default=60, description='1st Window Width',
                                  update=update_window)
-    gnx1 = IntProperty(name='', min=1, max=300, default=110, description='2nd Window Width',
+    gnx1: IntProperty(name='', min=1, max=300, default=110, description='2nd Window Width',
                                  update=update_window)
-    gnx2 = IntProperty(name='', min=1, max=300, default=60, description='3rd Window Width',
+    gnx2: IntProperty(name='', min=1, max=300, default=60, description='3rd Window Width',
                                  update=update_window)
-    gnx3 = IntProperty(name='', min=1, max=300, default=60, description='4th Window Width',
+    gnx3: IntProperty(name='', min=1, max=300, default=60, description='4th Window Width',
                                  update=update_window)
-    gnx4 = IntProperty(name='', min=1, max=300, default=60, description='5th Window Width',
+    gnx4: IntProperty(name='', min=1, max=300, default=60, description='5th Window Width',
                                  update=update_window)
-    gnx5 = IntProperty(name='', min=1, max=300, default=60, description='6th Window Width',
+    gnx5: IntProperty(name='', min=1, max=300, default=60, description='6th Window Width',
                                  update=update_window)
-    gnx6 = IntProperty(name='', min=1, max=300, default=60, description='7th Window Width',
+    gnx6: IntProperty(name='', min=1, max=300, default=60, description='7th Window Width',
                                  update=update_window)
-    gnx7 = IntProperty(name='', min=1, max=300, default=60, description='8th Window Width',
+    gnx7: IntProperty(name='', min=1, max=300, default=60, description='8th Window Width',
                                  update=update_window)
 
-    gny0 = IntProperty(name='', min=1, max=300, default=190, description='1st Row Height',
+    gny0: IntProperty(name='', min=1, max=300, default=190, description='1st Row Height',
                                  update=update_window)
-    gny1 = IntProperty(name='', min=1, max=300, default=45, description='2nd Row Height',
+    gny1: IntProperty(name='', min=1, max=300, default=45, description='2nd Row Height',
                                  update=update_window)
-    gny2 = IntProperty(name='', min=1, max=300, default=45, description='3rd Row Height',
+    gny2: IntProperty(name='', min=1, max=300, default=45, description='3rd Row Height',
                                  update=update_window)
-    gny3 = IntProperty(name='', min=1, max=300, default=45, description='4th Row Height',
+    gny3: IntProperty(name='', min=1, max=300, default=45, description='4th Row Height',
                                  update=update_window)
-    gny4 = IntProperty(name='', min=1, max=300, default=45, description='5th Row Height',
+    gny4: IntProperty(name='', min=1, max=300, default=45, description='5th Row Height',
                                  update=update_window)
 
-    k00 = BoolProperty(name='', default=True, update=update_window)
-    k01 = BoolProperty(name='', default=False, update=update_window)
-    k02 = BoolProperty(name='', default=True, update=update_window)
-    k03 = BoolProperty(name='', default=False, update=update_window)
-    k04 = BoolProperty(name='', default=False, update=update_window)
-    k05 = BoolProperty(name='', default=False, update=update_window)
-    k06 = BoolProperty(name='', default=False, update=update_window)
-    k07 = BoolProperty(name='', default=False, update=update_window)
-
-    k10 = BoolProperty(name='', default=False, update=update_window)
-    k11 = BoolProperty(name='', default=False, update=update_window)
-    k12 = BoolProperty(name='', default=False, update=update_window)
-    k13 = BoolProperty(name='', default=False, update=update_window)
-    k14 = BoolProperty(name='', default=False, update=update_window)
-    k15 = BoolProperty(name='', default=False, update=update_window)
-    k16 = BoolProperty(name='', default=False, update=update_window)
-    k17 = BoolProperty(name='', default=False, update=update_window)
-
-    k20 = BoolProperty(name='', default=False, update=update_window)
-    k21 = BoolProperty(name='', default=False, update=update_window)
-    k22 = BoolProperty(name='', default=False, update=update_window)
-    k23 = BoolProperty(name='', default=False, update=update_window)
-    k24 = BoolProperty(name='', default=False, update=update_window)
-    k25 = BoolProperty(name='', default=False, update=update_window)
-    k26 = BoolProperty(name='', default=False, update=update_window)
-    k27 = BoolProperty(name='', default=False, update=update_window)
-
-    k30 = BoolProperty(name='', default=False, update=update_window)
-    k31 = BoolProperty(name='', default=False, update=update_window)
-    k32 = BoolProperty(name='', default=False, update=update_window)
-    k33 = BoolProperty(name='', default=False, update=update_window)
-    k34 = BoolProperty(name='', default=False, update=update_window)
-    k35 = BoolProperty(name='', default=False, update=update_window)
-    k36 = BoolProperty(name='', default=False, update=update_window)
-    k37 = BoolProperty(name='', default=False, update=update_window)
-
-    k40 = BoolProperty(name='', default=False, update=update_window)
-    k41 = BoolProperty(name='', default=False, update=update_window)
-    k42 = BoolProperty(name='', default=False, update=update_window)
-    k43 = BoolProperty(name='', default=False, update=update_window)
-    k44 = BoolProperty(name='', default=False, update=update_window)
-    k45 = BoolProperty(name='', default=False, update=update_window)
-    k46 = BoolProperty(name='', default=False, update=update_window)
-    k47 = BoolProperty(name='', default=False, update=update_window)
+    k00: BoolProperty(name='', default=True, update=update_window)
+    k01: BoolProperty(name='', default=False, update=update_window)
+    k02: BoolProperty(name='', default=True, update=update_window)
+    k03: BoolProperty(name='', default=False, update=update_window)
+    k04: BoolProperty(name='', default=False, update=update_window)
+    k05: BoolProperty(name='', default=False, update=update_window)
+    k06: BoolProperty(name='', default=False, update=update_window)
+    k07: BoolProperty(name='', default=False, update=update_window)
+
+    k10: BoolProperty(name='', default=False, update=update_window)
+    k11: BoolProperty(name='', default=False, update=update_window)
+    k12: BoolProperty(name='', default=False, update=update_window)
+    k13: BoolProperty(name='', default=False, update=update_window)
+    k14: BoolProperty(name='', default=False, update=update_window)
+    k15: BoolProperty(name='', default=False, update=update_window)
+    k16: BoolProperty(name='', default=False, update=update_window)
+    k17: BoolProperty(name='', default=False, update=update_window)
+
+    k20: BoolProperty(name='', default=False, update=update_window)
+    k21: BoolProperty(name='', default=False, update=update_window)
+    k22: BoolProperty(name='', default=False, update=update_window)
+    k23: BoolProperty(name='', default=False, update=update_window)
+    k24: BoolProperty(name='', default=False, update=update_window)
+    k25: BoolProperty(name='', default=False, update=update_window)
+    k26: BoolProperty(name='', default=False, update=update_window)
+    k27: BoolProperty(name='', default=False, update=update_window)
+
+    k30: BoolProperty(name='', default=False, update=update_window)
+    k31: BoolProperty(name='', default=False, update=update_window)
+    k32: BoolProperty(name='', default=False, update=update_window)
+    k33: BoolProperty(name='', default=False, update=update_window)
+    k34: BoolProperty(name='', default=False, update=update_window)
+    k35: BoolProperty(name='', default=False, update=update_window)
+    k36: BoolProperty(name='', default=False, update=update_window)
+    k37: BoolProperty(name='', default=False, update=update_window)
+
+    k40: BoolProperty(name='', default=False, update=update_window)
+    k41: BoolProperty(name='', default=False, update=update_window)
+    k42: BoolProperty(name='', default=False, update=update_window)
+    k43: BoolProperty(name='', default=False, update=update_window)
+    k44: BoolProperty(name='', default=False, update=update_window)
+    k45: BoolProperty(name='', default=False, update=update_window)
+    k46: BoolProperty(name='', default=False, update=update_window)
+    k47: BoolProperty(name='', default=False, update=update_window)
     # opengl internal data
-    glpoint_a = FloatVectorProperty(
+    glpoint_a: FloatVectorProperty(
             name="glpointa",
             description="Hidden property for opengl",
             default=(0, 0, 0),
             )
-    glpoint_b = FloatVectorProperty(
+    glpoint_b: FloatVectorProperty(
             name="glpointb",
             description="Hidden property for opengl",
             default=(0, 0, 0),
             )
-    glpoint_c = FloatVectorProperty(
+    glpoint_c: FloatVectorProperty(
             name="glpointc",
             description="Hidden property for opengl",
             default=(0, 0, 0),
             )
-    glpoint_d = FloatVectorProperty(
+    glpoint_d: FloatVectorProperty(
             name="glpointc",
             description="Hidden property for opengl",
             default=(0, 0, 0),