diff --git a/emacs.d/00-functions.el b/emacs.d/00-functions.el
index 3e429ec..2b43d65 100644
--- a/emacs.d/00-functions.el
+++ b/emacs.d/00-functions.el
@@ -19,3 +19,10 @@
 (defun show-whitespace ()
   (interactive)
   (whitespace-mode t))
+
+(defun fullscreen ()
+  (interactive)
+  (x-send-client-message nil 0 nil "_NET_WM_STATE" 32
+                         '(2 "_NET_WM_STATE_MAXIMIZED_VERT" 0))
+  (x-send-client-message nil 0 nil "_NET_WM_STATE" 32
+                         '(2 "_NET_WM_STATE_MAXIMIZED_HORZ" 0)))
diff --git a/emacs.d/10-settings.el b/emacs.d/10-settings.el
index 86f8993..3de828e 100644
--- a/emacs.d/10-settings.el
+++ b/emacs.d/10-settings.el
@@ -1,5 +1,4 @@
-(if (eq system-type 'gnu/linux)         ; if we're running linux
-    (set-frame-font "-*-tamsyn-medium-*-*-*-15-*-*-*-*-80-*-*"))
+(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-9"))
 
 (setq inhibit-startup-message      t)   ; don't show welcome screen
 (setq require-final-newline        t)   ; always append a newline to a
@@ -35,13 +34,6 @@
               (let ((suffix (file-name-extension fname)))
               (if (string-equal suffix "el")
                   (byte-compile-file fname))))))
-
-
-
-
-
-
-
-
-
-
+(add-hook 'emacs-startup-hook
+          (lambda ()
+            (fullscreen)))