diff --git a/Lib/LibGPIOptions.lua b/Lib/LibGPIOptions.lua
index 92b8c90..47829d9 100644
--- a/Lib/LibGPIOptions.lua
+++ b/Lib/LibGPIOptions.lua
@@ -1,6 +1,7 @@
 local TOCNAME,Addon = ...
 Addon.Options=Addon.Options or {}
 local Options=Addon.Options
+local category, layout
 
 local function Options_CheckButtonRightClick(self,button)
 	if button=="RightButton" then
@@ -134,10 +135,12 @@ function Options.AddPanel(Title,noheader,scrollable)
 	else
 		Options.Panel[c].parent = Options.Panel[1].name
 	end
-	
-	InterfaceOptions_AddCategory(Options.Panel[c])
-	Options.CurrentPanel=Options.Panel[c]		
-	
+
+	category, layout = Settings.RegisterCanvasLayoutCategory(Options.Panel[c], Options.Panel[c].name, Options.Panel[c].name)
+	category.ID = Options.Panel[c].name
+	Settings.RegisterAddOnCategory(category)
+	Options.CurrentPanel=Options.Panel[c]
+
 	if scrollable then
 		
 		Options.Panel["scroll"..c]=CreateFrame("ScrollFrame", FrameName.."Scroll", Options.CurrentPanel,"UIPanelScrollFrameTemplate")
diff --git a/RollTrackerClassicZ_Wrath.toc b/RollTrackerClassicZ_Cata.toc
similarity index 68%
rename from RollTrackerClassicZ_Wrath.toc
rename to RollTrackerClassicZ_Cata.toc
index 08b402c..afd6629 100644
--- a/RollTrackerClassicZ_Wrath.toc
+++ b/RollTrackerClassicZ_Cata.toc
@@ -1,8 +1,8 @@
-## Interface: 30403
+## Interface: 40400, 40401
 ## Title: RollTracker Classic Z
 ## Notes: Keeps tracks of /rolls, loot and more
-## Version: 1.2.3-alpha-1
-## Author: GPI / Erytheia-Razorfen / Zolerii / Roadblock
+## Version: 2.0.0
+## Author: GPI / Erytheia-Razorfen / Zolerii / Roadblock / Dosmod
 ## DefaultState: enabled
 ## SavedVariables: RollTrackerClassicZDB,RollTrackerClassicZLoot