diff --git a/emacs/init.el b/emacs/init.el
index a83bdd5..f8fab99 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -33,17 +33,20 @@
  '(display-line-numbers-type 'visual)
  '(display-line-numbers-width-start t)
  '(evil-cross-lines t)
+ '(global-whitespace-mode t)
  '(package-archives
    '(("gnu" . "https://elpa.gnu.org/packages/")
      ("melpa" . "https://melpa.org/packages/")
      ("org" . "https://orgmode.org/elpa/")))
  '(package-selected-packages
-   '(avy editorconfig org-crypt tree-sitter-langs tree-sitter centaur-tabs dashboard page-break-lines 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))
+   '(flycheck origami groovy-mode avy editorconfig org-crypt tree-sitter-langs tree-sitter centaur-tabs dashboard page-break-lines 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))
  '(ring-bell-function 'ignore)
  '(undo-tree-auto-save-history t)
  '(undo-tree-history-directory-alist '(("." . "~/.undohist-emacs")))
  '(undo-tree-visualizer-diff t)
- '(undo-tree-visualizer-timestamps t))
+ '(undo-tree-visualizer-timestamps t)
+ '(whitespace-style
+   '(face tabs spaces newline space-mark tab-mark newline-mark)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -57,7 +60,8 @@
  '(evil-goggles-undo-redo-change-face ((t (:inherit diff-changed))))
  '(evil-goggles-undo-redo-remove-face ((t (:inherit diff-removed))))
  '(evil-goggles-yank-face ((t (:inherit diff-changed))))
- '(italic ((t (:slant italic :family "Dank Mono")))))
+ '(italic ((t (:slant italic :family "Dank Mono"))))
+ '(whitespace-tab ((t (:inherit default :foreground "#65737d")))))
 
 ;; auto-package-update
 (use-package auto-package-update
@@ -179,13 +183,16 @@
   (editorconfig-mode 1))
 
 ;; Wakatime
-(use-package wakatime-mode
-  :hook (after-init . global-wakatime-mode))
+;; (use-package wakatime-mode
+;;   :hook (after-init . global-wakatime-mode))
 
-;; ;; Clipetty (clipboard stuff)
-;; (use-package clipetty
-;;   :ensure t
-;;   :hook (after-init . global-clipetty-mode))
+;; Groovy-mode
+(use-package groovy-mode
+  )
+
+;; Origamimode
+(use-package origami
+  :config (global-origami-mode t))
 
 ;; Page-break-lines
 (use-package page-break-lines
@@ -250,33 +257,19 @@
 (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)
+(use-package flycheck
+  :init (global-flycheck-mode))
 
 (setq cider-font-lock-dynamically '(macro core function var))
 ;; These don't work yet?
 ;; (define-key evil-insert-state-map (kbd "C-\\") 'cider-eval-defun-up-to-point)
 ;; (define-key evil-normal-state-map (kbd "C-\\") 'cider-eval-defun-up-to-point)
 
-;; Extra things
-; (global-whitespace-mode 1)
+(progn
+  (setq whitespace-style (quote (face spaces tabs newline space-mark tab-mark newline-mark )))
 
-; (progn
-  ;; Make whitespace-mode with very basic background coloring for whitespaces.
-  ;; http://ergoemacs.org/emacs/whitespace-mode.html
-  ; (setq whitespace-style (quote (face spaces tabs newline space-mark tab-mark newline-mark )))
-
-  ;; Make whitespace-mode and whitespace-newline-mode use “¶” for end of line char and “▷” for tab.
-  ; (setq whitespace-display-mappings
-	;; all numbers are unicode codepoint in decimal. e.g. (insert-char 182 1)
-	; (quote (
-	  ; (space-mark 32 [183] [46]) ; SPACE 32 「 」, 183 MIDDLE DOT 「·」, 46 FULL STOP 「.」
-	  ; (newline-mark 10 [182 10]) ; LINE FEED,
-	  ; (tab-mark 9 [8614])	     ; tab
-	  ; )
-	; )
-  ; )
-; )
+  (setq whitespace-display-mappings
+	(quote (
+	  (space-mark 32 [8227] [183] [46]) 
+	  (newline-mark 10 [172 10] [182 10]) 
+	  (tab-mark 9 [8594 32 32 32] [8614])))))
diff --git a/zsh/zshrc b/zsh/zshrc
index 4a335b4..7c88c06 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -36,8 +36,8 @@ zle -N down-line-or-beginning-search
 
 
 export COMPLETION_WAITING_DOTS="true"
-export VISUAL='emacsclient -c'
-export EDITOR='emacsclient -c'
+export VISUAL='emacsclient -cn'
+export EDITOR='emacsclient -cn'
 path=("$HOME/bin" "$HOME/go/bin" $path)
 
 zstyle ':znap:*' auto-compile no