diff --git a/.config/i3/config b/.config/i3/config
index 749ceee..12c70d4 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -17,7 +17,8 @@ default_floating_border pixel 1
 set $mod Mod4 
 bindsym $mod+F12  restart;reload
 bindsym $mod+Escape exec i3lock -c 000000 & sleep 2 && systemctl suspend
-bindsym $mod+Shift+Escape exec i3lock -c 000000 & sleep 2 && xset dpms force off
+bindsym $mod+Shift+Escape exec systemctl poweroff
+#bindsym $mod+Shift+Escape exec i3lock -c 000000 & sleep 2 && xset dpms force off
 
 
 # Use Mouse+$mod to drag floating windows to their wanted position
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 6fde757..911c91a 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,16 +1,8 @@
 require("plugins")
 require("keybinds")
---- Functional wrapper for mapping custom keybindings
---- GENERAL SETTINGS
-function map(mode, lhs, rhs, opts)
-    local options = { noremap = true }
-    if opts then
-        options = vim.tbl_extend("force", options, opts)
-    end
-    vim.api.nvim_set_keymap(mode, lhs, rhs, options)
-end
-map("i","<C-c>","<Esc>")
 
+--- GENERAL SETTINGS
+ 
 vim.o.termguicolors = true
 vim.cmd('colorscheme monokai') -- set colorscheme
 vim.o.syntax = 'on'
diff --git a/.config/nvim/lua/keybinds.lua b/.config/nvim/lua/keybinds.lua
index 1991f58..83f5016 100644
--- a/.config/nvim/lua/keybinds.lua
+++ b/.config/nvim/lua/keybinds.lua
@@ -1,4 +1,5 @@
 -- filetype-specific keybinds can be found in the ftplugin folder, requires 'filetype plugin on'
+-- Functional wrapper for mapping custom keybindings
 function map(mode, lhs, rhs, opts)
     local options = { noremap = true }
     if opts then
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 78ac519..50c3be2 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -18,6 +18,8 @@ packer.startup(function()
   local use = use
   use 'neovim/nvim-lspconfig'
   use 'nvim-treesitter/nvim-treesitter'
+  use 'kylechui/nvim-surround'
+  -- use nvim-leap
   end
 )
 --[[ PLUGIN CONFIGURATION
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index 1a8f3e9..4ee0f4a 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -34,7 +34,7 @@ configuration {
 /*	auto-select: false;*/
 /*	parse-hosts: false;*/
 /*	parse-known-hosts: true;*/
-	combi-modes: "window,drun,ssh";
+	combi-modes: "drun,window,ssh";
 /*	matching: "normal";*/
 /*	tokenize: true;*/
 /*	m: "-5";*/