diff --git a/home/emacs/init.el b/home/emacs/init.el
index 92102838..93e7084c 100644
--- a/home/emacs/init.el
+++ b/home/emacs/init.el
@@ -20,8 +20,6 @@
                                    ("stable" . 70)
                                    ("melpa" . 0)))
 
-(when (require 'package nil :noerror) (package-refresh-contents))
-
 ;; Add custom modules to the `load-path'
 (add-to-list 'load-path (expand-file-name "modules" user-emacs-directory))
 
diff --git a/home/emacs/modules/custom-defaults-config.el b/home/emacs/modules/custom-defaults-config.el
index 71406a6c..9bb76846 100644
--- a/home/emacs/modules/custom-defaults-config.el
+++ b/home/emacs/modules/custom-defaults-config.el
@@ -24,9 +24,10 @@
 (keymap-set global-map "M-#" #'dictionary-lookup-definition)
 (keymap-set global-map "C-c r" #'recentf)
 (keymap-set global-map "C-c b" #'ibuffer)
-(keymap-set global-map "C-c p p" list-packages)
-(keymap-set global-map "C-c p i" package-install)
-(keymap-set global-map "C-c p d" package-delete)
+(keymap-set global-map "C-c p p" #'list-packages)
+(keymap-set global-map "C-c p r" #'package-refresh-contents)
+(keymap-set global-map "C-c p i" #'package-install)
+(keymap-set global-map "C-c p d" #'package-delete)
 
 ;; turn on spell checking, if available.
 (with-eval-after-load 'ispell
diff --git a/home/emacs/modules/custom-media-config.el b/home/emacs/modules/custom-media-config.el
index c42b8eb8..391de743 100644
--- a/home/emacs/modules/custom-media-config.el
+++ b/home/emacs/modules/custom-media-config.el
@@ -2,7 +2,8 @@
   (setq emms-player-list '(emms-player-mpv)
 	emms-info-functions '(emms-info-native)
 	emms-source-file-default-directory "~/Music"
-	emms-lyrics-dir "~/Music/lyrics")
+	emms-lyrics-dir "~/Music/lyrics"
+	emms-mode-line-icon-color "white")
   
   (emms-all)
   (add-hook 'emms-player-started-hook #'emms-show)
diff --git a/home/emacs/modules/custom-org-config.el b/home/emacs/modules/custom-org-config.el
index 2e4d1bab..c99b5c87 100644
--- a/home/emacs/modules/custom-org-config.el
+++ b/home/emacs/modules/custom-org-config.el
@@ -16,12 +16,15 @@
       org-outline-path-complete-in-steps nil
       org-default-notes-file (expand-file-name "notes.org" org-directory))
 
-(keymap-set global-map "C-c o a" org-agenda)
-(keymap-set global-map "C-c o n" org-capture)
-(keymap-set global-map "C-c o c" org-goto-calendar)
-(keymap-set global-map "C-c o j j" org-journal-new-entry)
-(keymap-set global-map "C-c o j n" org-journal-new-date-entry)
-(keymap-set global-map "C-c o j s" org-journal-new-scheduled-entry)
+(keymap-set global-map "C-c o a" #'org-agenda)
+(keymap-set global-map "C-c o n" #'org-capture)
+(keymap-set global-map "C-c o c" #'org-goto-calendar)
+(keymap-set global-map "C-c o j j" #'org-journal-new-entry)
+(keymap-set global-map "C-c o j n" #'org-journal-new-date-entry)
+(keymap-set global-map "C-c o j s" #'org-journal-new-scheduled-entry)
+
+(add-hook 'org-mode-hook #'org-modern-mode)
+(add-hook 'org-agenda-finalize-hook #'org-modern-agenda)
 
 (setq org-capture-templates
       '(("n" "Note" entry
diff --git a/system/emacs.nix b/system/emacs.nix
index 0b929313..060fe93b 100644
--- a/system/emacs.nix
+++ b/system/emacs.nix
@@ -52,11 +52,16 @@
           # org-packages
           denote
           org-appear
+          org-cliplink
           org-journal
+          org-modern
 
           # project-packages
           magit
 
+          # social-packages
+          mastodon
+
           # ui-packages
           all-the-icons
           nerd-icons