diff --git a/add_curve_extra_objects/__init__.py b/add_curve_extra_objects/__init__.py
index 407e2fe2ffee9451ee0781f9ff7286d4ff522103..7a1a3ba7b9b81d860edec205f2e76fb544a1eb11 100644
--- a/add_curve_extra_objects/__init__.py
+++ b/add_curve_extra_objects/__init__.py
@@ -23,8 +23,8 @@
 bl_info = {
     "name": "Extra Objects",
     "author": "Multiple Authors",
-    "version": (0, 1, 4),
-    "blender": (2, 80, 0),
+    "version": (0, 1, 5),
+    "blender": (2, 93, 0),
     "location": "View3D > Add > Curve > Extra Objects",
     "description": "Add extra curve object types",
     "warning": "",
@@ -159,11 +159,6 @@ class CurveExtraObjectsAddonPreferences(AddonPreferences):
             description="Show/Hide the Add Menu items",
             default=False
             )
-    show_panel_list : BoolProperty(
-            name="Panels List",
-            description="Show/Hide the Panel items",
-            default=False
-            )
 
     def draw(self, context):
         layout = self.layout
@@ -198,31 +193,20 @@ class CurveExtraObjectsAddonPreferences(AddonPreferences):
             box.label(text="Knots:", icon="LAYER_ACTIVE")
             box.label(text="Torus Knots Plus, Celtic Links, Braid Knot",
                       icon="LAYER_USED")
+            box.label(text="SpiroFit, Bounce Spline, Catenary", icon="LAYER_USED")
             box.label(text="Curly Curve", icon="LAYER_ACTIVE")
             box.label(text="Bevel/Taper:", icon="LAYER_ACTIVE")
             box.label(text="Add Curve as Bevel, Add Curve as Taper",
                       icon="LAYER_USED")
+            box.label(text="Simple Curve:", icon="LAYER_ACTIVE")
+            box.label(text="Available if the Active Object is a Curve was created with 2D Objects",
+                     icon="LAYER_USED")
 
             box.label(text="Items located in the Add Menu > Surface (default shortcut Ctrl + A):",
                       icon="LAYER_USED")
             box.label(text="Wedge, Cone, Star, Plane",
                       icon="LAYER_ACTIVE")
 
-        icon_2 = "TRIA_RIGHT" if not self.show_panel_list else "TRIA_DOWN"
-        box = layout.box()
-        box.prop(self, "show_panel_list", emboss=False, icon=icon_2)
-
-        if self.show_panel_list:
-            box.label(text="Panel located in 3D View Tools Region > Create:",
-                      icon="LAYER_ACTIVE")
-            box.label(text="Spline:", icon="LAYER_ACTIVE")
-            box.label(text="SpiroFit, Bounce Spline, Catenary", icon="LAYER_USED")
-            box.label(text="Panel located in 3D View Tools Region > Tools:",
-                      icon="LAYER_ACTIVE")
-            box.label(text="Simple Curve:", icon="LAYER_ACTIVE")
-            box.label(text="Available if the Active Object is a Curve was created with 2D Objects",
-                     icon="LAYER_USED")
-
 
 class INFO_MT_curve_knots_add(Menu):
     # Define the "Extras" menu
@@ -254,6 +238,10 @@ def menu_func(self, context):
         return None
     layout.separator()
     layout.menu(INFO_MT_curve_knots_add.bl_idname, text="Knots", icon='CURVE_DATA')
+    layout.separator()
+    layout.operator("curve.bevelcurve")
+    layout.operator("curve.tapercurve")
+    layout.operator("curve.simple")
 
 def menu_surface(self, context):
     self.layout.separator()
diff --git a/add_curve_extra_objects/add_curve_aceous_galore.py b/add_curve_extra_objects/add_curve_aceous_galore.py
index 463b05a03138b43ce44332ae6cbf0a25a9b9fa7c..42239d7a0bb470fff52a225c170989751a7a5274 100644
--- a/add_curve_extra_objects/add_curve_aceous_galore.py
+++ b/add_curve_extra_objects/add_curve_aceous_galore.py
@@ -25,8 +25,7 @@ bl_info = {
     "location": "View3D > Add > Curve",
     "description": "Adds many different types of Curves",
     "warning": "",
-    "doc_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/"
-               "Scripts/Curve/Curves_Galore",
+    "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
     "category": "Add Curve",
 }
 """
diff --git a/add_curve_extra_objects/add_curve_braid.py b/add_curve_extra_objects/add_curve_braid.py
index 5f52d455a2a98e948cd261174efd9d458930fffe..ba32b563e097cc86e35052a9e9eb6a68e1f4376d 100644
--- a/add_curve_extra_objects/add_curve_braid.py
+++ b/add_curve_extra_objects/add_curve_braid.py
@@ -9,7 +9,7 @@ bl_info = {
     "location": "View3D > Add > Mesh > New Braid",
     "description": "Adds a new Braid",
     "warning": "",
-    "doc_url": "",
+    "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
     "category": "Add Mesh",
 }
 """
diff --git a/add_curve_extra_objects/add_curve_curly.py b/add_curve_extra_objects/add_curve_curly.py
index 72f82f050a071602823b823e9b48b8a0f4cda8fc..d49cb8fb1875d98abdc550871e7d9e2211d6d8b5 100644
--- a/add_curve_extra_objects/add_curve_curly.py
+++ b/add_curve_extra_objects/add_curve_curly.py
@@ -10,8 +10,7 @@ bl_info = {
     "location": "View3D > Add > Curve > Curly Curve",
     "description": "Adds a new Curly Curve",
     "warning": "",
-    "doc_url": "https://wiki.blender.org/index.php/Extensions:2.6/"
-               "Py/Scripts/Curve/Curly_Curves",
+    "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
     "category": "Add Curve",
 }
 
diff --git a/add_curve_extra_objects/add_curve_simple.py b/add_curve_extra_objects/add_curve_simple.py
index c994acb96f44cfa40b76f77980fd1ab267c72877..c69f1e9086ec9f02c1593139894073a7f2ef92c6 100644
--- a/add_curve_extra_objects/add_curve_simple.py
+++ b/add_curve_extra_objects/add_curve_simple.py
@@ -24,8 +24,7 @@ bl_info = {
     "location": "View3D > Add > Curve",
     "description": "Adds Simple Curve",
     "warning": "",
-    "doc_url": "https://wiki.blender.org/index.php/Extensions:2.6/"
-               "Py/Scripts/Curve/Simple_curves",
+    "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
     "category": "Add Curve",
 }
 
diff --git a/add_curve_extra_objects/add_curve_spirals.py b/add_curve_extra_objects/add_curve_spirals.py
index aa87900741f331bd2f54e9c5a3d37e09eb094e46..f3c5a0744670b66df7bc3d94055d5dac4a68ec5e 100644
--- a/add_curve_extra_objects/add_curve_spirals.py
+++ b/add_curve_extra_objects/add_curve_spirals.py
@@ -9,10 +9,7 @@ bl_info = {
     "blender": (2, 80, 0),
     "location": "View3D > Add > Curve",
     "warning": "",
-    "doc_url": "https://wiki.blender.org/index.php/Extensions:2.4/Py/"
-               "Scripts/Object/Spirals",
-    "tracker_url": "http://alexvaqp.googlepages.com?"
-                   "func=detail&aid=<number>",
+    "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
     "category": "Add Curve",
 }
 """
diff --git a/add_curve_extra_objects/add_curve_spirofit_bouncespline.py b/add_curve_extra_objects/add_curve_spirofit_bouncespline.py
index 41b8a6b5498e9f800b5d282547516e395e996c3a..f2151ee48c87f41a09e1fb2ea0fcfcc45f7d9ff4 100644
--- a/add_curve_extra_objects/add_curve_spirofit_bouncespline.py
+++ b/add_curve_extra_objects/add_curve_spirofit_bouncespline.py
@@ -18,15 +18,15 @@
 
 
 bl_info = {
-    "name": "SpiroFit, BounceSpline and Catenary",
+    "name": "SpiroFit, Bounce Spline, and Catenary",
     "author": "Antonio Osprite, Liero, Atom, Jimmy Hazevoet",
     "version": (0, 2, 2),
     "blender": (2, 80, 0),
-    "location": "Sidebar > Create Tab",
+    "location": "Add > Curve > Knots",
     "description": "SpiroFit, BounceSpline and Catenary adds "
                    "splines to selected mesh or objects",
     "warning": "",
-    "doc_url": "",
+    "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
     "category": "Object",
 }
 
diff --git a/add_curve_extra_objects/add_curve_torus_knots.py b/add_curve_extra_objects/add_curve_torus_knots.py
index d394484dceb45b8c0aee3c65aa8f598a9a34b61d..8dac754d9fc257dc0e518ae5028f79e7ebfa259f 100644
--- a/add_curve_extra_objects/add_curve_torus_knots.py
+++ b/add_curve_extra_objects/add_curve_torus_knots.py
@@ -25,8 +25,7 @@ bl_info = {
     "location": "View3D > Add > Curve",
     "description": "Adds many types of (torus) knots",
     "warning": "",
-    "doc_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/"
-               "Scripts/Curve/Torus_Knot",
+    "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
     "category": "Add Curve",
 }
 """
diff --git a/add_curve_extra_objects/add_surface_plane_cone.py b/add_curve_extra_objects/add_surface_plane_cone.py
index 67026c16a4caff2c1ec079ed383cc234f1b3bd0c..47771051babc2f886270f5d8ed2e740b823ecabb 100644
--- a/add_curve_extra_objects/add_surface_plane_cone.py
+++ b/add_curve_extra_objects/add_surface_plane_cone.py
@@ -8,7 +8,7 @@ bl_info = {
     "blender": (2, 80, 0),
     "location": "View3D > Add > Surface",
     "warning": "",
-    "doc_url": "",
+    "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
     "category": "Add Mesh"
 }
 
diff --git a/add_curve_extra_objects/beveltaper_curve.py b/add_curve_extra_objects/beveltaper_curve.py
index c6ce4f93e324d5b599a8a8c614af729b472a89e7..27795ed156d0aad6c4cee865bbcca7aee1fbf3e2 100644
--- a/add_curve_extra_objects/beveltaper_curve.py
+++ b/add_curve_extra_objects/beveltaper_curve.py
@@ -25,8 +25,7 @@ bl_info = {
     "location": "View3D > Object > Bevel/Taper",
     "description": "Adds bevel and/or taper curve to active curve",
     "warning": "",
-    "doc_url": "https://wiki.blender.org/index.php/Extensions:2.6/"
-               "Py/Scripts/Curve/Bevel_-Taper_Curve",
+    "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
     "category": "Curve",
 }