diff --git a/lua/plugins/nvim-dap.lua b/lua/plugins/nvim-dap.lua
index c77c6e5..e94f6f7 100644
--- a/lua/plugins/nvim-dap.lua
+++ b/lua/plugins/nvim-dap.lua
@@ -21,11 +21,20 @@ return {
       local dap = require 'dap'
       local dapui = require 'dapui'
       return {
-        -- Basic debugging keymaps, feel free to change to your liking!
         { '<F5>', dap.continue, desc = 'Debug: Start/Continue' },
+        { '<leader>ds', dap.continue, desc = 'Debug: [S]tart/Continue' },
+        { '<S-F5>', dap.terminate, desc = 'Debug: Terminate' },
+        { '<F17>', dap.terminate, desc = 'Debug: Terminate' },
+        { '<leader>dT', dap.terminate, desc = 'Debug: [T]erminate' },
+
         { '<F7>', dap.step_into, desc = 'Debug: Step Into' },
         { '<F8>', dap.step_over, desc = 'Debug: Step Over' },
         { '<S-F8>', dap.step_out, desc = 'Debug: Step Out' },
+
+        { '<leader>dt', dapui.toggle, desc = 'Debug: [T]oggle Debug UI' },
+        { '<F6>', dapui.toggle, desc = 'Debug: Toggle Debug UI' },
+
+        -- Breakpoints
         { '<leader>db', dap.toggle_breakpoint, desc = 'Toggle [B]reakpoint' },
         {
           '<leader>dB',
@@ -34,8 +43,6 @@ return {
           end,
           desc = 'Set [B]reakpoint',
         },
-        -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
-        { '<F6>', dapui.toggle, desc = 'Debug: See last session result.' },
         { '<leader>dc', dap.clear_breakpoints, desc = '[C]lear All Breakpoints' },
         {
           '<leader>dl',
@@ -44,6 +51,7 @@ return {
           end,
           desc = '[L]ist Breakpoints',
         },
+
         unpack(keys),
       }
     end,
@@ -92,8 +100,8 @@ return {
       }
 
       dap.listeners.after.event_initialized['dapui_config'] = dapui.open
-      dap.listeners.before.event_terminated['dapui_config'] = dapui.close
-      dap.listeners.before.event_exited['dapui_config'] = dapui.close
+      --dap.listeners.before.event_terminated['dapui_config'] = dapui.close
+      --dap.listeners.before.event_exited['dapui_config'] = dapui.close
 
       -- Install golang specific config
       --require('dap-go').setup {