diff --git a/lua/ada_mode.lua b/lua/ada_mode.lua
index d2e6c1d..9b85e1b 100644
--- a/lua/ada_mode.lua
+++ b/lua/ada_mode.lua
@@ -7,7 +7,7 @@ end
 -- @param
 -- @short Verify installation of ada tools or install them.
 local function setup_ada()
-	vim.keymap.set("n", "<leader>cb", ":!gnatpp %<cr>")
+	vim.keymap.set("n", "<leader>kk", ":!gnatpp %<cr>")
 	vim.opt.tabstop = 3
 	vim.opt.shiftwidth = 3
 end
@@ -30,3 +30,19 @@ vim.api.nvim_create_autocmd({ "BufLeave" }, {
 	pattern = { "*.adb", "*.ads" },
 	callback = leave_ada,
 })
+
+-- @name format_file
+-- @param
+-- @short Run gnatpp as formatter on the current file.
+local function format_file()
+	vim.cmd("checktime %")
+	local write_cmd = "gnatpp " .. vim.api.nvim_buf_get_name(0)
+	os.execute(write_cmd)
+	vim.cmd("checktime %")
+end
+
+-- Add formatter command
+vim.api.nvim_create_autocmd({ "BufWritePost" }, {
+	pattern = { "*.adb", "*.ads" },
+	callback = format_file,
+})
diff --git a/lua/plugconfig.lua b/lua/plugconfig.lua
index ac05081..8669a0b 100644
--- a/lua/plugconfig.lua
+++ b/lua/plugconfig.lua
@@ -23,7 +23,7 @@ require("lspconfiguration")
 require("pascal_mode")
 
 -- Ada mode (supported by plugins)
--- require("ada_mode")
+require("ada_mode")
 
 -- Misc configuration
 if vim == nil then
diff --git a/lua/screenkeyconfig.lua b/lua/screenkeyconfig.lua
index 47659fb..190b7c9 100644
--- a/lua/screenkeyconfig.lua
+++ b/lua/screenkeyconfig.lua
@@ -62,4 +62,4 @@ require("screenkey").setup({
 	},
 })
 
-vim.keymap.set("n", "<leader>kk", ":Screenkey<CR>")
+-- vim.keymap.set("n", "<leader>kk", ":Screenkey<CR>")