diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 53b5df2..1909754 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -340,7 +340,7 @@ globalkeys = awful.util.table.join(
     -- Prompt
     awful.key({ modkey },            "r",     function () mypromptbox[mouse.screen]:run() end),
 
-    awful.key({ modkey }, "x",
+    awful.key({ modkey, "Shift" }, "x",
               function ()
                   awful.prompt.run({ prompt = "Run Lua code: " },
                   mypromptbox[mouse.screen].widget,
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index b287f98..3ad808c 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -8,6 +8,13 @@
 (add-to-list 'load-path "~/.emacs.d/tabbar")
 (add-to-list 'load-path "~/.emacs.d/evil")
 
+(require 'package)
+(when (< emacs-major-version 24)
+  (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/")))
+(add-to-list 'package-archives
+             '("melpa" . "http://melpa.milkbox.net/packages/") t)
+(package-initialize)
+
 
 (fset 'yes-or-no-p 'y-or-n-p)
 
@@ -22,7 +29,9 @@
 (require 'tabbar)
 ;(require 'highlight-symbol)
 (require 'auto-complete-config)
+(require 'cl)
 (evil-mode 1)
+(eval-after-load 'flymake '(require 'flymake-cursor))
 
 
 ;; Hack to get *Messages* in viper-mode.
@@ -86,6 +95,9 @@
 ;(vimpulse-map "gK" 'kill-buffer-and-window)
 ;(vimpulse-map "gc" 'kill-buffer-and-window)
 ;(define-key viper-insert-global-user-map "\C-d" 'delete-char))
+(define-key evil-normal-state-map "gn" 'tabbar-forward-tab)
+(define-key evil-normal-state-map "gp" 'tabbar-backward-tab)
+(define-key evil-normal-state-map "gc" 'kill-buffer-and-window)
 
 (add-hook 'window-setup-hook 'delete-other-windows)
 
diff --git a/.vimrc b/.vimrc
index aa57ab8..86a0769 100644
--- a/.vimrc
+++ b/.vimrc
@@ -142,6 +142,7 @@ let g:buftabs_only_basename = 1
 let g:bufferline_echo = 0
 let g:bufferline_modified = '+'
 let g:bufferline_show_bufnr = 1
+let g:bufferline_rotate = 1
 
 " * NERDTree
 let g:NERDChristmasTree = 1