diff --git a/emacs/init.el b/emacs/init.el
index 61ea77f..3866dfb 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -32,12 +32,13 @@
  '(display-line-numbers-grow-only t)
  '(display-line-numbers-type 'visual)
  '(display-line-numbers-width-start t)
+ '(evil-cross-lines t)
  '(package-archives
    '(("gnu" . "https://elpa.gnu.org/packages/")
      ("melpa" . "https://melpa.org/packages/")
      ("org" . "https://orgmode.org/elpa/")))
  '(package-selected-packages
-   '(wakatime-mode super-save ox-pandoc evil-surround evil-collection undo-tree toc-org evil-org org-plus-contrib evil-goggles evil-expat evil-commentary auto-package-update lispy smartparens which-key git-gutter rainbow-delimiters auto-complete-distel auto-complete evil magit evil-magit))
+   '(clipetty wakatime-mode super-save ox-pandoc evil-surround evil-collection undo-tree toc-org evil-org org-plus-contrib evil-goggles evil-expat evil-commentary auto-package-update lispy smartparens which-key git-gutter rainbow-delimiters auto-complete-distel auto-complete evil magit evil-magit))
  '(undo-tree-auto-save-history t)
  '(undo-tree-history-directory-alist '(("." . "~/.undohist-emacs")))
  '(undo-tree-visualizer-diff t)
@@ -55,7 +56,9 @@
  '(evil-goggles-undo-redo-remove-face ((t (:inherit diff-removed))))
  '(evil-goggles-yank-face ((t (:inherit diff-changed))))
  '(fringe ((t (:background "brightgreen" :foreground "black"))))
+ '(header-line ((t (:inherit mode-line :foreground "color-127"))))
  '(highlight ((t (:background "brightgreen" :foreground "black"))))
+ '(isearch ((t (:background "black" :foreground "brightmagenta"))))
  '(lazy-highlight ((t (:background "black" :foreground "blue" :inverse-video t))))
  '(line-number ((t (:background "blue" :foreground "black"))))
  '(line-number-major-tick ((t (:background "grey75" :foreground "black" :weight bold))))
@@ -67,6 +70,8 @@
  '(magit-diff-hunk-heading-selection ((t (:inherit magit-diff-hunk-heading-highlight :extend t :foreground "brightred"))))
  '(magit-header-line ((t (:background "brightyellow" :foreground "black" :weight bold))))
  '(magit-section-highlight ((t (:extend t :background "brightgreen" :foreground "black" :slant italic))))
+ '(mode-line ((t (:background "brightblue" :foreground "brightwhite" :box nil))))
+ '(mode-line-buffer-id ((t (:foreground "white"))))
  '(region ((t (:extend t :background "brightyellow" :foreground "black"))))
  '(tooltip ((t (:background "brightgreen" :foreground "black")))))
 
@@ -193,6 +198,12 @@
 (use-package wakatime-mode
   :hook (after-init . global-wakatime-mode))
 
+;; Clipetty (clipboard stuff)
+(use-package clipetty
+  :ensure t
+  :hook (after-init . global-clipetty-mode))
+
+
 ;; Org Mode
 (use-package org
   :mode (("\\.org$" . org-mode))
@@ -213,6 +224,11 @@
 (use-package ox-pandoc
   :after (org))
 
+;; Don't use system clipboard by default
+(setq-default
+  interprogram-cut-function   nil
+  interprogram-paste-function nil
+  x-select-enable-clipboard   nil)
 
 (setq cider-font-lock-dynamically '(macro core function var))
 ;; These don't work yet?