diff --git a/init.el b/init.el
index 0e5cde2..4e53fa1 100644
--- a/init.el
+++ b/init.el
@@ -4,6 +4,16 @@
 (setq-default indent-tabs-mode nil)
 (setq-default tab-width 4)
 
+;; WhiteSpace hilighting
+(require 'whitespace)
+(setq whitespace-style (quote (face trailing tabs tab-mark empty lines-tail)))
+(setq-default whitespace-line-column 80)
+(global-whitespace-mode 1)
+
+;; C, use k&r style by default (naev)
+(setq-default c-default-style "k&r"
+              c-basic-offset 3)
+
 ;; Python!
 ;; Prevent ropemacs from overriding emacs shortcuts
 ;;(setq ropemacs-enable-shortcuts nil)
@@ -22,32 +32,16 @@
 ;;(pymacs-load "ropemacs" "rope-")
 
 ;; PHP and Drupal-Modes
-(require 'whitespace)
-(autoload 'whitespace-mode	"whitespace" "Toggle whitespace visualization."	t)
-(autoload 'whitespace-toggle-options "whitespace" "Toggle local 'whitespace-mode' options." t)
-(add-to-list 'load-path "~/.emacs.d/")
 (require 'php-mode)
 (require 'drupal-mode)
 (add-to-list 'auto-mode-alist '("\\.\\(module\\|test\\|install\\|theme\\)$" . drupal-mode))
 (add-to-list 'auto-mode-alist '("\\.\\(php\\|inc\\)$" . php-mode))
 (add-to-list 'auto-mode-alist '("\\.info" . conf-windows-mode))
 (defun my-php-hook-function ()
-	(set (make-local-variable 'compile-command) (format "phpcs --report=emacs --standard=PEAR %s" (buffer-file-name))))
+  (set (make-local-variable 'compile-command) (format "phpcs --report=emacs --standard=PEAR %s" (buffer-file-name))))
 (add-hook 'php-mode-hook 'my-php-hook-function)
 (defun my-drupal-hook-function ()
-	(set (make-local-variable 'compile-command) (format "phpcs --report=emacs --extensions=php,module,inc,install,test,profile,theme --standard=Drupal %s" (buffer-file-name))))
+  (set (make-local-variable 'compile-command) (format "phpcs --report=emacs --extensions=php,module,inc,install,test,profile,theme --standard=Drupal %s" (buffer-file-name))))
 (add-hook 'drupal-mode-hook 'my-drupal-hook-function)
-(setq whitespace-style '(trailing tabs tab-mark face))
-(defface extra-whitespace-face
-	'((t (:background "pale yellow")))
-	"Used for tabs and such.")
-(defvar my-extra-keywords
-	'(("\t" . 'extra-whitespace-face)))
-;; Draw tabs with the same color as trailing whitespace
-(add-hook 'font-lock-mode-hook  
-              (lambda ()  
-                (font-lock-add-keywords  
-                  nil  
-                  '(("\t" 0 'trailing-whitespace prepend)))))
 (autoload 'js2-mode "js2-mode" nil t)
 (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))