diff --git a/README.org b/README.org
index a6546c8..34f08a1 100644
--- a/README.org
+++ b/README.org
@@ -542,11 +542,110 @@ Emacs service
 services.emacs = {
   enable = true;
   package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages 
-    (epkgs: [
-      epkgs.vterm
-      epkgs.magit
-      epkgs.pdf-tools
-    pkgs.mu ]));
+    (epkgs: with epkgs; [
+      vterm
+      magit
+      pdf-tools
+      eglot
+      consult-eglot
+      org
+      org-roam
+      command-log-mode
+      all-the-icons
+      doom-modeline
+      doom-themes
+      rainbow-delimiters
+      smartparens
+      aggressive-indent
+      adaptive-wrap
+      which-key
+      exec-path-from-shell
+      no-littering
+      evil
+      evil-collection
+      general
+      evil-escape
+      evil-surround
+      evil-org
+      org-super-agenda
+      websocket
+      org-roam-ui
+      org-present
+      org-modern
+      unicode-fonts
+      emojify
+      undo-tree
+      visual-fill-column
+      toc-org
+      pulsar
+      vertico
+      consult
+      marginalia
+      all-the-icons-completion
+      embark
+      embark-consult
+      corfu
+      orderless
+      cape
+      devdocs
+      yasnippet
+      tempel
+      projectile
+      simple-httpd
+      avy
+      evil-avy
+      ace-link
+      ace-window
+      helpful
+      format-all
+      web-mode
+      lua-mode
+      nix-mode
+      cmake-mode
+      fennel-mode
+      yaml-mode
+      docker
+      docker-tramp
+      fish-mode
+      markdown-mode
+      qml-mode
+      csv-mode
+      restclient
+      ob-restclient
+      dart-mode
+      flutter
+      hover
+      direnv
+      all-the-icons-dired
+      dired-single
+      dired-rainbow
+      diredfl
+      dired-rsync
+      ledger-mode
+      org-msg
+      calfw
+      calfw-org
+      calfw-ical
+      org-caldav
+      org-wild-notifier
+      magit
+      sly
+      nov
+      elfeed
+      elfeed-org
+      bongo
+      emms
+      transmission
+      hass
+      pass
+      password-store
+      password-store-otp
+      plz
+      ement
+      qrencode
+      gcmh
+      use-package
+      pkgs.mu ]));
 };
 #+end_src
 
@@ -935,11 +1034,11 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a
     <<base-packages>>
     <<general-packages>>
     blender
-      neofetch
-      # ethminer
-      lutris
-      protonup
-      nvtop
+    neofetch
+    # ethminer
+    lutris
+    protonup
+    nvtop
     # Dev tools
     <<dev-tools>>
     <<lightlyshaders>>
diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix
index 24c353f..a812f65 100644
--- a/system/kaladin/configuration.nix
+++ b/system/kaladin/configuration.nix
@@ -337,11 +337,11 @@
     # hyprland
     
     blender
-      neofetch
-      # ethminer
-      lutris
-      protonup
-      nvtop
+    neofetch
+    # ethminer
+    lutris
+    protonup
+    nvtop
     # Dev tools
     # android-tools
     nix-index
@@ -411,11 +411,110 @@
   services.emacs = {
     enable = true;
     package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages 
-      (epkgs: [
-        epkgs.vterm
-        epkgs.magit
-        epkgs.pdf-tools
-      pkgs.mu ]));
+      (epkgs: with epkgs; [
+        vterm
+        magit
+        pdf-tools
+        eglot
+        consult-eglot
+        org
+        org-roam
+        command-log-mode
+        all-the-icons
+        doom-modeline
+        doom-themes
+        rainbow-delimiters
+        smartparens
+        aggressive-indent
+        adaptive-wrap
+        which-key
+        exec-path-from-shell
+        no-littering
+        evil
+        evil-collection
+        general
+        evil-escape
+        evil-surround
+        evil-org
+        org-super-agenda
+        websocket
+        org-roam-ui
+        org-present
+        org-modern
+        unicode-fonts
+        emojify
+        undo-tree
+        visual-fill-column
+        toc-org
+        pulsar
+        vertico
+        consult
+        marginalia
+        all-the-icons-completion
+        embark
+        embark-consult
+        corfu
+        orderless
+        cape
+        devdocs
+        yasnippet
+        tempel
+        projectile
+        simple-httpd
+        avy
+        evil-avy
+        ace-link
+        ace-window
+        helpful
+        format-all
+        web-mode
+        lua-mode
+        nix-mode
+        cmake-mode
+        fennel-mode
+        yaml-mode
+        docker
+        docker-tramp
+        fish-mode
+        markdown-mode
+        qml-mode
+        csv-mode
+        restclient
+        ob-restclient
+        dart-mode
+        flutter
+        hover
+        direnv
+        all-the-icons-dired
+        dired-single
+        dired-rainbow
+        diredfl
+        dired-rsync
+        ledger-mode
+        org-msg
+        calfw
+        calfw-org
+        calfw-ical
+        org-caldav
+        org-wild-notifier
+        magit
+        sly
+        nov
+        elfeed
+        elfeed-org
+        bongo
+        emms
+        transmission
+        hass
+        pass
+        password-store
+        password-store-otp
+        plz
+        ement
+        qrencode
+        gcmh
+        use-package
+        pkgs.mu ]));
   };
   services.samba-wsdd.enable = true;
   services.samba = {