diff --git a/.emacs b/.emacs
index 43e9fee..691aae6 100644
--- a/.emacs
+++ b/.emacs
@@ -1,2 +1,18 @@
 (setq inhibit-startup-message t)  ;; Hide the startup message
 (global-linum-mode t)
+(global-whitespace-mode t)
+(setq backward-delete-char-untabify-method nil)
+(setq c-default-style '((java-mode . "java") (awk-mode . "awk") (other . "linux")))
+(defalias 'yes-or-no-p 'y-or-n-p)
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(custom-enabled-themes '(tango-dark)))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )