diff --git a/.emacs.d/irblack.el b/.emacs.d/irblack.el
index f456190..950b1b3 100644
--- a/.emacs.d/irblack.el
+++ b/.emacs.d/irblack.el
@@ -22,8 +22,8 @@
   (interactive)
   (color-theme-install
    '(color-theme-irblack
-     (;; (background-color . "black")
-      ;; (background-mode . dark)
+     ((background-color . "black")
+      (background-mode . dark)
       (border-color . "gray10")
       (cursor-color . "DarkOliveGreen2")
       (foreground-color . "#F6F3E8")
@@ -67,6 +67,8 @@
      (show-paren-mismatch ((t (:background "#FF1100"))))
      (underline ((nil (:underline nil))))
 
+     ;; whitespace
+     (trailing-whitespace ((t (:background "gray22"))))
      ;; mumamo
      ;(mumamo-background-chunk-major ((t (:background "#000000"))))
      ;(mumamo-background-chunk-submode ((t (:background "#222222"))))
diff --git a/.emacs.hunner.el b/.emacs.hunner.el
index e32a2cc..5463a0f 100644
--- a/.emacs.hunner.el
+++ b/.emacs.hunner.el
@@ -32,6 +32,7 @@
 
 (bar-cursor-mode 1)
 (menu-bar-mode 0)
+(scroll-bar-mode -1)
 (tool-bar-mode 0)
 (setq linum-format "%3d ")
 (setq-default indent-tabs-mode nil)
@@ -96,6 +97,7 @@
 ;; Highlight bad whitespace
 (global-whitespace-mode t)
 (setq whitespace-style (quote (tabs tab-mark)))
+(setq-default show-trailing-whitespace t)
 
 ;; Make % work like vi
 (global-set-key "%" 'match-paren)
@@ -107,12 +109,12 @@
         (t (self-insert-command (or arg 1)))))
 
 ;; Prevent Emacs from stupidly auto-changing my working directory
-(defun find-file-save-default-directory ()
-    (interactive)
-    (setq saved-default-directory default-directory)
-    (ido-find-file)
-    (setq default-directory saved-default-directory))
-(global-set-key "\C-x\C-f" 'find-file-save-default-directory)
+;; (defun find-file-save-default-directory ()
+;;     (interactive)
+;;     (setq saved-default-directory default-directory)
+;;     (ido-find-file)
+;;     (setq default-directory saved-default-directory))
+;; (global-set-key "\C-x\C-f" 'find-file-save-default-directory)
 
 ;; Give killing lines advice
 (defadvice kill-ring-save (before slick-copy activate compile)
@@ -194,8 +196,21 @@
             ("M-O" other-window)
             ("M-`" switch-to-next-frame)
             ("M-~" switch-to-previous-frame)
+            ("M-RET" ns-toggle-fullscreen)
             ))
 
+;;toggle full-screen
+(defun toggle-fullscreen ()
+(interactive)
+(set-frame-parameter
+ nil
+ 'fullscreen
+ (if (frame-parameter nil 'fullscreen)
+     nil
+   'fullboth)))
+
+(global-set-key [(meta return)] 'toggle-fullscreen)
+
 ;; Transparency
 (set-frame-parameter (selected-frame) 'alpha '(85 85))
 (add-to-list 'default-frame-alist '(alpha 85 85))