diff --git a/linux/.config/nvim/lua/plugins/conform.lua b/linux/.config/nvim/lua/plugins/conform.lua
index 77e90d8..7b18965 100644
--- a/linux/.config/nvim/lua/plugins/conform.lua
+++ b/linux/.config/nvim/lua/plugins/conform.lua
@@ -6,11 +6,16 @@ return {
         python = { "ruff_format", "ruff_fix" },
         javascript = { "biome" },
         typescript = { "biome" },
+        javascriptreact = { "biome" },
+        typescriptreact = { "biome" },
         json = { "biome" },
-        jsx = { "biome" },
         sh = { "shfmt" },
         ['*'] = { 'trim_whitespace', 'codespell' },
       },
+    format_on_save = {
+      timeout_ms = 500,
+      lsp_fallback = true,
+    },
   },
   lazy = false,
 }
diff --git a/linux/.config/nvim/lua/plugins/lsp.lua b/linux/.config/nvim/lua/plugins/lsp.lua
index 43cbd47..71dfdae 100644
--- a/linux/.config/nvim/lua/plugins/lsp.lua
+++ b/linux/.config/nvim/lua/plugins/lsp.lua
@@ -44,7 +44,7 @@ local config = function()
     -- nvim-lint
     vim.keymap.set("n", "<leader>li", function() require("lint").try_lint() end, opts)
     -- conform
-    vim.keymap.set("n", "<leader>ff", function() require("conform").format({ bufnr = bufnr }) end, opts)
+    vim.keymap.set("n", "<leader>fr", function() require("conform").format({ bufnr = bufnr }) end, opts)
   end)
 
   lsp_zero.set_sign_icons({