diff --git a/lua/tanktracktool/client/derma/editor/controls/array.lua b/lua/tanktracktool/client/derma/editor/controls/array.lua
index 4207d69..1d9f117 100644
--- a/lua/tanktracktool/client/derma/editor/controls/array.lua
+++ b/lua/tanktracktool/client/derma/editor/controls/array.lua
@@ -76,5 +76,5 @@ function PANEL:Setup( editData )
     end
 end
 
-derma.DefineControl( "tanktracktoolEditor_Array", "", PANEL, "tanktracktoolEditor_Generic" )
+vgui.Register( "tanktracktoolEditor_Array", PANEL, "tanktracktoolEditor_Generic" )
 
diff --git a/lua/tanktracktool/client/derma/editor/controls/bitfield.lua b/lua/tanktracktool/client/derma/editor/controls/bitfield.lua
index d09c067..8db552a 100644
--- a/lua/tanktracktool/client/derma/editor/controls/bitfield.lua
+++ b/lua/tanktracktool/client/derma/editor/controls/bitfield.lua
@@ -84,4 +84,4 @@ function PANEL:Setup( editData )
     self:GetRow().nonvar = true
 end
 
-derma.DefineControl( "tanktracktoolEditor_Bitfield", "", PANEL, "tanktracktoolEditor_Generic" )
+vgui.Register( "tanktracktoolEditor_Bitfield", PANEL, "tanktracktoolEditor_Generic" )
diff --git a/lua/tanktracktool/client/derma/editor/controls/checkbox.lua b/lua/tanktracktool/client/derma/editor/controls/checkbox.lua
index b404ba0..da3cf51 100644
--- a/lua/tanktracktool/client/derma/editor/controls/checkbox.lua
+++ b/lua/tanktracktool/client/derma/editor/controls/checkbox.lua
@@ -33,4 +33,4 @@ function PANEL:Setup( editData )
     end
 end
 
-derma.DefineControl( "tanktracktoolEditor_Checkbox", "", PANEL, "tanktracktoolEditor_Generic" )
+vgui.Register( "tanktracktoolEditor_Checkbox", PANEL, "tanktracktoolEditor_Generic" )
diff --git a/lua/tanktracktool/client/derma/editor/controls/color.lua b/lua/tanktracktool/client/derma/editor/controls/color.lua
index 25d7e46..9952747 100644
--- a/lua/tanktracktool/client/derma/editor/controls/color.lua
+++ b/lua/tanktracktool/client/derma/editor/controls/color.lua
@@ -158,4 +158,4 @@ function PANEL:Setup( editData )
     end
 end
 
-derma.DefineControl( "tanktracktoolEditor_Color", "", PANEL, "tanktracktoolEditor_Generic" )
+vgui.Register( "tanktracktoolEditor_Color", PANEL, "tanktracktoolEditor_Generic" )
diff --git a/lua/tanktracktool/client/derma/editor/controls/combo.lua b/lua/tanktracktool/client/derma/editor/controls/combo.lua
index a6e684c..ea0401e 100644
--- a/lua/tanktracktool/client/derma/editor/controls/combo.lua
+++ b/lua/tanktracktool/client/derma/editor/controls/combo.lua
@@ -198,5 +198,5 @@ function PANEL:Setup( editData )
     end
 end
 
-derma.DefineControl( "tanktracktoolEditor_Combo", "", PANEL, "tanktracktoolEditor_Generic" )
+vgui.Register( "tanktracktoolEditor_Combo", PANEL, "tanktracktoolEditor_Generic" )
 
diff --git a/lua/tanktracktool/client/derma/editor/controls/generic.lua b/lua/tanktracktool/client/derma/editor/controls/generic.lua
index 4d0d300..b583863 100644
--- a/lua/tanktracktool/client/derma/editor/controls/generic.lua
+++ b/lua/tanktracktool/client/derma/editor/controls/generic.lua
@@ -78,5 +78,5 @@ function PANEL:Setup( editData )
     end
 end
 
-derma.DefineControl( "tanktracktoolEditor_Generic", "", PANEL, "Panel" )
+vgui.Register( "tanktracktoolEditor_Generic", PANEL, "Panel" )
 
diff --git a/lua/tanktracktool/client/derma/editor/controls/instance.lua b/lua/tanktracktool/client/derma/editor/controls/instance.lua
index 5839683..58c0d04 100644
--- a/lua/tanktracktool/client/derma/editor/controls/instance.lua
+++ b/lua/tanktracktool/client/derma/editor/controls/instance.lua
@@ -152,4 +152,4 @@ end
 
 
 
-derma.DefineControl( "tanktracktoolEditor_Instance", "", PANEL, "tanktracktoolEditor_Generic" )
+vgui.Register( "tanktracktoolEditor_Instance", PANEL, "tanktracktoolEditor_Generic" )
diff --git a/lua/tanktracktool/client/derma/editor/controls/number.lua b/lua/tanktracktool/client/derma/editor/controls/number.lua
index 7f1cd7f..bb3fded 100644
--- a/lua/tanktracktool/client/derma/editor/controls/number.lua
+++ b/lua/tanktracktool/client/derma/editor/controls/number.lua
@@ -82,4 +82,4 @@ function PANEL:Setup( editData )
     end
 end
 
-derma.DefineControl( "tanktracktoolEditor_Number", "", PANEL, "tanktracktoolEditor_Generic" )
+vgui.Register( "tanktracktoolEditor_Number", PANEL, "tanktracktoolEditor_Generic" )
diff --git a/lua/tanktracktool/client/derma/editor/controls/vector.lua b/lua/tanktracktool/client/derma/editor/controls/vector.lua
index 0bab229..60ec229 100644
--- a/lua/tanktracktool/client/derma/editor/controls/vector.lua
+++ b/lua/tanktracktool/client/derma/editor/controls/vector.lua
@@ -165,4 +165,4 @@ function PANEL:Setup( editData )
     end
 end
 
-derma.DefineControl( "tanktracktoolEditor_Vector", "", PANEL, "tanktracktoolEditor_Generic" )
+vgui.Register( "tanktracktoolEditor_Vector", PANEL, "tanktracktoolEditor_Generic" )
diff --git a/lua/tanktracktool/client/derma/editor/editor.lua b/lua/tanktracktool/client/derma/editor/editor.lua
index ae82adc..31e0a60 100644
--- a/lua/tanktracktool/client/derma/editor/editor.lua
+++ b/lua/tanktracktool/client/derma/editor/editor.lua
@@ -68,7 +68,6 @@ tanktracktool.render.overlay = cv_overlay:GetBool()
 ]]
 
 local PANEL = {}
-PANEL.AllowAutoRefresh = true
 
 function PANEL:GetEditorSkin()
     return editor.skin
@@ -84,13 +83,6 @@ end
 function PANEL:OnWindowStopDragging()
 end
 
-function PANEL:PreAutoRefresh()
-end
-
-function PANEL:PostAutoRefresh()
-    self:RebuildControls()
-end
-
 function PANEL:Init()
     self:DockMargin( 0, 3, 0, 3 )
     self.RootNode:DockMargin( 0, 0, 0, 0 )
@@ -394,4 +386,4 @@ function PANEL:WindowStopDragging()
     self:OnWindowStopDragging()
 end
 
-derma.DefineControl( "tanktracktoolEditor", "", PANEL, "DTree" )
+vgui.Register( "tanktracktoolEditor", PANEL, "DTree" )
diff --git a/lua/tanktracktool/client/derma/editor/node.lua b/lua/tanktracktool/client/derma/editor/node.lua
index c92c17f..e230103 100644
--- a/lua/tanktracktool/client/derma/editor/node.lua
+++ b/lua/tanktracktool/client/derma/editor/node.lua
@@ -169,4 +169,4 @@ function PANEL:Setup( editData )
     self.Inner.m_Editor = self.m_Editor
 end
 
-derma.DefineControl( "tanktracktoolEditor_Node", "", PANEL, "DTree_Node" )
+vgui.Register( "tanktracktoolEditor_Node", PANEL, "DTree_Node" )
diff --git a/lua/tanktracktool/client/derma/editor/node_category.lua b/lua/tanktracktool/client/derma/editor/node_category.lua
index 5db872e..e2a5e13 100644
--- a/lua/tanktracktool/client/derma/editor/node_category.lua
+++ b/lua/tanktracktool/client/derma/editor/node_category.lua
@@ -48,7 +48,7 @@ function PANEL:Paint( w, h )
 end
 
 function PANEL:AddNode( strName )
-    local pNode = tanktracktoolEditor_Node.AddNode( self, strName )
+    local pNode = vgui.GetControlTable( "tanktracktoolEditor_Node" ).AddNode( self, strName )
 
     if not self.pNodeFirst then
         self.pNodeFirst = pNode
@@ -62,4 +62,4 @@ function PANEL:OnNodeAdded( pNode )
     self:GetRoot():OnNodeAdded( pNode )
 end
 
-derma.DefineControl( "tanktracktoolEditor_Category", "", PANEL, "DTree_Node" )
+vgui.Register( "tanktracktoolEditor_Category", PANEL, "DTree_Node" )