diff --git a/Config/Config.qml b/Config/Config.qml
index 859217b..4563c6d 100644
--- a/Config/Config.qml
+++ b/Config/Config.qml
@@ -129,6 +129,7 @@ Singleton {
 				schemeGeneration: general.color.schemeGeneration,
 				scheduleDarkStart: general.color.scheduleDarkStart,
 				scheduleDarkEnd: general.color.scheduleDarkEnd
+				neovimColors: general.color.neovimColors
 			},
 			apps: {
 				terminal: general.apps.terminal,
diff --git a/Config/General.qml b/Config/General.qml
index 78531e4..2633bf8 100644
--- a/Config/General.qml
+++ b/Config/General.qml
@@ -14,6 +14,7 @@ JsonObject {
 		property string mode: "dark"
 		property int scheduleDarkStart: 0
 		property int scheduleDarkEnd: 0
+		property bool neovimColors: false
 	}
 
     component Apps: JsonObject {
diff --git a/Helpers/ModeScheduler.qml b/Helpers/ModeScheduler.qml
index 36041e5..bab9bf6 100644
--- a/Helpers/ModeScheduler.qml
+++ b/Helpers/ModeScheduler.qml
@@ -47,12 +47,14 @@ Singleton {
 
 		Quickshell.execDetached(["sh", "-c", `sed -i 's/color_scheme_path=\\(.*\\)Light.colors/color_scheme_path=\\1Dark.colors/' ${Paths.home}/.config/qt6ct/qt6ct.conf`])
 
+		Quickshell.execDetached(["sed", "-i", "'s/\\(vim.cmd.colorscheme \\).*/\\1\"tokyodark\"/'", "~/.config/nvim/lua/config/load-colorscheme.lua"])
+
 		if( Config.general.color.wallust )
 			Wallust.generateColors(WallpaperPath.currentWallpaperPath);
 	}
 
 	function applyLightMode() {
-		if ( Config.general.color.schemeGeneration ) {
+		if ( Config.general.color.neovimColors ) {
 			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--image-path", `${WallpaperPath.currentWallpaperPath}`, "--thumbnail-path", `${Paths.cache}/imagecache/thumbnail.jpg`, "--output", `${Paths.state}/scheme.json`, "--scheme", `${Config.colors.schemeType}`, "--mode", "light"]);
 		} else {
 			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--preset", `${DynamicColors.scheme}:${DynamicColors.flavour}`, "--output", `${Paths.state}/scheme.json`, "--mode", "light"]);
@@ -64,6 +66,9 @@ Singleton {
 
 		Quickshell.execDetached(["sh", "-c", `sed -i 's/color_scheme_path=\\(.*\\)Dark.colors/color_scheme_path=\\1Light.colors/' ${Paths.home}/.config/qt6ct/qt6ct.conf`])
 
+		if ( Config.general.color.neovimColors )
+			Quickshell.execDetached(["sed", "-i", "'s/\\(vim.cmd.colorscheme \\).*/\\1\"onelight\"/'", "~/.config/nvim/lua/config/load-colorscheme.lua"])
+
 		if( Config.general.color.wallust )
 			Wallust.generateColors(WallpaperPath.currentWallpaperPath);
 	}