diff --git a/lisp/icejam-base.el b/lisp/icejam-base.el
index 5659f00..6757441 100644
--- a/lisp/icejam-base.el
+++ b/lisp/icejam-base.el
@@ -15,7 +15,7 @@
 ;;;;;;;; Stolen from Doom Emacs. ;;;;;;;;;;;;;
 
 ;; Update emacs less often
-(setopt idle-update-delay 1.0)
+(setq idle-update-delay 1.0)
 
 ;; Disable bidirectional text rendering for a modest performance boost. I've set
 ;; this to `nil' in the past, but the `bidi-display-reordering's docs say that
@@ -26,16 +26,16 @@
 ;; Reduce rendering/line scan work for Emacs by not rendering cursors or regions
 ;; in non-focused windows.
 (setq-default cursor-in-non-selected-windows nil)
-(setopt highlight-nonselected-windows nil)
+(setq highlight-nonselected-windows nil)
 
 ;; More performant rapid scrolling over unfontified regions. May cause brief
 ;; spells of inaccurate syntax highlighting right after scrolling, which should
 ;; quickly self-correct.
-(setopt fast-but-imprecise-scrolling t)
+(setq fast-but-imprecise-scrolling t)
 
 ;;;;;;;;; TRAMP configuration ;;;;;;;;;;;;;;;;
 (require 'tramp)
-(setopt tramp-default-method "ssh")
+(setq tramp-default-method "ssh")
 
 ;;;;;;;;; Emacs bindings ;;;;;;;;;;;;;;;;;;;;;
 (global-set-key (kbd "RET") 'newline)
@@ -56,19 +56,19 @@
   (gcmh-mode t))
 
 ;; #====================== Backup config #==============================
-(setopt backup-directory-alist
+(setq backup-directory-alist
       `((".*" . "~/.emacs.d/backups/auto-save-list")))
-(setopt auto-save-file-name-transforms
+(setq auto-save-file-name-transforms
       `((".*", "~/.emacs.d/backups/auto-save-list" t)))
 
-(setopt backup-by-copying t)
-(setopt delete-old-versions t
+(setq backup-by-copying t)
+(setq delete-old-versions t
   kept-new-versions 6
   kept-old-versions 2
   version-control t)
 
 ; Do not create .#foo.file lock files
-(setopt create-lockfiles nil)
+(setq create-lockfiles nil)
 
 ;; Enable line numbers and show cursors position
 (add-hook 'prog-mode-hook 'display-line-numbers-mode)
@@ -78,16 +78,16 @@
 (column-number-mode t)
 
 ;; Turn off sounds
-(setopt ring-bell-function 'ignore)
+(setq ring-bell-function 'ignore)
 
 ;; Enable y/n answers to questions
 (setopt use-short-answers t)
 
 ;; Only warn if a file is bigger than 50 MB when trying to open it
-(setopt large-file-warning-threshold 50000000)
+(setq large-file-warning-threshold 50000000)
 
 ;; Numbers are arbitrary, but work on a large screen. Default is 160
-(setopt split-width-threshold 200)
+(setq split-width-threshold 200)
 ;;;;;;;;;;;;;;;;;;;;;; Shell stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on)
 
@@ -110,13 +110,13 @@
   (direnv-mode t))
 
 ;; Draw underline lower
-(setopt x-underline-at-descent-line t)
+(setq x-underline-at-descent-line t)
 
 ;;; Get rid of bad parts of the windows
 (tool-bar-mode -1)
 (scroll-bar-mode -1)
-(setopt indicate-buffer-boundaries nil
-        indicate-empty-lines nil)
+(setq indicate-buffer-boundaries nil
+      indicate-empty-lines nil)
 
 ;;;;;;;;;;;;;;;;; Treemacs
 (use-package treemacs :ensure t
diff --git a/lisp/icejam-company-yasnippet.el b/lisp/icejam-company-yasnippet.el
index f05a13b..3a63908 100644
--- a/lisp/icejam-company-yasnippet.el
+++ b/lisp/icejam-company-yasnippet.el
@@ -54,7 +54,7 @@
    )
 
   ;; Absolute defaults for company mode
-  (setopt company-backends
+  (setq company-backends
         '((company-files                ; files & directory
            company-keywords             ; keywords
            company-capf
diff --git a/lisp/icejam-completing-read.el b/lisp/icejam-completing-read.el
index 667684c..d5da6d7 100644
--- a/lisp/icejam-completing-read.el
+++ b/lisp/icejam-completing-read.el
@@ -9,7 +9,7 @@
 (require 'icejam-keys-mode)
 
 ;; Preparations for using Vertico/Orderless
-(setopt
+(setq
  ;; Support opening new minibuffers from inside existing minibuffers.
  enable-recursive-minibuffers t
  ;; Hide commands in M-x which do not work in the current mode.  Vertico
@@ -17,10 +17,10 @@
  ;; Vertico.
  read-extended-command-predicate #'command-completion-default-include-p
  ;; Do not allow the cursor in the minibuffer prompt
- minibuffer-prompt-properties
- '(read-only t cursor-intangible t face minibuffer-prompt))
+ minibuffer-prompt-properties '(read-only t cursor-intangible t face minibuffer-prompt))
 
 (defun crm-indicator (args)
+>>>>>>> use-elpaca
   (cons (format "[CRM%s] %s"
                 (replace-regexp-in-string
                  "\\`\\[.*?]\\*\\|\\[.*?]\\*\\'" ""
diff --git a/lisp/icejam-custom-init.el b/lisp/icejam-custom-init.el
index b9c0682..6c8aa3d 100644
--- a/lisp/icejam-custom-init.el
+++ b/lisp/icejam-custom-init.el
@@ -11,11 +11,11 @@
 ;;; Code:
 
 ;; Set GC at 500 MB for startup
-(setopt gc-cons-threshold 500000000)
-(setopt gc-cons-percentage 0.6)
+(setq gc-cons-threshold 500000000)
+(setq gc-cons-percentage 0.6)
 
 ;; Allow for deeper stacktraces / recursion
-;; (setopt max-lisp-eval-depth 10000)
+;; (setq max-lisp-eval-depth 10000)
 
 ;;; Use elpaca for package management.
 (defvar elpaca-installer-version 0.7)
@@ -58,8 +58,8 @@
 (elpaca `(,@elpaca-order))
 
 ;; Use package settings
-(setopt use-package-verbose t)
-(setopt use-package-compute-statistics t)
+(setq use-package-verbose t)
+(setq use-package-compute-statistics t)
 (elpaca elpaca-use-package
   ;; Enable use-package :ensure support for Elpaca.
   (elpaca-use-package-mode))
@@ -135,8 +135,8 @@
 (require 'icejam-diminish)
 
 ;; Restore GC to normal, but still high
-(setopt gc-cons-threshold 200000000)
-(setopt gc-cons-percentage 0.2)
+(setq gc-cons-threshold 200000000)
+(setq gc-cons-percentage 0.2)
 
 (provide 'icejam-custom-init)
 ;;; icejam-custom-init.el ends here
diff --git a/lisp/icejam-flycheck.el b/lisp/icejam-flycheck.el
index 4477e2b..9955eab 100644
--- a/lisp/icejam-flycheck.el
+++ b/lisp/icejam-flycheck.el
@@ -7,7 +7,7 @@
   :custom ((flycheck-emacs-lisp-load-path 'inherit))
   :config
   (global-flycheck-mode t)
-  (setopt flycheck-emacs-lisp-load-path 'inherit)
+  (setq flycheck-emacs-lisp-load-path 'inherit)
   (unbind-key "C-c ! C-c" flycheck-mode-map)
   (unbind-key "C-c ! C-w" flycheck-mode-map)
   (unbind-key "C-c ! ?" flycheck-mode-map)
diff --git a/lisp/icejam-fonts.el b/lisp/icejam-fonts.el
index 7b57db3..d4059c1 100644
--- a/lisp/icejam-fonts.el
+++ b/lisp/icejam-fonts.el
@@ -50,7 +50,7 @@ in icejam-set-font-to-screen.")
 
 (defun icejam-set-lsp-ui-font-hook ()
   "Reset LSP IO font to specified icejam-font and icejam-font-size."
-  (setopt lsp-ui-doc-frame-hook nil)
+  (setq lsp-ui-doc-frame-hook nil)
   (add-hook 'lsp-ui-doc-frame-hook
             (lambda (frame _w)
               (set-face-attribute
@@ -60,8 +60,8 @@ in icejam-set-font-to-screen.")
 (defun icejam-set-font (name size)
   "Set font to NAME and its SIZE to X pixels."
   (interactive "sNew font: \nnEnter size for %s: ")
-  (setopt icejam-mut-font name)
-  (setopt icejam-mut-font-size size)
+  (setq icejam-mut-font name)
+  (setq icejam-mut-font-size size)
 
   (set-face-attribute 'default nil :font (format "%s %d" name size))
 
diff --git a/lisp/icejam-prog-mode.el b/lisp/icejam-prog-mode.el
index 9bfe091..decd613 100644
--- a/lisp/icejam-prog-mode.el
+++ b/lisp/icejam-prog-mode.el
@@ -47,8 +47,8 @@
   (add-to-list 'dash-at-point-mode-alist '(elixir-ts-mode . "elixir,hex")))
 
 ;; By default, use 2 spaces for indentation
-(setopt tab-width 2)
-(setopt tab-stop-list (number-sequence tab-width 200 tab-width))
+(setq tab-width 2)
+(setq tab-stop-list (number-sequence tab-width 200 tab-width))
 
 ;; Ensure indentation in steps:
 (defun icejam-set-indent (step)
diff --git a/lisp/icejam-themes.el b/lisp/icejam-themes.el
index d79a0bc..32eb4db 100644
--- a/lisp/icejam-themes.el
+++ b/lisp/icejam-themes.el
@@ -54,7 +54,7 @@
 
 ;; My own theme modifications:
 (with-eval-after-load 'base16-theme
-  (setopt base16-theme-256-color-source 'colors)
+  (setq base16-theme-256-color-source "colors")
   (require 'icejam-base16-zenburn)
   (require 'icejam-base16-harmonic-light)