diff --git a/lua/plugins/core.lua b/lua/plugins/core.lua
index 0f8f532..c9dd5a0 100644
--- a/lua/plugins/core.lua
+++ b/lua/plugins/core.lua
@@ -14,7 +14,7 @@ return {
   },
   { -- Bufferline
     "akinsho/bufferline.nvim",
-    enabled = data.types.bufferline.enabled,
+    cond = data.types.bufferline.enabled,
     opts = data.types.bufferline.opts,
   },
   { -- Which-Key
diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua
index 08b62e4..7fad713 100644
--- a/lua/plugins/editor.lua
+++ b/lua/plugins/editor.lua
@@ -113,12 +113,12 @@ return {
   },
   { -- Auto Cursorline
     "delphinus/auto-cursorline.nvim",
-    enabled = data.func.check_global_var("auto_cursorline", true, true),
+    cond = data.func.check_global_var("auto_cursorline", true, true),
     opts = data.types.autocursorline,
   },
   { -- Bars N Lines
     "OXY2DEV/bars-N-lines.nvim",
-    enabled = data.types.barsNlines.enabled,
+    cond = data.types.barsNlines.enabled,
     lazy = false,
     config = data.types.barsNlines.config,
   },
diff --git a/lua/plugins/util.lua b/lua/plugins/util.lua
index 5c3b147..cf6bc15 100644
--- a/lua/plugins/util.lua
+++ b/lua/plugins/util.lua
@@ -29,10 +29,10 @@ return {
   },
   { -- Auto-save
     "okuuva/auto-save.nvim",
-    enabled = data.func.check_global_var("auto_save", true, true),
     cmd = data.cmd.autosave,
     event = { "InsertLeave", "TextChanged" },
     opts = data.types.autosave,
+    cond = data.cond.autosave,
   },
   { -- Ripgrep substitute
     "chrisgrieser/nvim-rip-substitute",
@@ -48,7 +48,7 @@ return {
   },
   { -- Codesnap
     "mistricky/codesnap.nvim",
-    enabled = data.func.check_global_var("codesnap", true, true),
+    cond = data.func.check_global_var("codesnap", true, true),
     lazy = true,
     build = "make",
     opts = data.types.codesnap,
@@ -75,7 +75,7 @@ return {
   },
   { -- Music Controls
     "AntonVanAssche/music-controls.nvim",
-    enabled = data.func.check_global_var("usemusic", true, true),
+    cond = data.func.check_global_var("usemusic", true, true),
     dependencies = data.deps.musiccontrols,
     opts = {
       default_player = "YoutubeMusic",
@@ -107,7 +107,7 @@ return {
   },
   { -- Encourage
     "r-cha/encourage.nvim",
-    enabled = data.func.check_global_var("encourage", true, true),
+    cond = data.func.check_global_var("encourage", true, true),
     config = true,
   },
   { -- Helpview