diff --git a/.gitignore b/.gitignore
index ec774db..07096fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@ bookmarks
 nohup.out
 \#*
 network-security.data
+nov-places
+request/*
+transient/*
\ No newline at end of file
diff --git a/init.el b/init.el
index f3c34c8..0e102a7 100644
--- a/init.el
+++ b/init.el
@@ -87,10 +87,14 @@
 (when (iswin)
   (setq default-directory "~/"))
 
+(when (islin)
+  (use-package lastfm))
+
 ;; Be quiet
 
 (setq ad-redefinition-action 'accept)
 (setq python-indent-guess-indent-offset-verbose nil)
+(setq byte-compile-warnings '(cl-functions))
 
 ;; Minor modes
 
@@ -178,6 +182,22 @@
 
 ;; Major modes
 
+(when (islin)
+  (use-package calibredb
+    :defer t
+    :config
+    (setq calibredb-root-dir "~/Documents/drive/calibre/ebooks")
+    (setq calibredb-db-dir (expand-file-name "metadata.db" calibredb-root-dir))
+    (setq calibredb-library-alist '(("~/Documents/drive/calibre/ebooks")
+				    ("~/Documents/drive/calibre/ffff"))))
+  (use-package nov
+    :init
+    (add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode)))
+  (defun my-nov-font-setup ()
+    (face-remap-add-relative 'variable-pitch :family "Liberation Serif"
+			     :height 2.0))
+  (add-hook 'nov-mode-hook 'my-nov-font-setup))
+
 (use-package deft
   ;; for searching journal files
   :config
@@ -224,7 +244,7 @@
  (add-hook 'pdf-view-mode-hook (lambda () (cua-mode 0)))
  (setq pdf-view-resize-factor 1.1)))
 
-(when (iswin) (use-package doc-view ; not tested
+(when (iswin) (use-package doc-view
       :config
       (setq doc-view-ghostscript-program "gswin32c")))
 
@@ -259,6 +279,11 @@
 (load-file "~/.emacs.d/agenda-common.el")
 ;; for agenda things used in both emacs and batch
 
+(when (islin)
+  (use-package org-modern
+    :hook
+    (org-mode . org-modern-mode)))
+
 (use-package calfw
   ;; grid calendar that i forget to use
     :bind ("C-c f" . cfw:open-org-calendar)
@@ -276,12 +301,13 @@
   :config
   (setq org-directory "~/Documents/drive/org"))
 
-(use-package org-bullets
-  ;; makes bullets look nice
-  :custom
-  (org-bullets-bullet-list '("✸"))
-  (org-ellipsis " ⤵")
-  :hook (org-mode . org-bullets-mode))
+(unless (islin)
+  (use-package org-bullets
+    ;; makes bullets look nice
+    :custom
+    (org-bullets-bullet-list '("✸"))
+    (org-ellipsis " ⤵")
+    :hook (org-mode . org-bullets-mode)))
 
 (setq org-todo-keywords
       '((sequence "TODO" "|" "DONE" "CANCELLED")))
@@ -350,7 +376,7 @@
 (when (islin)
   (add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e")
   (load-file "~/.emacs.d/mail.el")
-  (require 'mu4e)
+  (require 'mu4e) ;; this uses cl … hopefully will be updated in a later emacs version?
   (setq send-mail-function 'smtpmail-send-it)
   ;; (load-file "~/.emacs.d/custom/dwpost.el")
   )
@@ -374,17 +400,17 @@
   :config
   (global-hl-line-mode 1))
 
-(when (islin)
-(use-package xresources-theme)
-;; theme based on ~/.Xresources
-)
+(use-package tao-theme)
+(load-theme 'tao-yang t)
+
+;; (when (islin) ;; not working in emacs27?
+;; (use-package xresources-theme)
+;; ;; theme based on ~/.Xresources
+;; )
 
 (set-cursor-color "#61805c") 
 (set-face-attribute 'region nil :background "#fcf6a7")
-(set-face-background 'hl-line "#c9ffbf")
-
-(unless (islin)
-  (load-theme 'dichromacy))
+(set-face-background 'hl-line "#ddffd6")
 
 ;; Fonts
 
@@ -431,3 +457,19 @@
 "))
 
 (org-reload)
+(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.
+ '(custom-safe-themes
+   '("801a567c87755fe65d0484cb2bded31a4c5bb24fd1fe0ed11e6c02254017acb2" "dbade2e946597b9cda3e61978b5fcc14fa3afa2d3c4391d477bdaeff8f5638c5" default)))
+(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.
+ '(fixed-pitch ((t (:family "Noto Mono" :height 90))))
+ '(italic ((t (:slant italic))))
+ '(markdown-header-face ((t (:inherit (default font-lock-function-name-face) :weight bold))))
+ '(variable-pitch ((t (:family "Noto Sans" :height 90)))))