diff --git a/bundle/custom.el b/bundle/custom.el
index 257d26d0..c7724dce 100644
--- a/bundle/custom.el
+++ b/bundle/custom.el
@@ -8,7 +8,6 @@
  '(blink-cursor-mode nil)
  '(column-number-mode t)
  '(cursor-type (quote (bar . 2)))
- '(custom-enabled-themes (quote (nord)))
  '(custom-safe-themes
    (quote
     ("4639288d273cbd3dc880992e6032f9c817f17c4a91f00f3872009a099f5b3f84" "14c848e2c4a0a11fcd118e2519078aa50bb6020f89035423b40fff421fb24fbd" "cdb4ffdecc682978da78700a461cdc77456c3a6df1c1803ae2dd55c59fa703e3" "9e31aff9afe3c20a33dd966b4c54c6a5151f07659362e4b06bde38ded5370dae" "24fc62afe2e5f0609e436aa2427b396adf9a958a8fa660edbaab5fb13c08aae6" "82358261c32ebedfee2ca0f87299f74008a2e5ba5c502bde7aaa15db20ee3731" "4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default)))
@@ -90,7 +89,7 @@
  '(package-enable-at-startup t)
  '(package-selected-packages
    (quote
-    (org-beautify-theme org-clock-csv org-clock-today org-drill web-mode zenburn-theme immaterial-theme arc-dark-theme url-http-ntlm syslog-mode org-pomodoro ox-html5slide ox-hugo ox-impress-js ox-ioslide ox-jira ox-json ox-pandoc nov vimish-fold w3 pickle feature-mode elpy elnode ein latex-extra latex-preview-pane docker docker-api docker-cli docker-compose-mode dockerfile-mode python-docstring pytest py-autopep8 pydoc pylint python-info auto-complete-rst sphinx-doc sphinx-frontend sphinx-mode ox-mediawiki ox-minutes ox-nikola cargo racket-mode rust-mode slime gherkin-mode gitlab gitlab-ci-mode org-jira powershell helm gitconfig-mode gitignore-mode ox-rst typescript-mode ## skewer-mode ob-http ob-ipython ob-restclient linum-relative markdown-mode nord-theme restclient request restclient-test yaml-mode magit)))
+    (berrys-theme org-beautify-theme org-clock-csv org-clock-today org-drill web-mode zenburn-theme immaterial-theme arc-dark-theme url-http-ntlm syslog-mode org-pomodoro ox-html5slide ox-hugo ox-impress-js ox-ioslide ox-jira ox-json ox-pandoc nov vimish-fold w3 pickle feature-mode elpy elnode ein latex-extra latex-preview-pane docker docker-api docker-cli docker-compose-mode dockerfile-mode python-docstring pytest py-autopep8 pydoc pylint python-info auto-complete-rst sphinx-doc sphinx-frontend sphinx-mode ox-mediawiki ox-minutes ox-nikola cargo racket-mode rust-mode slime gherkin-mode gitlab gitlab-ci-mode org-jira powershell helm gitconfig-mode gitignore-mode ox-rst typescript-mode ## skewer-mode ob-http ob-ipython ob-restclient linum-relative markdown-mode nord-theme restclient request restclient-test yaml-mode magit)))
  '(python-shell-interpreter "python3" t)
  '(register-preview-delay 2)
  '(register-separator 43)
@@ -100,6 +99,7 @@
  '(resize-mini-windows t)
  '(restclient-log-request t)
  '(restclient-same-buffer-response t)
+ '(ring-bell-function (quote ignore))
  '(size-indication-mode nil)
  '(tab-width 2)
  '(timeclock-file "~/Documents/Diary/timelog")
diff --git a/init.el b/init.el
index bcfe6739..be843efc 100755
--- a/init.el
+++ b/init.el
@@ -26,6 +26,11 @@ There are two things you can do about this warning:
 (setq custom-file "~/.emacs.d/bundle/custom.el")
 (load custom-file :noerror)
 
+(when (eq system-type 'gnu/linux)
+  (load-theme 'nord))
+(unless (eq system-type 'gnu/linux)
+  (load-theme 'berrys))
+
 ;; Load my custom bundles
 (add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle"))
 (require 'os)