diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 799dfc1..a242c5a 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -27,6 +27,7 @@
 (setq viper-search-wrap-around t) 
 (setq viper-no-multiple-ESC t)
 (setq viper-translate-all-ESC-keysequences nil)
+(setq viper-always t)
 (setq viper-vi-style-in-minibuffer nil)
 ;(define-key ac-completing-map "\t" 'ac-fuzzy-complete)
 ;(define-key ac-completing-map "\r" nil)
@@ -69,12 +70,13 @@
 (vimpulse-map "gw" 'vimpulse-search-forward-for-symbol-at-point)
 (vimpulse-map "gK" 'kill-buffer-and-window)
 ;(define-key viper-insert-global-user-map "\C-d" 'delete-char))
+
 (add-hook 'window-setup-hook 'delete-other-windows)
 
 ; Basic frame defaults
 (let ((background-color "#2F2F2F")
       (foreground-color "LightGrey")
-      (fname "Deja Vu Sans Mono-15")
+      (fname "Inconsolata-15")
       (fheight 45)
       (fwidth 115))
      
@@ -89,15 +91,11 @@
 )
 (custom-set-variables '(inhibit-startup-screen t))
 (custom-set-faces)
-
 ; Run color-theme
 (color-theme-initialize)
-;(require 'color-theme-barak)
-
 (color-theme-barak)
+(color-theme-barak-extras)
 
-;
-;(defun my-emacs-startup-hook () (my-close-scratch)) (add-hook 'emacs-startup-hook 'my-emacs-startup-hook)
 (defadvice viper-maybe-checkout (around viper-svn-checkin-fix activate)
 "Advise viper-maybe-checkout to ignore svn files."
 (let ((file (expand-file-name (buffer-file-name buf))))
diff --git a/.emacs.d/themes/color-theme-barak.el b/.emacs.d/themes/color-theme-barak.el
index f3f173d..e5ea0f7 100644
--- a/.emacs.d/themes/color-theme-barak.el
+++ b/.emacs.d/themes/color-theme-barak.el
@@ -1,15 +1,16 @@
+
 (defun color-theme-barak ()
   "Color theme by Barak Michener, created 08-11-2010"
   (interactive)
   (color-theme-install
    '(color-theme-barak
-     ((background-color . "black")
+     ((background-color . "#000000")
       (background-mode . dark)
-      (border-color . "black")
+      (border-color . "#000000")
       (cursor-color . "#A7A7A7")
       (foreground-color . "#E0E0E0")
       (mouse-color . "sienna1"))
-     (default ((t (:background "black" :foreground "#E0E0E0"))))
+     (default ((t (:background "#000000" :foreground "#E0E0E0"))))
      (blue ((t (:foreground "blue"))))
      (bold ((t (:bold t))))
      (bold-italic ((t (:bold t))))
@@ -23,10 +24,8 @@
      (font-lock-keyword-face ((t (:bold t :foreground "#4876FF"))))
      (font-lock-preprocessor-face ((t (:foreground "#E9DFEF"))))
      (font-lock-reference-face ((t (:foreground "#E1634F"))))
-
      (font-lock-regexp-grouping-backslash ((t (:foreground "#E9C062"))))
      (font-lock-regexp-grouping-construct ((t (:foreground "red"))))
-
      (font-lock-string-face ((t (:foreground "#F05656"))))
      (font-lock-type-face ((t (:foreground "#73E1E6"))))
      (font-lock-variable-name-face ((t (:foreground "#00BFFF"))))
@@ -41,4 +40,11 @@
      (text-cursor ((t (:background "yellow" :foreground "black"))))
      (toolbar ((t (nil))))
      (underline ((nil (:underline nil))))
+
      (zmacs-region ((t (:background "snow" :foreground "ble")))))))
+(defun color-theme-barak-extras ()
+; Highlight numbers 
+(add-hook 'after-change-major-mode-hook 
+	  (lambda () (font-lock-add-keywords 
+		       nil
+		       '(("\\<\\(\\(0[xX]\\|0[bB]\\)?-?[0-9a-fA-F]+\\.?[0-9]*?[fFlL]?\\)\\>" 1 '((t (:foreground "#E3AC3D")))))))))