diff --git a/bundle/custom.el b/bundle/custom.el
index 37aeb5d0..678960fa 100644
--- a/bundle/custom.el
+++ b/bundle/custom.el
@@ -8,7 +8,9 @@
  '(custom-enabled-themes (quote (misterioso)))
  '(inhibit-startup-buffer-menu t)
  '(initial-buffer-choice "d:/syncplicity/Marcus.Kammer/documents/Journal/README.org")
- '(package-selected-packages (quote (ox-reveal ace-window htmlize ivy magit))))
+ '(package-selected-packages
+   (quote
+    (org toc-org ox-reveal ace-window htmlize ivy magit))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/bundle/custom_win32.el b/bundle/custom_win32.el
new file mode 100644
index 00000000..9f8dcb4b
--- /dev/null
+++ b/bundle/custom_win32.el
@@ -0,0 +1,22 @@
+(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.
+ '(ansi-color-faces-vector
+   [default default default italic underline success warning error])
+ '(custom-enabled-themes (quote (misterioso)))
+ '(inhibit-startup-buffer-menu t)
+ '(initial-buffer-choice "d:/syncplicity/Marcus.Kammer/documents/Journal/README.org")
+ '(org-modules
+   (quote
+    (ol-bbdb ol-bibtex ol-docview ol-eww ol-gnus ol-info ol-irc ol-mhe ol-rmail org-tempo ol-w3m)))
+ '(package-selected-packages
+   (quote
+    (org toc-org ox-reveal ace-window htmlize ivy magit))))
+(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.
+ )
diff --git a/init.el b/init.el
index 2a6b3e4c..f901333f 100755
--- a/init.el
+++ b/init.el
@@ -62,7 +62,10 @@
   (with-current-buffer "*scratch*" (emacs-lock-mode 'kill))
 
 ;; CUSTOM_FILE
-  (setq custom-file "~/.emacs.d/bundle/custom.el")
+  (when (eq system-type 'windows-nt)
+    (setq custom-file "~/.emacs.d/bundle/custom_win32.el"))
+  (when (eq system-type 'gnu/linux)
+    (setq custom-file "~/.emacs.d/bundle/custom_gnu.el"))
   (load custom-file :noerror)
 
 ;; PACKAGE