diff --git a/lua/primitive/editor/editor.lua b/lua/primitive/editor/editor.lua
index 940c9ac..cd39ed3 100644
--- a/lua/primitive/editor/editor.lua
+++ b/lua/primitive/editor/editor.lua
@@ -7,7 +7,6 @@
 ]]
 
 local PANEL = {}
-PANEL.AllowAutoRefresh = true
 
 surface.CreateFont( "DTreeEditorBaseSmall", { font = "Arial", size = 14 } )
 surface.CreateFont( "DTreeEditorBaseLarge", { font = "Arial Bold", size = 14 } )
@@ -36,9 +35,6 @@ end
 function PANEL:OnWindowStopDragging()
 end
 
-function PANEL:PreAutoRefresh()
-end
-
 function PANEL:HideRow( name, hide )
     if self.rows[name] then
         self.rows[name]:SetVisible( hide )
@@ -53,12 +49,6 @@ function PANEL:HideCategory( name, hide )
     end
 end
 
-
-function PANEL:PostAutoRefresh()
-    self:RebuildControls()
-end
-
-
 function PANEL:Init()
     self.categories = {}
     self.rows = {}
@@ -349,4 +339,4 @@ function PANEL:WindowStopDragging()
 end
 
 
-derma.DefineControl( "DTreeEditorBase", "", PANEL, "DTree" )
+vgui.Register( "DTreeEditorBase", PANEL, "DTree" )
diff --git a/lua/primitive/editor/panels/bitfield.lua b/lua/primitive/editor/panels/bitfield.lua
index edb3c1c..76b1e62 100644
--- a/lua/primitive/editor/panels/bitfield.lua
+++ b/lua/primitive/editor/panels/bitfield.lua
@@ -85,4 +85,4 @@ function PANEL:Setup( editData )
 end
 
 
-derma.DefineControl( "DTreeEditorBase_Bitfield", "", PANEL, "DTreeEditorBase_Generic" )
+vgui.Register( "DTreeEditorBase_Bitfield", PANEL, "DTreeEditorBase_Generic" )
diff --git a/lua/primitive/editor/panels/checkbox.lua b/lua/primitive/editor/panels/checkbox.lua
index 52d9ccc..09c40e8 100644
--- a/lua/primitive/editor/panels/checkbox.lua
+++ b/lua/primitive/editor/panels/checkbox.lua
@@ -35,4 +35,4 @@ function PANEL:Setup( editData )
 end
 
 
-derma.DefineControl( "DTreeEditorBase_Checkbox", "", PANEL, "DTreeEditorBase_Generic" )
+vgui.Register( "DTreeEditorBase_Checkbox", PANEL, "DTreeEditorBase_Generic" )
diff --git a/lua/primitive/editor/panels/combo.lua b/lua/primitive/editor/panels/combo.lua
index c22cbcb..babb584 100644
--- a/lua/primitive/editor/panels/combo.lua
+++ b/lua/primitive/editor/panels/combo.lua
@@ -72,5 +72,4 @@ function PANEL:Setup( editData )
 end
 
 
-derma.DefineControl( "DTreeEditorBase_Combo", "", PANEL, "DTreeEditorBase_Generic" )
-
+vgui.Register( "DTreeEditorBase_Combo", PANEL, "DTreeEditorBase_Generic" )
diff --git a/lua/primitive/editor/panels/generic.lua b/lua/primitive/editor/panels/generic.lua
index 011d42e..0d5bd6b 100644
--- a/lua/primitive/editor/panels/generic.lua
+++ b/lua/primitive/editor/panels/generic.lua
@@ -76,5 +76,4 @@ function PANEL:Setup( editData )
 end
 
 
-derma.DefineControl( "DTreeEditorBase_Generic", "", PANEL, "Panel" )
-
+vgui.Register( "DTreeEditorBase_Generic", PANEL, "Panel" )
diff --git a/lua/primitive/editor/panels/number.lua b/lua/primitive/editor/panels/number.lua
index d13eb12..caf3eab 100644
--- a/lua/primitive/editor/panels/number.lua
+++ b/lua/primitive/editor/panels/number.lua
@@ -79,4 +79,4 @@ function PANEL:Setup( editData )
 end
 
 
-derma.DefineControl( "DTreeEditorBase_Number", "", PANEL, "DTreeEditorBase_Generic" )
+vgui.Register( "DTreeEditorBase_Number", PANEL, "DTreeEditorBase_Generic" )
diff --git a/lua/primitive/editor/panels/tree_node.lua b/lua/primitive/editor/panels/tree_node.lua
index 71af3ab..d17afab 100644
--- a/lua/primitive/editor/panels/tree_node.lua
+++ b/lua/primitive/editor/panels/tree_node.lua
@@ -188,4 +188,4 @@ function PANEL:Setup( editData )
 end
 
 
-derma.DefineControl( "DTreeEditorBase_Node", "", PANEL, "DTree_Node" )
+vgui.Register( "DTreeEditorBase_Node", PANEL, "DTree_Node" )
diff --git a/lua/primitive/editor/panels/tree_node_category.lua b/lua/primitive/editor/panels/tree_node_category.lua
index edd7185..730840f 100644
--- a/lua/primitive/editor/panels/tree_node_category.lua
+++ b/lua/primitive/editor/panels/tree_node_category.lua
@@ -56,7 +56,7 @@ end
 
 
 function PANEL:AddNode( strName )
-    local pNode = DTreeEditorBase_Node.AddNode( self, strName )
+    local pNode = vgui.GetControlTable( "DTreeEditorBase_Node" ).AddNode( self, strName )
 
     if not self.pNodeFirst then
         self.pNodeFirst = pNode
@@ -72,4 +72,4 @@ function PANEL:OnNodeAdded( pNode )
 end
 
 
-derma.DefineControl( "DTreeEditorBase_Category", "", PANEL, "DTree_Node" )
+vgui.Register( "DTreeEditorBase_Category", PANEL, "DTree_Node" )
diff --git a/lua/primitive/editor/panels/vector.lua b/lua/primitive/editor/panels/vector.lua
index 71fe330..6807b79 100644
--- a/lua/primitive/editor/panels/vector.lua
+++ b/lua/primitive/editor/panels/vector.lua
@@ -160,4 +160,4 @@ function PANEL:Setup( editData )
 end
 
 
-derma.DefineControl( "DTreeEditorBase_Vector", "", PANEL, "DTreeEditorBase_Generic" )
+vgui.Register( "DTreeEditorBase_Vector", PANEL, "DTreeEditorBase_Generic" )