diff --git a/dots/.config/nvim/after/ftplugin/sql.lua b/dots/.config/nvim/after/ftplugin/sql.lua
index cb4775fb..ec842450 100644
--- a/dots/.config/nvim/after/ftplugin/sql.lua
+++ b/dots/.config/nvim/after/ftplugin/sql.lua
@@ -1 +1,2 @@
 vim.opt_local.commentstring = "-- %s"
+vim.opt_local.shiftwidth = 2
diff --git a/dots/.config/nvim/lua/plugins/configs/formatter.lua b/dots/.config/nvim/lua/plugins/configs/formatter.lua
index a3673fef..90993624 100644
--- a/dots/.config/nvim/lua/plugins/configs/formatter.lua
+++ b/dots/.config/nvim/lua/plugins/configs/formatter.lua
@@ -25,7 +25,7 @@ return {
                     markdown = filetypes.markdown.prettierd,
                     css = filetypes.css.prettierd,
                     lua = filetypes.lua.stylua,
-                    psql = function ()
+                    sql = function ()
                         return {
                             exe = "sql-formatter",
                             args = {
@@ -35,14 +35,6 @@ return {
                             },
                         }
                     end,
-                    sql = function ()
-                        return {
-                            exe = "sql-formatter",
-                            args = {
-                                "--fix",
-                            },
-                        }
-                    end,
                     asm = function()
                         return {
                             exe = "asmfmt",
diff --git a/dots/.config/nvim/lua/plugins/configs/org-mode.lua b/dots/.config/nvim/lua/plugins/configs/org-mode.lua
index c133094c..88f0e20e 100644
--- a/dots/.config/nvim/lua/plugins/configs/org-mode.lua
+++ b/dots/.config/nvim/lua/plugins/configs/org-mode.lua
@@ -45,7 +45,7 @@ return {
                     },
                     j = {
                         description = "Journal",
-                        template = "\n** %U           :journal:\n\n%?",
+                        template = "\n* %? %U    :journal:",
                         target = "~/Notes/journal/%<%Y-%m-%d>.org"
                     },
                 },