diff --git a/bundle/custom.el b/bundle/custom.el
index a520320c..e714ef3c 100644
--- a/bundle/custom.el
+++ b/bundle/custom.el
@@ -20,7 +20,7 @@
       (menu-bar-lines . 0)
       (undecorated . t))))
  '(delete-selection-mode t)
- '(desktop-save-mode t)
+ '(desktop-save-mode nil)
  '(diary-file "~/Documents/Diary/diary")
  '(display-battery-mode t)
  '(display-line-numbers nil)
diff --git a/init.el b/init.el
index ab870ec4..31877170 100755
--- a/init.el
+++ b/init.el
@@ -1,5 +1,8 @@
-(require 'package)
+;; start a server, unless one is already running
+(require 'server)
+(unless (server-running-p) (server-start))
 
+(require 'package)
 ;; Added by Package.el.  This must come before configurations of
 ;; installed packages.  Don't delete this line.  If you don't want it,
 ;; just comment it out by adding a semicolon to the start of the line.
@@ -29,7 +32,7 @@ There are two things you can do about this warning:
 (when (eq system-type 'gnu/linux)
   (load-theme 'nord))
 (unless (eq system-type 'gnu/linux)
-  (load-theme 'spacemacs-dark))
+  (load-theme 'nord))
 
 ;; Load my custom bundles
 (add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle"))
@@ -41,11 +44,6 @@ There are two things you can do about this warning:
 (require 'display)
 (require 'hooks)
 
-;; start a server, unless one is already running
-(when (require 'server nil t)
-  (unless (server-running-p)
-    (server-start)))
-
 ;; UTF-8 FTW
 (prefer-coding-system 'utf-8)
 (set-default-coding-systems 'utf-8)
@@ -82,12 +80,14 @@ There are two things you can do about this warning:
 (setq slime-contribs '(slime-fancy))
 
 ;; ==================== GLOBAL KEYS ==================== ;;
-(global-set-key "\C-cl" 'org-store-link)
-(global-set-key "\C-ca" 'org-agenda)
-(global-set-key "\C-cc" 'org-capture)
-(global-set-key "\C-cb" 'org-switchb)
-(global-set-key "\C-xg" 'magit-status)
-(global-set-key "\C-xM-g" 'magit-dispatch)
+(global-set-key (kbd "C-c l") 'org-store-link)
+(global-set-key (kbd "C-c a") 'org-agenda)
+(global-set-key (kbd "C-c c") 'org-capture)
+(global-set-key (kbd "C-c b") 'org-switchb)
+
+(global-set-key (kbd "C-x g") 'magit-status)
+(global-set-key (kbd "C-x M-g") 'magit-dispatch)
+
 (global-unset-key "\C-z")