diff --git a/core/core-ui.el b/core/core-ui.el
index 3a6ad4057..8c37afb96 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -13,7 +13,7 @@
 ;;;; GUI Settings ;;;;;;;;;;;;;;;;;;;;;;
 (tooltip-mode -1)
 (blink-cursor-mode 1)        ; blink cursor
-;; (global-hl-line-mode 1)   ; highlight line
+(global-hl-line-mode 1)      ; highlight line
 
 (setq linum-format " %3d")
 
@@ -37,11 +37,7 @@
 (when (functionp 'menu-bar-mode)   (menu-bar-mode -1))      ; no menubar
 (when (fboundp 'fringe-mode) (fringe-mode '(5 . 10)))       ; no nonsense
 
-(when window-system
-  (setq frame-title-format '(buffer-file-name "%f" ("%b")))
-  (tooltip-mode -1)
-  (blink-cursor-mode 1))
-
+(when window-system (setq frame-title-format '(buffer-file-name "%f" ("%b"))))
 
 ;;;; Modeline ;;;;;;;;;;;;;;;;;;;;;;;;;;
 (use-package uniquify
diff --git a/init/init-yasnippet.el b/init/init-yasnippet.el
index 0816a941c..9d2fe64da 100644
--- a/init/init-yasnippet.el
+++ b/init/init-yasnippet.el
@@ -151,10 +151,11 @@
           "C-a"        'my/yas-goto-start-of-field
           "<M-right>"  'my/yas-goto-end-of-field
           "<M-left>"   'my/yas-goto-start-of-field
+          "<S-tab>"    'yas-prev-field
           "<M-backspace>" 'my/yas-clear-to-sof
 
           [backspace]  'my/yas-backspace
-          "<delete>" 'my/yas-delete)))
+          "<delete>"   'my/yas-delete)))
 
 
 (provide 'init-yasnippet)