diff --git a/pkgs/emacs/default.nix b/pkgs/emacs/default.nix
index 8a031bd..15ee47b 100644
--- a/pkgs/emacs/default.nix
+++ b/pkgs/emacs/default.nix
@@ -9,37 +9,38 @@ emacsWithPackages (
   ) ++ (
     with epkgs.melpaPackages; [
       all-the-icons
-      use-package
+      company
+      dap-mode
+      doom-modeline
       evil
       evil-collection
-      helm
-      projectile
-      helm-projectile
-      magit
-      company
-      helm-company
-      helm-ag
       fira-code-mode
-      org-superstar
-      org-fragtog
-      org-roam
-      org-download
-      visual-fill-column
-      writegood-mode
-      nix-mode
-      lsp-python-ms
+      helm
+      helm-ag
+      helm-company
+      helm-projectile
       lispy
       lsp-mode
-      dap-mode
-      which-key
-      sudo-utils
+      lsp-python-ms
+      magit
+      nix-mode
+      org-download
+      org-fragtog
+      org-roam
+      org-superstar
+      projectile
       rainbow-delimiters
+      sudo-utils
       treemacs
       treemacs-evil
-      treemacs-projectile
       treemacs-icons-dired
       treemacs-magit
       treemacs-persp
+      treemacs-projectile
+      use-package
+      visual-fill-column
+      which-key
+      writegood-mode
     ]
   ) ++ (
     with epkgs.elpaPackages; [
diff --git a/users/profiles/emacs/emacs.d/config/aesthetics.el b/users/profiles/emacs/emacs.d/config/aesthetics.el
index f9459e0..505460a 100644
--- a/users/profiles/emacs/emacs.d/config/aesthetics.el
+++ b/users/profiles/emacs/emacs.d/config/aesthetics.el
@@ -34,6 +34,10 @@
 ;; To move in a different config file
 (when (string-equal system-type "darwin")
   (setq mac-command-modifier 'ctrl))
+(use-package doom-modeline
+  :ensure t
+  :init (doom-modeline-mode 1))
+
 
 (defalias 'yes-or-no-p 'y-or-n-p)
 (setq use-dialog-box nil
diff --git a/users/profiles/emacs/emacs.d/config/config-evil.el b/users/profiles/emacs/emacs.d/config/config-evil.el
index f7d5f73..a310051 100644
--- a/users/profiles/emacs/emacs.d/config/config-evil.el
+++ b/users/profiles/emacs/emacs.d/config/config-evil.el
@@ -3,17 +3,16 @@
   :init
   (setq evil-want-keybinding nil)
   :config
-  (progn
     (evil-mode 1) ; globally enable evil-mode except for the following modes
     (mapcar (lambda (mode) (evil-set-initial-state mode 'emacs))
 	      '(vterm-mode
 		eshell-mode
 		dired-mode
-		))))
+		)))
 
-;; (use-package evil-collection
-;;   ; :after (evil company-mode vterm)
-;;   :config
-;;   (evil-collection-init))
+(use-package evil-collection
+  :after (evil)
+  :config
+  (evil-collection-init))
 
-(provide 'config-evil)
\ No newline at end of file
+(provide 'config-evil)
diff --git a/users/profiles/emacs/emacs.d/config/config-org.el b/users/profiles/emacs/emacs.d/config/config-org.el
index 0b2ddff..753df6f 100644
--- a/users/profiles/emacs/emacs.d/config/config-org.el
+++ b/users/profiles/emacs/emacs.d/config/config-org.el
@@ -6,10 +6,16 @@
   (org-startup-folded 'fold)
   (org-agenda-files '("~/roam/"))
   (org-ellipsis "⤵")
-  (org-startup-indented nil)
-  (org-superstar-remove-leading-stars t)
-  (org-superstar-leading-bullet ?\s)
-  (org-indent-mode-turns-on-hiding-stars nil)
+  (org-pretty-entities t)
+  (org-hide-emphasis-markers t)
+  (org-agenda-block-separator "")
+  (org-fontify-whole-heading-line t)
+  (org-fontify-done-headline t)
+  (org-fontify-quote-and-verse-blocks t)
+  (prettify-symbols-alist '(("#+BEGIN_SRC" . "λ")
+                            ("#+END_SRC" . "†")
+                            ("#+begin_src" . "λ")
+                            ("#+end_src" . "λ")))
   :hook 
   ((org-mode . auto-fill-mode) ;refill-mode breaks org headings 
    (org-mode . org-num-mode)
@@ -20,9 +26,7 @@
 				 (org-level-4 1.2)
 				 (org-level-5 1.1)))
 		   (set-face-attribute (car face) nil :weight 'semi-bold :height (cadr face)))))
-   (org-mode . prettify-symbols-mode))
-  :config
-  (org-indent-mode -1))
+   (org-mode . prettify-symbols-mode)))
 
 (use-package org-fragtog
   :custom
diff --git a/users/profiles/sway/default.nix b/users/profiles/sway/default.nix
index 55e90e9..2470275 100644
--- a/users/profiles/sway/default.nix
+++ b/users/profiles/sway/default.nix
@@ -63,6 +63,10 @@
                 xkb_variant = "intl";
               };
             };
+            keybindings  = {
+              "${modifier}+f" = "exec firefox";
+              "${modifier}+e" = "exec emacs";
+            };
           };
           extraConfig = ''
             bindsym ${modifier}+p move workspace to output right