diff --git a/lua/core/keys.lua b/lua/core/keys.lua
index 4f8357d..c39c0c7 100644
--- a/lua/core/keys.lua
+++ b/lua/core/keys.lua
@@ -23,5 +23,7 @@ map("n", "<leader>h", ":noh<CR>")
 map("v", "<leader>r", "\"hy:%s/<C-r>h//g<left><left>")
 
 -- Neovide
-map("n", "<C-+>", ":lua vim.g.neovide_scale_factor = math.min(vim.g.neovide_scale_factor + 0.1, 1.0)<CR>")
-map("n", "<C-_>", ":lua vim.g.neovide_scale_factor = math.max(vim.g.neovide_scale_factor - 0.1, 0.1)<CR>")
+if vim.g.neovide == true then
+    map("n", "<C-+>", ":lua vim.g.neovide_scale_factor = math.min(vim.g.neovide_scale_factor + 0.1, 1.0)<CR>")
+    map("n", "<C-_>", ":lua vim.g.neovide_scale_factor = math.max(vim.g.neovide_scale_factor - 0.1, 0.1)<CR>")
+end
diff --git a/lua/core/settings.lua b/lua/core/settings.lua
index 873bbf1..543da40 100644
--- a/lua/core/settings.lua
+++ b/lua/core/settings.lua
@@ -45,16 +45,20 @@ vim.cmd([[highlight Normal ctermbg=none]])
 vim.cmd([[highlight NonText ctermbg=none]])
 
 -- Code Folding
-opt.foldmethod = "expr"
-opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
-opt.foldcolumn = "0"
-opt.foldtext = ""
+opt.foldmethod = "syntax"
 opt.foldlevel = 99
-opt.foldlevelstart = 1
 
 -- Neovide
 if g.neovide == true then
     g.neovide_transparency = 0.7
     g.neovide_scale_factor = 0.5
+
+    -- Disable animations
+    g.neovide_position_animation_length = 0
+    g.neovide_cursor_animation_length = 0.00
     g.neovide_cursor_trail_size = 0
+    g.neovide_cursor_animate_in_insert_mode = false
+    g.neovide_cursor_animate_command_line = false
+    g.neovide_scroll_animation_far_lines = 0
+    g.neovide_scroll_animation_length = 0.00
 end