diff --git a/CameraSettings.lua b/CameraSettings.lua
index 57a4f43..07a6de4 100644
--- a/CameraSettings.lua
+++ b/CameraSettings.lua
@@ -23,14 +23,14 @@ function shared.CameraSettings.Init()
 	frame:RegisterEvent("PLAYER_LOGIN")
 	frame:RegisterEvent("PLAYER_ENTERING_WORLD")
 	frame:SetScript("OnEvent", function(self, event, ...)
-		SetCameraSpeed(CykaPersistentData.config.camera.speed)
+		SetCameraSpeed(shared.config.camera.speed)
 	end)
 
 	SlashCmdList["CAMERASETTINGS"] = function(speed)
-		if speed then CykaPersistentData.config.camera.speed = speed end
-		SetCameraSpeed(CykaPersistentData.config.camera.speed)
+		if speed then shared.config.camera.speed = speed end
+		SetCameraSpeed(shared.config.camera.speed)
 	end
 	SLASH_CAMERASETTINGS1 = "/cs"
 
-	print("Cyka - Autoloot loaded")
+	print("Cyka - Camera settings loaded")
 end
diff --git a/Cyka.lua b/Cyka.lua
index a3663dd..df08d41 100644
--- a/Cyka.lua
+++ b/Cyka.lua
@@ -101,6 +101,14 @@ local function init()
     end
 
     shared.config = {
+        camera = {
+            enabled = shared.GetOrDefault(CykaPersistentData.config, { "camera", "enabled" }, true),
+            speed = shared.GetOrDefault(CykaPersistentData.config, { "camera", "speed" }, 30),
+        },
+        spellQueue = {
+            enabled = shared.GetOrDefault(CykaPersistentData.config, { "spellQueue", "enabled" }, true),
+            queue = shared.GetOrDefault(CykaPersistentData.config, { "spellQueue", "queue" }, 1),
+        },
         autoloot = {
             enabled = shared.GetOrDefault(CykaPersistentData.config, { "autoloot", "enabled" }, true),
             filter = {
@@ -157,6 +165,10 @@ local function init()
         }
     }
 
+    shared.Autoloot.Init()
+    shared.CameraSettings.Init()
+    shared.SpellQSettings.Init()
+
     print("Cyka loaded!")
 end
 
@@ -167,3 +179,9 @@ loadedFrame:SetScript("OnEvent", function(self, event, addonName)
         init()
     end
 end)
+
+local logoutFrame = CreateFrame("Frame")
+logoutFrame:RegisterEvent("PLAYER_LOGOUT")
+logoutFrame:SetScript("OnEvent", function(self, event, ...)
+    CykaPersistentData.config = shared.config
+end)
diff --git a/SpellQSettings.lua b/SpellQSettings.lua
index 83b8094..6e85c2f 100644
--- a/SpellQSettings.lua
+++ b/SpellQSettings.lua
@@ -22,14 +22,14 @@ function shared.SpellQSettings.Init()
 	frame:RegisterEvent("PLAYER_LOGIN")
 	frame:RegisterEvent("PLAYER_ENTERING_WORLD")
 	frame:SetScript("OnEvent", function(self, event, ...)
-		SetSpellQueue(CykaPersistentData.config.spellQueue.queue)
+		SetSpellQueue(shared.config.spellQueue.queue)
 	end)
 
 	SlashCmdList["SPELLQSETTINGS"] = function(window)
-		if window then CykaPersistentData.config.spellQueue.queue = window end
-		SetSpellQueue(CykaPersistentData.config.spellQueue.queue)
+		if window then shared.config.spellQueue.queue = window end
+		SetSpellQueue(shared.config.spellQueue.queue)
 	end
 	SLASH_SPELLQSETTINGS1 = "/sq"
 
-	print("Cyka - Autoloot loaded")
+	print("Cyka - Spell queue settings loaded")
 end