diff --git a/config.el b/emacs/config.el
similarity index 94%
rename from config.el
rename to emacs/config.el
index c8029de..50f8deb 100644
--- a/config.el
+++ b/emacs/config.el
@@ -24,11 +24,6 @@
   :hook ((prog-mode . display-line-numbers-mode)
 	 (text-mode . display-line-numbers-mode)))
 
-(use-package dracula-theme
-  :ensure t
-  :config
-  (load-theme 'dracula t))
-
 (use-package spacious-padding
   :ensure t
   :init
@@ -178,8 +173,9 @@
          ("C-x C-d" . consult-dir)
          ("C-x C-j" . consult-dir-jump-file)))
 
-(use-package package
-  :init
-  (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t))
+(use-package base16-theme
+  :ensure t
+  :config
+  (load-theme 'base16-oxocarbon-dark t))
 
 (provide 'config)
diff --git a/emacs/mkEmacs.nix b/emacs/mkEmacs.nix
index a707d08..dc1e530 100644
--- a/emacs/mkEmacs.nix
+++ b/emacs/mkEmacs.nix
@@ -18,59 +18,23 @@ in
       package = emacs;
       defaultInitFile = true;
       alwaysEnsure = true;
-      alwaysTangle = true;
-      config = ./config.org;
+      config = ./config.el;
       extraEmacsPackages =
         e:
         builtins.attrValues {
           inherit (e)
-            nix-mode
-            vertico
-            orderless
-            marginalia
-            embark
-            consult
-            embark-consult
-            consult-dir
-            doom-modeline
-            flycheck
-            which-key
-            lsp-mode
-            lsp-ui
-            lsp-pyright
-            treemacs
-            lsp-treemacs
-            consult-lsp
-            treemacs-icons-dired
-            treemacs-nerd-icons
-            nerd-icons
-            all-the-icons
-            projectile
-            treemacs-projectile
-            magit
-            treemacs-magit
-            rustic
-            haskell-mode
-            envrc
-            ccls
-            org-roam
             spacious-padding
-            mood-line
-            ement
-            autothemer
-            geiser-guile
-            lsp-haskell
-            catppuccin-theme
-            zig-mode
+            nano-modeline
+            orderless
+            corfu
+            which-key
+            marginalia
+            vertico
+            consult
+            embark
+            embark-consult
+	    base16-theme
             ;
-
-          treesit-grammars = e.treesit-grammars.with-all-grammars;
-          inherit (pkgs) python3;
-
-          # oxocarbon-theme = mkEmacsPackage e "oxocarbon-theme" "0.1.0" (pkgs.fetchurl {
-          #   url = "https://raw.githubusercontent.com/konrad1977/emacs/main/themes/oxocarbon-theme.el";
-          #   hash = "sha256-jD4DYc7aePuAF3m323YAi7jzE6ZpsSWb/zdmEgjFCns=";
-          # }) [ e.autothemer ];
         };
       override = _: prev: { use-package = prev.emacs; };
     };