diff --git a/bundle/bundle--defaults.el b/bundle/bundle--defaults.el
index 33d42d63..8d2852cc 100644
--- a/bundle/bundle--defaults.el
+++ b/bundle/bundle--defaults.el
@@ -1,30 +1,48 @@
-(horizontal-scroll-bar-mode 0)
-(menu-bar-mode 0)
-(scroll-bar-mode 0)
-(tool-bar-mode 0)
-(show-paren-mode 1)
+;; General userinterface and appearance
+(tool-bar-mode -1)
+(menu-bar-mode -1)
+(scroll-bar-mode -1)
+(horizontal-scroll-bar-mode -1)
 (global-hl-line-mode 1)
+(define-key menu-bar-tools-menu [games] nil)
 
+;; Cursor and mouse
+(column-number-mode -1)
+(mouse-wheel-mode 1)
+(blink-cursor-mode -1)
+
+;; Customization for locale, environment and computer
+(setq-default european-calendar-style 't)
+(setq-default calendar-christian-all-holidays-flag t)
+(setq-default calendar-date-style (quote iso))
+(setq-default calendar-view-diary-initially-flag t)
+(setq-default calendar-week-start-day 1)
+(setq-default ispell-program-name "aspell")
+(setq-default shell-file-name "/bin/bash")
+(setq-default tex-shell-file-name "/bin/bash")
+(setq-default grep-command "grep -i -nH -e ")
+
+;; Files and sessions
+(when window-system (speedbar t))
+(setq-default auto-save-timeout 60)
+
+;; Tabs, spaces, lines and parenthesis
+(show-paren-mode 1)
+(setq-default indent-tabs-mode nil)
+(setq-default line-spacing nil)
+(setq-default make-backup-files nil)
+(setq-default browse-url-browser-function (quote eww-browse-url))
+(setq tab-width 4)
+(setq sentence-end-double-space nil)
+(setq next-line-add-newlines t)
+(setq require-final-newline 't)
+
+;; Miscellaneous
+(require 'cl)
+(setq-default  inhibit-startup-buffer-menu t
+               inhibit-startup-screen t)
 (put 'narrow-to-region 'disabled nil)
 (put 'narrow-to-page 'disabled nil)
-
-(setq-default indent-tabs-mode nil
-              inhibit-startup-buffer-menu t
-              inhibit-startup-screen t
-              ispell-program-name "aspell"
-              line-spacing nil
-              calendar-christian-all-holidays-flag t
-              calendar-date-style (quote iso)
-              calendar-view-diary-initially-flag t
-              calendar-week-start-day 1
-              make-backup-files nil
-              browse-url-browser-function (quote eww-browse-url)
-              indent-tabs-mode nil
-              inhibit-startup-buffer-menu t
-              inhibit-startup-screen t)
-
-
-(setq tab-width 4
-      sentence-end-double-space nil
-      next-line-add-newlines t
-      require-final-newline 't)
+(setq default-major-mode 'text-mode)
+(add-hook 'text-mode-hook 'turn-on-auto-fill)
+(defalias 'yes-or-no-p 'y-or-n-p)
diff --git a/init.el b/init.el
index b3dcf569..8e6f5a99 100755
--- a/init.el
+++ b/init.el
@@ -1,5 +1,3 @@
-(require 'cl)
-
 (add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle/"))
 (load "bundle--defaults")
 (load "bundle--server")
@@ -12,7 +10,4 @@
 (load "bundle--mk")
 (load "bundle--hooks")
 (load "bundle--lists")
-;; (load-theme 'nord t)
-(require 'color-theme-sanityinc-tomorrow)
-(defalias 'yes-or-no-p 'y-or-n-p)
 (org-clock-persistence-insinuate)