Merge remote-tracking branch 'origin/master'

For desktop

838 files changed, 4598 insertions, 10504 deletions

diff --git a/.gitignore b/.gitignore
index 1ffd3e2..8590494 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,8 @@ TAGS
 /Emacs/.config/emacs/eln-cache/
 /Emacs/.config/emacs/core.el
 /Emacs/.config/emacs/app.el
+/Emacs/.config/emacs/lang.el
+/Mail/.local/share/mail/
+/Pictures/
+/SystemD/.config/systemd/user/default.target.wants/
+/SystemD/.config/systemd/user/timers.target.wants/
\ No newline at end of file
diff --git a/Doom/.config/doom/+keymap.el b/Doom/.config/doom/+keymap.el
deleted file mode 100644
index 6c7a638..0000000
--- a/Doom/.config/doom/+keymap.el
+++ /dev/null
@@ -1,50 +0,0 @@
-;;; ~/Dotfiles/Doom/.config/doom/elisp/+keymap.el -*- lexical-binding: t; -*-
-
-;;; Leader
-(map!
- :leader
- ;; Single binds
- "SPC" #'execute-extended-command
- "!"   #'async-shell-command
- "T"   #'eshell
- "C"   #'calc
- "-"   #'dired-jump
- "_"   #'dired-jump-other-window
- "w"   #'ace-window
-
- ;; Personal
- (:prefix ("m" . "personal")
-  :desc   "Open books"         "b"  #'(lambda () (interactive) (dired (concat org-directory "/Books"))); I like my books
-  :desc   "Convert auto-fill"  "f"  #'dx:org/fill-to-long-lines
-  :desc   "Change theme"       "t"  #'dx:themes/set-new-theme ; From my own collection
-  :desc   "Generate template"  "g"  #'+gentemplate/generate-template) ; From my own collection
-
- ;; Projectile
- (:after projectile
-  (:prefix "f"
-   "g" #'projectile-regenerate-tags
-   "p" #'(lambda () (interactive) (doom-project-find-file "~/Dotfiles")))
-  ">"  #'projectile-switch-to-buffer)
-
- ;; Search
- (:prefix "s"
-  (:after counsel-etags
-   "t"  #'counsel-etags-find-tag)
-  (:after counsel
-   "s"  #'counsel-grep-or-swiper
-   "r"  #'counsel-rg))
-
- ;; Code
- (:prefix "c"
-  "m"  #'+make/run))
-
-;;; Non leader
-(map!
- (:after evil
-  "TAB" #'evil-jump-item)
- "M-v" #'dx:newline
- "M-V" #'(lambda () (interactive) (dx:newline 1)))
-
-;;; Remaps
-(define-key!
-  [remap compile]           #'compile)
diff --git a/Doom/.config/doom/README.org b/Doom/.config/doom/README.org
deleted file mode 100644
index 84befd9..0000000
--- a/Doom/.config/doom/README.org
+++ /dev/null
@@ -1,12 +0,0 @@
-#+TITLE:   εmacs configuration
-#+DATE:    December 30, 2019
-#+STARTUP: inlineimages nofold
-
-This is my Doom Emacs configuration. Use the links below to access various parts
-of my config.
-
-[[file:org/config.org][Main config]]
-
-[[file:config.el][Literate setup]]
-
-[[file:org/personal.org][Personal functions module]]
diff --git a/Doom/.config/doom/config.el b/Doom/.config/doom/config.el
deleted file mode 100644
index dd54d9a..0000000
--- a/Doom/.config/doom/config.el
+++ /dev/null
@@ -1,20 +0,0 @@
-;;; ~/Dotfiles/doom.d/config.el -*- lexical-binding: t; -*-
-
-(defconst +bootstrap/org-files '("config.org" "personal.org") "Org files to load relative to =doom-private-dir=/org/*")
-(defconst +bootstrap/byte-compile t "Byte compile org files")
-
-(defun +bootstrap/apply-files (babel-func)
-  "Apply babel-func to a transformed list of org-files"
-  (cl-map nil #'(lambda (file) (funcall babel-func (expand-file-name (concat doom-private-dir "org/" file)))) +bootstrap/org-files))
-
-(defun +bootstrap/load-files ()
-  "Load org files into current Emacs session via =org-babel-load-file="
-  (interactive)
-  (+bootstrap/apply-files #'org-babel-load-file))
-
-(defun +bootstrap/compile-files ()
-  "Compile org files via =org-babel-tangle-file="
-  (interactive)
-  (+bootstrap/apply-files #'org-babel-tangle-file))
-
-(+bootstrap/load-files)
diff --git a/Doom/.config/doom/init.el b/Doom/.config/doom/init.el
deleted file mode 100644
index 9e4e22e..0000000
--- a/Doom/.config/doom/init.el
+++ /dev/null
@@ -1,262 +0,0 @@
-;;; init.el -*- lexical-binding: t; -*-
-
-;; Copy this file to ~/.doom.d/init.el or ~/.config/doom/init.el ('doom
-;; quickstart' will do this for you). The `doom!' block below controls what
-;; modules are enabled and in what order they will be loaded. Remember to run
-;; 'doom refresh' after modifying it.
-;;
-;; More information about these modules (and what flags they support) can be
-;; found in modules/README.org.
-(doom! :input
-       ;;chinese
-       ;;japanese
-
-       :completion
-       (company +childframe)           ; the ultimate code completion backend
-       (ivy
-        +fuzzy
-        +icons)         ; a search engine for love and life
-       ;;(helm
-       ;; +fuzzy)              ; the *other* search engine for love and life
-       ;;ido               ; the other *other* search engine...
-
-       :ui
-       ;;deft              ; notational velocity for Emacs
-       doom              ; what makes DOOM look the way it does
-       ;; doom-dashboard    ; a nifty splash screen for Emacs
-       doom-quit         ; DOOM quit-message prompts when you quit Emacs
-       ;;fill-column       ; a `fill-column' indicator
-       hl-todo           ; highlight TODO/FIXME/NOTE tags
-       indent-guides     ; highlighted indent columns
-       ;;(modeline)          ; snazzy, Atom-inspired modeline, plus API
-
-       nav-flash         ; blink the current line after jumping
-       ;;neotree           ; a project drawer, like NERDTree for vim
-       ophints           ; highlight the region an operation acts on
-       (popup            ; tame sudden yet inevitable temporary windows
-        +all             ; catch all popups that start with an asterix
-        +defaults)       ; default popup rules
-       (pretty-code +fira)       ; replace bits of code with pretty symbols
-       ;;tabs            ; FIXME an (incomplete) tab bar for Emacs
-       ;;treemacs          ; a project drawer, like neotree but cooler
-       ;;unicode           ; extended unicode support for various languages
-       vc-gutter         ; vcs diff in the fringe
-       vi-tilde-fringe   ; fringe tildes to mark beyond EOB
-       window-select     ; visually switch windows
-       workspaces        ; tab emulation, persistence & separate workspaces
-       zen
-
-       :editor
-       (evil +everywhere); come to the dark side, we have cookies
-       file-templates    ; auto-snippets for empty files
-       fold              ; (nigh) universal code folding
-       format  ; automated prettiness
-       ;;lispy             ; vim for lisp, for people who dont like vim
-       multiple-cursors  ; editing in many places at once
-       ;;objed             ; text object editing for the innocent
-       ;;parinfer          ; turn lisp into python, sort of
-       rotate-text       ; cycle region at point between text candidates
-       snippets          ; my elves. They type so I don't have to
-
-       :emacs
-       (dired            ; making dired pretty [functional]
-        ;; +ranger         ; bringing the goodness of ranger to dired
-        +icons)          ; colorful icons for dired-mode
-       electric          ; smarter, keyword-based electric-indent
-       vc                ; version-control and Emacs, sitting in a tree
-       (ibuffer +icons)
-
-       :term
-       eshell            ; a consistent, cross-platform shell (WIP)
-       ;;shell             ; a terminal REPL for Emacs
-       ;;term              ; terminals in Emacs
-       vterm             ; another terminals in Emacs
-
-       :checkers
-       syntax         ; tasing you for every semicolon you forget
-       spell         ; tasing you for misspelling mispelling
-
-       :tools
-       ;;ansible
-       debugger          ; FIXME stepping through code, to help you add bugs
-       ;;direnv
-       ;;docker
-       ;;editorconfig      ; let someone else argue about tabs vs spaces
-       ;;ein               ; tame Jupyter notebooks with emacs
-       (eval +overlay)              ; run code, run (also, repls)
-       ;;gist              ; interacting with github gists
-       (lookup)           ; helps you navigate your code and documentation
-       lsp
-       ;;macos             ; MacOS-specific commands
-       magit             ; a git porcelain for Emacs
-       make              ; run make tasks from Emacs
-       ;;pass              ; password manager for nerds
-       ;;pdf               ; pdf enhancements
-       ;;prodigy           ; FIXME managing external services & code builders
-       rgb               ; creating color strings
-       ;;terraform         ; infrastructure as code
-       ;;tmux              ; an API for interacting with tmux
-       ;;upload            ; map local to remote projects via ssh/ftp
-
-       :lang
-       ;;agda              ; types of types of types of types...
-       ;;assembly          ; assembly for fun or debugging
-       (cc
-        +lsp)                ; C/C++/Obj-C madness
-       ;;clojure           ; java with a lisp
-       ;;common-lisp       ; if you've seen one lisp, you've seen them all
-       ;;coq               ; proofs-as-programs
-       ;;crystal           ; ruby at the speed of c
-       ;;(csharp +unity)            ; unity, .NET, and mono shenanigans
-       data              ; config/data formats
-       ;;erlang            ; an elegant language for a more civilized age
-       ;;elixir            ; erlang done right
-       ;;elm               ; care for a cup of TEA?
-       emacs-lisp        ; drown in parentheses
-       ;;ess               ; emacs speaks statistics
-       ;;(fsharp +lsp)           ; ML stands for Microsoft's Language
-       ;;go                ; the hipster dialect
-       (haskell) ; a language that's lazier than I am
-       ;;hy                ; readability of scheme w/ speed of python
-       ;;idris             ;
-       ;;(java +lsp) ; the poster child for carpal tunnel syndrome
-       (javascript
-        +lsp)        ; all(hope(abandon(ye(who(enter(here))))))
-       ;;julia             ; a better, faster MATLAB
-       ;;kotlin            ; a better, slicker Java(Script)
-       (latex)             ; writing papers in Emacs has never been so fun
-       ;;ledger            ; an accounting system in Emacs
-       ;;lua               ; one-based indices? one-based indices
-       markdown          ; writing docs for people to ignore
-       ;;nim               ; python + lisp at the speed of c
-       ;;nix               ; I hereby declare "nix geht mehr!"
-       (org              ; organize your plain life in plain text
-        +dragndrop       ; file drag & drop support
-        +ipython         ; ipython support for babel
-        +pandoc          ; pandoc integration into org's exporter
-        +pomodoro
-        +gnuplot
-        +present)        ; using Emacs for presentations
-       ;;perl              ; write code no one else can comprehend
-       ;;php               ; perl's insecure younger brother
-       ;;plantuml          ; diagrams for confusing people more
-       ;;purescript        ; javascript, but functional
-       (python +lsp)            ; beautiful is better than ugly
-       ;;qt                ; the 'cutest' gui framework ever
-       ;;racket            ; a DSL for DSLs
-       ;;rest              ; Emacs as a REST client
-       ;;ruby              ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       (rust +lsp)              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
-       ;;scala             ; java, but good
-       sh                ; she sells {ba,z,fi}sh shells on the C xor
-       ;;solidity          ; do you need a blockchain? No.
-       ;;swift             ; who asked for emoji variables?
-       ;;terra             ; Earth and Moon in alignment for performance.
-       web               ; the tubes
-       ;;vala              ; GObjective-C
-
-       :email
-       ;;(mu4e +gmail)       ; WIP
-       ;;notmuch             ; WIP
-       ;;(wanderlust +gmail) ; WIP
-
-       ;; Applications are complex and opinionated modules that transform Emacs
-       ;; toward a specific purpose. They may have additional dependencies and
-       ;; should be loaded late.
-       :app
-       ;;calendar
-       ;;irc              ; how neckbeards socialize
-       ;;rss        ; emacs as an RSS reader
-       ;;twitter           ; twitter client https://twitter.com/vnought
-
-       :config
-       ;; For literate config users. This will tangle+compile a config.org
-       ;; literate config in your `doom-private-dir' whenever it changes.
-       ;; literate
-
-       ;; The default module sets reasonable defaults for Emacs. It also
-       ;; provides a Spacemacs-inspired keybinding scheme and a smartparens
-       ;; config. Use it as a reference for your own modules.
-       (default +bindings +smartparens)
-       :private
-       ;;(oreoline)
-       ;;bindings
-       gentemplate
-       narrow
-       mail
-       ;;completion
-       ;; (ocaml +lsp)
-       ;; (rss +elfeed)
-       )
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(ansi-color-names-vector
-   ["#1c1e1f" "#ff6c6b" "#98be65" "#ECBE7B" "#51afef" "#c678dd" "#46D9FF" "#bbc2cf"])
- '(c-basic-offset 2)
- '(c-default-style
-   '((c-mode . "linux")
-     (c++-mode . "linux")
-     (csharp-mode . "java")))
- '(c-offsets-alist '((c . c-lineup-C-comments)))
- '(custom-safe-themes
-   '("f2b83b9388b1a57f6286153130ee704243870d40ae9ec931d0a1798a5a916e76" "8c1dd3d6fdfb2bee6b8f05d13d167f200befe1712d0abfdc47bb6d3b706c3434" "b3bcf1b12ef2a7606c7697d71b934ca0bdd495d52f901e73ce008c4c9825a3aa" "93268bf5365f22c685550a3cbb8c687a1211e827edc76ce7be3c4bd764054bad" "f30aded97e67a487d30f38a1ac48eddb49fdb06ac01ebeaff39439997cbdd869" "7ffb0d3d0c797b980ed7330adc04a66516d49a61e4187a7054dda014676421d9" "cabc32838ccceea97404f6fcb7ce791c6e38491fd19baa0fcfb336dcc5f6e23c" "d8e3a2b8c72c3cb52d070a5e1969849197488b92d7211cc86c97e033239fdde2" "1728dfd9560bff76a7dc6c3f61e9f4d3e6ef9d017a83a841c117bd9bebe18613" "423435c7b0e6c0942f16519fa9e17793da940184a50201a4d932eafe4c94c92d" "fe76f3d5094967034192f6a505085db8db6deb0e135749d9a54dc488d6d3ee2f" "0d087b2853473609d9efd2e9fbeac088e89f36718c4a4c89c568dd1b628eae41" "c8f959fb1ea32ddfc0f50db85fea2e7d86b72bb4d106803018be1c3566fd6c72" "7d56fb712ad356e2dacb43af7ec255c761a590e1182fe0537e1ec824b7897357" "a2286409934b11f2f3b7d89b1eaebb965fd63bc1e0be1c159c02e396afb893c8" "66d53738cc824d0bc5b703276975581b8de2b903d6ce366cd62207b5dd6d3d13" "0fe9f7a04e7a00ad99ecacc875c8ccb4153204e29d3e57e9669691e6ed8340ce" "2878517f049b28342d7a360fd3f4b227086c4be8f8409f32e0f234d129cee925" "f951343d4bbe5a90dba0f058de8317ca58a6822faa65d8463b0e751a07ec887c" "428754d8f3ed6449c1078ed5b4335f4949dc2ad54ed9de43c56ea9b803375c23" "f8c30fa07ba7e8fe884f22b428dae6724955fa61ad84a658c3b0164ae391fb52" "a16e816774b437acb78beb9916a60ea236cfcd05784227a7d829623f8468c5a2" "9c27124b3a653d43b3ffa088cd092c34f3f82296cf0d5d4f719c0c0817e1afa6" "e838d6375a73fda607820c65eb3ea1f9336be7bd9a5528c9161e10c4aa663b5b" "427fa665823299f8258d8e27c80a1481edbb8f5463a6fb2665261e9076626710" "4e132458143b6bab453e812f03208075189deca7ad5954a4abb27d5afce10a9a" "06e4b3fdcbadc29ff95a7146dee846cd027cfefca871b2e9142b54ad5de4832f" "8e04ea7bf8a736b0bfacd363f4810ffce774ff9ba24f356172ae2b83307aebb2" "614e5089876ea69b515c50b6d7fa0a37eb7ed50fda224623ec49e1c91a0af6a1" "8047ac280914cbe8dcdc489703c398f0941339cfca77dfc09f3641f1f040267c" "1a6d627434899f6d21e35b85fee62079db55ef04ecd9b70b82e5d475406d9c69" "43c808b039893c885bdeec885b4f7572141bd9392da7f0bd8d8346e02b2ec8da" "2f0cbe053485bccbbbb582acdba7c7c9585ad808ee8ab32f0d727c3d39b42275" "f5568ed375abea716d1bdfae0316d1d179f69972eaccd1f331b3e9863d7e174a" "b0fd04a1b4b614840073a82a53e88fe2abc3d731462d6fde4e541807825af342" "155a5de9192c2f6d53efcc9c554892a0d87d87f99ad8cc14b330f4f4be204445" "cdb3e7a8864cede434b168c9a060bf853eeb5b3f9f758310d2a2e23be41a24ae" "8c847a5675ece40017de93045a28ebd9ede7b843469c5dec78988717f943952a" "ef4edbfc3ec509612f3cf82476beddd2aeb3da7bdc3a35726337a0cc838a4ef4" "e3c87e869f94af65d358aa279945a3daf46f8185f1a5756ca1c90759024593dd" "34c99997eaa73d64b1aaa95caca9f0d64229871c200c5254526d0062f8074693" "cb477d192ee6456dc2eb5ca5a0b7bd16bdb26514be8f8512b937291317c7b166" "fd944f09d4d0c4d4a3c82bd7b3360f17e3ada8adf29f28199d09308ba01cc092" "8db4b03b9ae654d4a57804286eb3e332725c84d7cdab38463cb6b97d5762ad26" "a28d89cf398c60dade1b0a7e3dce9d4691c236c05a050b7e6ba808bfce2622e1" "80365dd15f97396bdc38490390c23337063c8965c4556b8f50937e63b5e9a65c" "f0dc4ddca147f3c7b1c7397141b888562a48d9888f1595d69572db73be99a024" "6d589ac0e52375d311afaa745205abb6ccb3b21f6ba037104d71111e7e76a3fc" "9954ed41d89d2dcf601c8e7499b6bb2778180bfcaeb7cdfc648078b8e05348c6" "75d3dde259ce79660bac8e9e237b55674b910b470f313cdf4b019230d01a982a" "10461a3c8ca61c52dfbbdedd974319b7f7fd720b091996481c8fb1dded6c6116" "797f9204474ae55a3f65d2fc5fb28caf117bb7e0e3eaac58729a9edb38bf7f14" "256bd513a9875cd855077162cdfee8d75b0ad7e18fe8b8cbc10412561fbef892" default))
- '(doom-themes-treemacs-theme "doom-colors")
- '(elcord-use-major-mode-as-main-icon t)
- '(evil-ex-search-highlight-all t)
- '(evil-ex-search-persistent-highlight nil)
- '(fci-rule-color "#5B6268")
- '(flymake-proc-allowed-file-name-masks
-   '(("\"\\\\.ino\\\\\"" flymake-proc-simple-make-init nil nil)
-     ("\\.\\(?:c\\(?:pp\\|xx\\|\\+\\+\\)?\\|CC\\)\\'" flymake-proc-simple-make-init nil flymake-proc-real-file-name-considering-includes)
-     ("\\.xml\\'" flymake-proc-xml-init nil nil)
-     ("\\.html?\\'" flymake-proc-xml-init nil nil)
-     ("\\.cs\\'" flymake-proc-simple-make-init nil nil)
-     ("\\.php[345]?\\'" flymake-proc-php-init nil nil)
-     ("\\.h\\'" flymake-proc-master-make-header-init flymake-proc-master-cleanup nil)
-     ("\\.java\\'" flymake-proc-simple-make-java-init flymake-proc-simple-java-cleanup nil)
-     ("[0-9]+\\.tex\\'" flymake-proc-master-tex-init flymake-proc-master-cleanup nil)
-     ("\\.tex\\'" flymake-proc-simple-tex-init nil nil)
-     ("\\.idl\\'" flymake-proc-simple-make-init nil nil)))
- '(jdee-db-active-breakpoint-face-colors (cons "#1B2229" "#51afef"))
- '(jdee-db-requested-breakpoint-face-colors (cons "#1B2229" "#98be65"))
- '(jdee-db-spec-breakpoint-face-colors (cons "#1B2229" "#3f444a"))
- '(js-indent-level 2)
- '(objed-cursor-color "#ff6c6b")
- '(org-agenda-files '("~/Dotfiles/doom.d/config.org"))
- '(package-selected-packages
-   '(moe-theme yaml-imenu tao-theme sane-term nginx-mode mingus lorem-ipsum insert-kaomoji hindent flycheck-yamllint emms crm-custom counsel-fd ada-mode))
- '(pug-tab-width 2)
- '(safe-local-variable-values
-   '((org-babel-default-header-args:elisp
-      (:results . "none"))))
- '(vc-annotate-background "#282c34")
- '(vc-annotate-color-map
-   (list
-    (cons 20 "#98be65")
-    (cons 40 "#b4be6c")
-    (cons 60 "#d0be73")
-    (cons 80 "#ECBE7B")
-    (cons 100 "#e6ab6a")
-    (cons 120 "#e09859")
-    (cons 140 "#da8548")
-    (cons 160 "#d38079")
-    (cons 180 "#cc7cab")
-    (cons 200 "#c678dd")
-    (cons 220 "#d974b7")
-    (cons 240 "#ec7091")
-    (cons 260 "#ff6c6b")
-    (cons 280 "#cf6162")
-    (cons 300 "#9f585a")
-    (cons 320 "#6f4e52")
-    (cons 340 "#5B6268")
-    (cons 360 "#5B6268")))
- '(vc-annotate-very-old-color nil))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )
diff --git a/Doom/.config/doom/modules/private/bindings/README.org b/Doom/.config/doom/modules/private/bindings/README.org
deleted file mode 100644
index 6bc6f68..0000000
--- a/Doom/.config/doom/modules/private/bindings/README.org
+++ /dev/null
@@ -1,188 +0,0 @@
-#+TITLE: private/bindings Literate configuration
-
-* Introduction
-This is the main document for this module (=private/bindings=).
-To compile, simply execute the source code block below
-#+BEGIN_SRC elisp :tangle no
-(org-babel-tangle-file "README.org" "config.el")
-#+END_SRC
-* Initial
-Set the localleader to "SPC ,"
-#+BEGIN_SRC elisp
-;;; private/bindings/config.el -*- lexical-binding: t; -*-
-(setq doom-leader-key "SPC")
-(setq doom-localleader-key "SPC ,")
-#+END_SRC
-* Leader
-Bindings for the leader map
-** Single binds
-These are immediate bindings to the leader map that instantly launch functions when pressed.
-This binding space is reserved for stuff I use quite often.
-#+BEGIN_SRC elisp
-(map!
- :leader
- "SPC" #'execute-extended-command
- "!"   #'async-shell-command
- "T"   #'eshell
- "C"   #'calc
- "-"   #'dired-jump
- "_"   #'dired-jump-other-window
- ";"   #'eval-expression
- "h"   #'help-command
- "w"   #'ace-window)
-#+END_SRC
-** Files
-#+BEGIN_SRC elisp
-(map!
- :leader
- :prefix "f"
- "r"  #'recentf-open-files
- (:after projectile
-  "p"  #'(lambda () (interactive) (doom-project-find-file "~/Dotfiles")))
- "f"  #'find-file
- "s"  #'save-buffer
- "d"  #'dired)
-#+END_SRC
-** Buffers
-#+BEGIN_SRC elisp
-(map!
- :leader
- :prefix "b"
- "n" #'next-buffer
- "p" #'previous-buffer
- "d" #'kill-current-buffer
- "b" #'switch-to-buffer
- "i" #'ibuffer)
-#+END_SRC
-** Search
-#+BEGIN_SRC elisp
-(map!
- :leader
- :prefix "s"
- "i"  #'imenu
- "o"  #'+lookup/online
- (:after counsel
-  "s" #'swiper
-  "r" #'counsel-rg)
- (:after counsel-etags
-  "t" #'counsel-etags-find-tag))
-#+END_SRC
-** Projectile
-#+BEGIN_SRC elisp
-(map!
- :leader
- :after projectile
- ">"  #'projectile-switch-to-buffer
- (:prefix ("p" . "project")
-  "p" #'projectile-switch-project
-  "g" #'projectile-regenerate-tags
-  "f" #'projectile-find-file
-  "i" #'projectile-invalidate-cache))
-#+END_SRC
-** Code
-#+BEGIN_SRC elisp
-(map!
- :leader
- :prefix ("c" . "code") ; Code
- :desc "Compile"            "c"       #'compile
- :desc "Compile via make"   "m"       #'+make/run
- :desc "Flycheck"           "v"       #'flycheck-list-errors
- :desc "Undo tree"          "u"       #'undo-tree-visualize
- (:after lsp
-  :desc "Format code lsp"   "f"       #'+default/lsp-format-region-or-buffer
-  :desc "Execute action"    "a"       #'lsp-execute-code-action))
-#+END_SRC
-** Magit and VC
-#+BEGIN_SRC elisp
-(map!
- :leader
- :after magit
- :prefix "g"
- "g" #'magit-status
- "c" #'magit-clone
- "f" #'magit-fetch
- "p" #'magit-pull)
-#+END_SRC
-** Notes
-#+BEGIN_SRC elisp
-(map!
- :leader
- :prefix ("n" . "notes")
- :desc  "Open notes in dired" "-"  #'(lambda () (interactive) (dired org-directory))
- :desc  "Open quicknotes"     "q"  #'(lambda () (interactive) (find-file (format "%s/qnotes.org" org-directory))))
-#+END_SRC
-** Frames
-#+BEGIN_SRC elisp
-(map!
- :leader
- :prefix "F"
- "d" #'delete-frame)
-#+END_SRC
-** Toggle
-Bindings that usually toggle stuff based bindings
-#+BEGIN_SRC elisp
-(map!
- :leader
- :prefix "t"
- "s" #'flyspell-mode
- "f" #'flycheck-mode
- "t" #'toggle-truncate-lines
- "l" #'doom/toggle-line-numbers
- "F" #'toggle-frame-fullscreen)
-#+END_SRC
-** Quit
-Quit Emacs or restart it
-#+BEGIN_SRC elisp
-(map!
- :leader
- :prefix "q"
- "q" #'save-buffers-kill-terminal
- "r" #'doom/restart)
-#+END_SRC
-* Ivy
-Bindings for ivy based functions
-#+BEGIN_SRC elisp
-(map!
- :after ivy
- :map ivy-minibuffer-map
- "C-j" #'ivy-next-line-or-history
- "C-k" #'ivy-previous-line-or-history)
-#+END_SRC
-* Company
-#+BEGIN_SRC elisp
-(map!
- :i "C-SPC" #'company-complete-common
- :map company-active-map
- "C-j"   #'company-select-next-or-abort
- "C-k"   #'company-select-previous-or-abort)
-#+END_SRC
-* Multi cursors
-Setup bindings for multi cursors.
-As it's a motion based system, use the "gz" namespace.
-#+BEGIN_SRC elisp
-(map!
- :after evil
- :m "gzm" #'evil-mc-resume-cursors
- :m "gzp" #'evil-mc-pause-cursors
- :m "gzd" #'evil-mc-make-all-cursors
- :m "gzj" #'evil-mc-make-cursor-move-next-line
- :m "gzk" #'evil-mc-make-cursor-move-prev-line
- :m "gzz" #'evil-mc-make-cursor-here)
-#+END_SRC
-* Remaps
-Remap certain functions to more useful counterparts
-#+BEGIN_SRC elisp
-(after! org
-  (define-key!
-    [remap org-goto] #'imenu))
-#+END_SRC
-* Misc
-Misc bindings that don't fit to any other category.
-#+BEGIN_SRC elisp
-(map!
- "C-x C-z" #'text-scale-adjust
- (:after evil
-  "TAB" #'evil-jump-item)
- "M-c" #'count-words-region
- "M-s" #'occur)
-#+END_SRC
diff --git a/Doom/.config/doom/modules/private/completion/config.el b/Doom/.config/doom/modules/private/completion/config.el
deleted file mode 100644
index 633ac96..0000000
--- a/Doom/.config/doom/modules/private/completion/config.el
+++ /dev/null
@@ -1,49 +0,0 @@
-;;; private/completion/config.el -*- lexical-binding: t; -*-
-
-(use-package! ido
-  :hook (doom-first-input . ido-mode)
-  :hook (ido-mode . recentf-mode)
-  :hook (ido-mode . ido-everywhere)
-  :hook (ido-mode . ido-ubiquitous-mode)
-
-  :preface
-  (defadvice! +ido-run-hooks-a (&rest _)
-    :after #'ido-mode
-    (run-hooks 'ido-mode-hook))
-
-  :init
-  (setq ido-save-directory-list-file nil)
-  (setq ido-save-directory-list-file nil)
-  (setq ido-ignore-buffers '("\\` " "^\\*ESS\\*" "^\\*[Hh]elp" "^\\*.*Completions\\*$" "^\\*tramp" "^\\*cvs-" "^*Ido"))
-  (setq ido-separator "\n")
-
-  :config
-  (defun +completion/recentf()
-    (interactive)
-    (find-file (completing-read "Recentf: " recentf-list)))
-
-  (define-key!
-    [remap recentf-open-files] #'+completion/recentf
-    [remap completing-read]    #'ido-completing-read)
-
-  (map!
-   :map (ido-common-completion-map ido-file-completion-map ido-buffer-completion-map)
-   "C-k" #'ido-prev-match
-   "C-j" #'ido-next-match
-   "TAB" #'ido-exit-minibuffer
-   :map ido-file-completion-map
-   "~" (cmd! (if (looking-back "/" (point-min))
-                 (insert "~/")
-               (call-interactively #'self-insert-command)))))
-
-
-(use-package! ido-sort-mtime
-  :hook (ido-mode . ido-sort-mtime-mode))
-
-
-(use-package! crm-custom
-  :hook (ido-mode . crm-custom-mode))
-
-
-(use-package! flx-ido
-  :hook (ido-mode . flx-ido-mode))
diff --git a/Doom/.config/doom/modules/private/completion/packages.el b/Doom/.config/doom/modules/private/completion/packages.el
deleted file mode 100644
index 39f4472..0000000
--- a/Doom/.config/doom/modules/private/completion/packages.el
+++ /dev/null
@@ -1,8 +0,0 @@
-;; -*- no-byte-compile: t; -*-
-;;; private/completion/packages.el
-
-
-(package! flx-ido)
-(package! ido-completing-read+)
-(package! ido-sort-mtime)
-(package! crm-custom)
diff --git a/Doom/.config/doom/modules/private/gentemplate/README.org b/Doom/.config/doom/modules/private/gentemplate/README.org
deleted file mode 100644
index c09f20e..0000000
--- a/Doom/.config/doom/modules/private/gentemplate/README.org
+++ /dev/null
@@ -1,19 +0,0 @@
-#+TITLE:   private/gentemplate
-#+DATE:    March 17, 2020
-
-* Description
-This module allows users to clone templates from my Github to specific machines.
-These templates allow for quick and easy setup for languages or frameworks where
-this sort of thing isn't very nice to do (for example C++).
-
-This module is used through the main function =+gentemplate/generate-template=.
-It will ask what template you want to use then where to put it, finally doing
-the necessary work to get you that template. You may mutate the variables
-=+gentemplate/template-list= and =+gentemplate/profile-url= to customise your
-templates.
-* Prerequisites
-- git
-* Requirements
-- ivy
-- magit
-- cl
diff --git a/Doom/.config/doom/modules/private/gentemplate/config.el b/Doom/.config/doom/modules/private/gentemplate/config.el
deleted file mode 100644
index 55caa75..0000000
--- a/Doom/.config/doom/modules/private/gentemplate/config.el
+++ /dev/null
@@ -1,35 +0,0 @@
-;;; private/gentemplate/config.el -*- lexical-binding: t; -*-
-
-(require 'cl-lib)
-
-(defconst +gentemplate/repo-url
-  "https://github.com/oreodave/"
-  "Repository url to download templates")
-
-(defconst +gentemplate/template-list
-  (list "CTemplate" "CPPTemplate" "PythonTemplate" "NodeTemplate" "ArduinoTemplate" "JavaTemplate")
-  "List of templates to use, relative to the repo-url")
-
-(defun +gentemplate/offline ()
-  "Check if user is offline"
-  (eq (cl-list-length (network-interface-list)) 1))
-
-(defun +gentemplate/copy-template (template-name dest)
-  "Copy a template project via it's `template-name' to a folder called `dest'"
-  (copy-directory (expand-file-name (concat "~/Code/Templates/" template-name)) dest))
-
-(after! magit
-  (defun +gentemplate/download-template (template-name dest)
-    "Download a given template via its `template-name' to the `dest' folder"
-    (magit-clone-regular (concat +gentemplate/repo-url template-name) dest nil))
-
-  (defun +gentemplate/generate-template ()
-    (interactive)
-    (let ((template-name (completing-read
-                          "Enter template: "
-                          +gentemplate/template-list))
-          (dir (read-directory-name "Enter directory to download to: "))
-          (offline (+gentemplate/offline)))
-      (if offline
-          (+gentemplate/copy-template template-name dir)
-        (+gentemplate/download-template template-name dir)))))
diff --git a/Doom/.config/doom/modules/private/mail/autoload.el b/Doom/.config/doom/modules/private/mail/autoload.el
deleted file mode 100644
index 13a79f9..0000000
--- a/Doom/.config/doom/modules/private/mail/autoload.el
+++ /dev/null
@@ -1,19 +0,0 @@
-;;; private/mail/autoload.el -*- lexical-binding: t; -*-
-
-;;;###autoload
-(defun +mail/open-mail ()
-  "Activate (or switch to) `notmuch' in its workspace."
-  (interactive)
-  (unless (featurep! :ui workspaces)
-    (user-error ":ui workspaces is required, but disabled"))
-  (condition-case-unless-debug e
-      (progn
-        (+workspace-switch "*MAIL*" t)
-        (if-let* ((buf (cl-find-if (lambda (it) (string-match-p "^\\*notmuch" (buffer-name (window-buffer it))))
-                                   (doom-visible-windows))))
-            (select-window (get-buffer-window buf))
-          (notmuch-search "tag:inbox"))
-        (+workspace/display))
-    ('error
-     (+notmuch/quit)
-     (signal (car e) (cdr e)))))
diff --git a/Doom/.config/doom/modules/private/mail/config.el b/Doom/.config/doom/modules/private/mail/config.el
deleted file mode 100644
index 25c9102..0000000
--- a/Doom/.config/doom/modules/private/mail/config.el
+++ /dev/null
@@ -1,33 +0,0 @@
-;;; private/mail/config.el -*- lexical-binding: t; -*-
-(defconst +mail/signature
-  "---------------
-Aryadev Chavali")
-
-(use-package notmuch
-  :commands notmuch
-  :config
-  (setq notmuch-show-logo nil
-        message-signature +mail/signature
-        mail-signature +mail/signature)
-
-  (defun +mail/sync-mail()
-    (interactive)
-    (start-process "imap-call" "*offlineimap*" "offlineimap" '("-oq")))
-
-  (map!
-   (:leader
-    "om" #'+mail/open-mail)
-   :map (notmuch-hello-mode-map notmuch-tree-mode-map notmuch-show-mode-map)
-   "u" #'notmuch-poll-and-refresh-this-buffer
-   "gS" #'+mail/sync-mail))
-
-(use-package smtpmail
-  :commands mail-send
-  :after notmuch
-  :init
-  (setq smtpmail-smtp-server "mail.aryadevchavali.com"
-        send-mail-function 'smtpmail-send-it
-        message-send-mail-function 'smtpmail-send-it
-        smtpmail-smtp-user "aryadev"
-        smtpmail-smtp-service 587
-        smtpmail-stream-type 'starttls))
diff --git a/Doom/.config/doom/modules/private/mail/packages.el b/Doom/.config/doom/modules/private/mail/packages.el
deleted file mode 100644
index e084e30..0000000
--- a/Doom/.config/doom/modules/private/mail/packages.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;; -*- no-byte-compile: t; -*-
-;;; private/mail/packages.el
-
-(package! notmuch)
diff --git a/Doom/.config/doom/modules/private/narrow/README.org b/Doom/.config/doom/modules/private/narrow/README.org
deleted file mode 100644
index c767cb8..0000000
--- a/Doom/.config/doom/modules/private/narrow/README.org
+++ /dev/null
@@ -1,7 +0,0 @@
-#+TITLE:   private/narrow
-#+DATE:    May 10, 2020
-
-* Description
-Minimal configuration for narrowing to function.
-* Prerequisites
-* Requirements
diff --git a/Doom/.config/doom/modules/private/narrow/config.el b/Doom/.config/doom/modules/private/narrow/config.el
deleted file mode 100644
index 9afd513..0000000
--- a/Doom/.config/doom/modules/private/narrow/config.el
+++ /dev/null
@@ -1,14 +0,0 @@
-;;; private/narrow/config.el -*- lexical-binding: t; -*-
-
-(defvar +narrow/narrow-state 't "To narrow or not to narrow. Flips between t and nil")
-
-(defun +narrow/toggle-narrow-state ()
-  "Toggle the state of +narrow/narrow-state between 't and 'nil"
-  (if (= +narrow/narrow-state 't)
-      (setq +narrow/narrow-state nil)
-    (setq +narrow/narrow-state 't)))
-
-(defun +narrow/toggle-narrow ()
-  (interactive)
-  (cond ((+narrow/narrow-state) (narrow-to-defun) (+narrow/toggle-narrow-state))
-        (t (widen))))
diff --git a/Doom/.config/doom/modules/private/ocaml/README.org b/Doom/.config/doom/modules/private/ocaml/README.org
deleted file mode 100644
index de29e59..0000000
--- a/Doom/.config/doom/modules/private/ocaml/README.org
+++ /dev/null
@@ -1,16 +0,0 @@
-#+TITLE:   private/ocaml
-#+DATE:    March 29, 2020
-
-* Description
-My own ocaml module. Has LSP support, which is well defined.
-
-Pretty minimalist and allows for quick coding. Uses the terminal a lot so I'd
-suggest using vterm as well for quick access to the terminal.
-* Prerequisites
-- ocaml compiler
-- opam
-- ocamllsp (from opam) (if LSP)
-* Requirements
-- lsp
-- tuareg
-- utop
diff --git a/Doom/.config/doom/modules/private/ocaml/config.el b/Doom/.config/doom/modules/private/ocaml/config.el
deleted file mode 100644
index df138ad..0000000
--- a/Doom/.config/doom/modules/private/ocaml/config.el
+++ /dev/null
@@ -1,20 +0,0 @@
-;;; private/ocaml/config.el -*- lexical-binding: t; -*-
-
-(use-package! utop
-  :config
-  (map!
-   :localleader
-   :map tuareg-mode-map
-   :desc "Repl" "c" #'utop
-   (:prefix ("e" . "eval")
-     :desc "Buffer" "b" #'utop-eval-buffer
-     :desc "Region" "r" #'utop-eval-region)))
-
-
-(when (featurep! +lsp)
-  (after! lsp
-    (lsp-register-client
-     (make-lsp-client :new-connection (lsp-stdio-connection "ocamllsp")
-                      :major-modes '(tuareg-mode)
-                      :server-id 'ocaml-lsp))
-    (add-hook 'tuareg-mode-hook #'lsp!)))
diff --git a/Doom/.config/doom/modules/private/ocaml/packages.el b/Doom/.config/doom/modules/private/ocaml/packages.el
deleted file mode 100644
index 61f1c8d..0000000
--- a/Doom/.config/doom/modules/private/ocaml/packages.el
+++ /dev/null
@@ -1,6 +0,0 @@
-;; -*- no-byte-compile: t; -*-
-;;; private/ocaml/packages.el
-
-
-(package! tuareg)
-(package! utop)
diff --git a/Doom/.config/doom/modules/private/oreoline/README.org b/Doom/.config/doom/modules/private/oreoline/README.org
deleted file mode 100644
index 57b24e9..0000000
--- a/Doom/.config/doom/modules/private/oreoline/README.org
+++ /dev/null
@@ -1,13 +0,0 @@
-#+TITLE:   private/oreoline
-#+DATE:    March 29, 2020
-
-* Description
-My very own modeline. Minimalist, isn't particularly fancy but does the job.
-Uses telephone line with some configuration. Has support for a light version as well.
-
-Has LSP support as well as evil support (can present evil modes and LSP mode).
-* Prerequisites
-None
-* Requirements
-- telephone line
-- evil-anzu
diff --git a/Doom/.config/doom/modules/private/oreoline/config.el b/Doom/.config/doom/modules/private/oreoline/config.el
deleted file mode 100644
index 0bc3a41..0000000
--- a/Doom/.config/doom/modules/private/oreoline/config.el
+++ /dev/null
@@ -1,74 +0,0 @@
-;;; ui/telephone/config.el -*- lexical-binding: t; -*-
-
-(use-package! telephone-line
-  :hook (after-init . telephone-line-mode)
-  :init
-  ;; Faces
-  (defface +oreoline-accent-dark   '((t (:foreground "black" :background "Cadet Blue"      ))) "")
-  (defface +oreoline-evil-dark     '((t (:foreground "white"    :background "dark green"           ))) "")
-  (defface +oreoline-evil-inactive '((t (:foreground "cornsilk" :background "gray26"          ))) "")
-
-  (defface +oreoline-accent-light  '((t (:foreground "black"    :background "Light Slate Grey"))) "")
-  (defface +oreoline-evil-light    '((t (:foreground "black"    :background "Sky Blue"        ))) "")
-
-  ;; Set telephone line faces
-  (setq telephone-line-faces
-        '((evil          . (+oreoline-evil-dark   . +oreoline-evil-inactive))
-          (modal         . telephone-line-modal-face)
-          (ryo           . telephone-line-ryo-modal-face)
-          (accent        . (+oreoline-accent-dark . telephone-line-accent-inactive))
-          (nil mode-line . mode-line-inactive)))
-  (when (featurep! +light)
-    (setq telephone-line-faces
-          '((evil          . (+oreoline-evil-light   . +oreoline-evil-inactive))
-            (modal         . telephone-line-modal-face)
-            (ryo           . telephone-line-ryo-modal-face)
-            (accent        . (+oreoline-accent-light . telephone-line-accent-inactive))
-            (nil mode-line . mode-line-inactive))))
-
-  ;; Seperators
-  (setq telephone-line-primary-left-separator    'telephone-line-abs-left
-        telephone-line-secondary-left-separator  'telephone-line-identity-hollow-left
-        telephone-line-primary-right-separator   'telephone-line-abs-right
-        telephone-line-secondary-right-separator 'telephone-line-identity-hollow-right)
-
-  ;; LSP segment
-  (telephone-line-defsegment +oreoline-lsp-segment ()
-    (if (bound-and-true-p lsp-mode)
-        (propertize "")
-      (propertize "")))
-
-  ;; Visual line check
-  (telephone-line-defsegment +oreoline-visual-segment ()
-    (if mark-active
-        (let ((lines (count-lines (region-beginning) (region-end)))
-              (chars (- (region-end) (region-beginning))))
-          (if (< lines 2)
-              (propertize (format "%sC" chars))
-            (propertize (format "%sL %sC" lines chars))))
-      (propertize "~")))
-
-  (setq
-   ;; LHS
-   telephone-line-lhs
-   '((evil   . (telephone-line-evil-tag-segment
-                telephone-line-buffer-modified-segment))
-     (accent . (telephone-line-filesize-segment
-                telephone-line-buffer-name-segment
-                telephone-line-erc-modified-channels-segment
-                telephone-line-process-segment))
-     (nil    . ()))
-   ;; RHS
-   telephone-line-rhs
-   '((nil    . (telephone-line-misc-info-segment))
-     (accent . (telephone-line-vc-segment
-                +oreoline-lsp-segment
-                telephone-line-major-mode-segment
-                telephone-line-flycheck-segment))
-     (modal  . (+oreoline-visual-segment))
-     (evil   . (telephone-line-airline-position-segment))))
-  :config
-  (size-indication-mode +1))
-
-(use-package! evil-anzu
-  :after-call evil-ex-start-search evil-ex-start-word-search evil-ex-search-activate-highlight)
diff --git a/Doom/.config/doom/modules/private/oreoline/packages.el b/Doom/.config/doom/modules/private/oreoline/packages.el
deleted file mode 100644
index 9479896..0000000
--- a/Doom/.config/doom/modules/private/oreoline/packages.el
+++ /dev/null
@@ -1,5 +0,0 @@
-;; -*- no-byte-compile: t; -*-
-;;; ui/telephone/packages.el
-
-(package! telephone-line)
-(package! evil-anzu)
diff --git a/Doom/.config/doom/modules/private/rss/README.org b/Doom/.config/doom/modules/private/rss/README.org
deleted file mode 100644
index 3a025d4..0000000
--- a/Doom/.config/doom/modules/private/rss/README.org
+++ /dev/null
@@ -1,13 +0,0 @@
-#+TITLE: private/rss
-#+DATE:    May 2, 2020
-
-* Description
-This module allows the manipulation and usage of the /newsticker/ system. This is a nice RSS reader inbuilt to Emacs.
-
-Use =+rss/set-feed-urls= to set the urls for use in newsticker. Bind
-=+rss/open-newsticker= =+rss/close-newsticker= to appropriate bindings.
-* Prerequisites
-None
-* Requirements
-- cl-lib
-- newsticker
diff --git a/Doom/.config/doom/modules/private/rss/config.el b/Doom/.config/doom/modules/private/rss/config.el
deleted file mode 100644
index 4d8468a..0000000
--- a/Doom/.config/doom/modules/private/rss/config.el
+++ /dev/null
@@ -1,51 +0,0 @@
-;;; private/rss/config.el -*- lexical-binding: t; -*-
-
-(require 'seq)
-(require 'cl-lib)
-
-(defvar +rss/feed-urls '(("Arch Linux"            "https://www.archlinux.org/feeds/news/" Linux)
-                         ("LEMMiNO"               "https://www.youtube.com/feeds/videos.xml?channel_id=UCRcgy6GzDeccI7dkbbBna3Q" YouTube)
-                         ("Gamer from Mars"       "https://www.youtube.com/feeds/videos.xml?channel_id=UCJ6z_yj_dDNrhn-c8ZyKV4g" YouTube)
-                         ("Pop Culture Detective" "https://www.youtube.com/feeds/videos.xml?channel_id=UCHiwtz2tCEfS17N9A-WoSSw" YouTube)
-                         ("Dark Sominium"         "https://www.youtube.com/feeds/videos.xml?channel_id=UC_e39rWdkQqo5-LbiLiU10g" YouTube Stories)
-                         ("Dark Sominium Music"   "https://www.youtube.com/feeds/videos.xml?channel_id=UCkLiZ_zLynyNd5fd62hg1Kw" YouTube Music)
-                         ("Nexpo"                 "https://www.youtube.com/feeds/videos.xml?channel_id=UCpFFItkfZz1qz5PpHpqzYBw" YouTube)
-                         ("Techquickie"           "https://www.youtube.com/feeds/videos.xml?channel_id=UC0vBXGSyV14uvJ4hECDOl0Q" YouTube)
-                         ("3B1B"                  "https://www.youtube.com/feeds/videos.xml?channel_id=UCYO_jab_esuFRV4b17AJtAw" YouTube)))
-
-
-(when (featurep! +elfeed)
-  (after! elfeed
-    (setq elfeed-feeds (cl-map 'list (lambda (item) (append (list (nth 1 item)) (cdr (cdr item)))) +rss/feed-urls))))
-
-(when (featurep! +newsticker)
-  (defun +rss/set-feed-urls (LIST)
-    "Set the newsticker-url-list to LIST. LIST should have format =(TAG URL START_TIME INTERVAL)="
-    (setq newsticker-url-list LIST))
-
-  (defun +rss/get-newsticker-buffers ()
-    "Using seq, filter the buffer list for newsticker buffers"
-    (seq-remove (lambda (buffer)
-                  (not (and (cl-search "*Newsticker" (buffer-name buffer))
-                            (= (cl-search "*Newsticker" (buffer-name buffer))))))
-                (buffer-list)))
-
-  (defun +rss/close-newsticker()
-    "Routine to close the newsticker system"
-    (interactive)
-    (newsticker-stop)
-    (dolist (buf (+rss/get-newsticker-buffers))
-      (kill-buffer buf))
-    (+workspace/delete "RSS"))
-
-  (use-package! newsticker
-    :config
-    (+rss/set-feed-urls ; Format is =(TAG URL START_TIME INTERVAL)=
-     (cl-map 'list (lambda (item) (list (nth 0 item) (nth 1 item) nil 3600)) +rss/feed-urls))
-
-    (defun +rss/open-newsticker ()
-      "Routine to start and open the newsticker"
-      (interactive)
-      (newsticker-start)
-      (+workspace/new "RSS")
-      (newsticker-treeview))))
diff --git a/Doom/.config/doom/modules/private/rss/packages.el b/Doom/.config/doom/modules/private/rss/packages.el
deleted file mode 100644
index 59d7afe..0000000
--- a/Doom/.config/doom/modules/private/rss/packages.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;; -*- no-byte-compile: t; -*-
-;;; private/rss/packages.el
-
-(package! elfeed)
diff --git a/Doom/.config/doom/obsolete/literate.org b/Doom/.config/doom/obsolete/literate.org
deleted file mode 100644
index 53bd6a2..0000000
--- a/Doom/.config/doom/obsolete/literate.org
+++ /dev/null
@@ -1,105 +0,0 @@
-#+TITLE: Literate configuration (NO LONGER IN USE)
-
-* Preclude
-My setup to produce a literate configuration.
-Allows me to write org files all around the /doom-private-dir/ and access them.
-Also shaved like 0.2s off my loading time.
-
-/Note/: My current literate system now uses the =org-babel-load*= functions to handle most of the hard work.
-It's easier to use and manage, and I just don't use that many org files anymore so no need for such a big setup.
-* Constants
-Initialise some basic constants for where stuff is.
-- literate/bin-dir: Where to compile to
-- literate/preloaded-files: Relative to ~$DOOM~, which files are already
-  preloaded/don't need to be compiled
-#+BEGIN_SRC elisp
-(defconst dx:literate/bin-dir (expand-file-name (concat doom-private-dir "bin/")) "Directory to store elisp compiled files")
-(defconst dx:literate/load-files '("~/.doom.d/org/personal.org") "Files to load after compilation")
-(defconst dx:literate/directory (expand-file-name (concat doom-private-dir "org/")) "Directory to get org files from")
-#+END_SRC
-* Remove function
-When loading the lisp, we need to load everything excluding "config.el" (preloaded by doom) and "literate.el" (loaded by "config.el").
-We'll make a very specific remove function that will remove entries from a given list and return the new list, given the fact that the files variable will be a list of fully expanded file names.
-#+BEGIN_SRC elisp
-(defun dx:literate/remove-mult (remove-files files)
-  "Remove any occurrences of `remove-files' from `files'"
-  (let ((parsed-remove-files (map 'list
-                                  #'(lambda (i) (expand-file-name (concat doom-private-dir i)))
-                                  remove-files))) ; Generate a list of all fully expanded files to remove
-    (remove-if #'(lambda (l) (member l parsed-remove-files)) files))) ; remove any files that are in the remove-files
-#+END_SRC
-* Destination for parser
-Generate the destination for a literate config org file to parse to, in this case the bin folder in the private directory.
-This is not fitted onto the parser because the parser could be fitted to multiple /differing/ outputs easily if it isn't specified a destination.
-#+BEGIN_SRC elisp
-(defun dx:literate/destination(SRC)
-  "Parse a src.org file to a bin/src.el file"
-  (replace-regexp-in-string ".*/\\(\\w+\\).org"
-                            (expand-file-name (concat dx:literate/bin-dir "\\1.el")) SRC))
-#+END_SRC
-* Parser
-** Tangle function
-First we need to get some sort of parser which can, given a source org file and a destination, parse and produce an Emacs lisp file.
-We'll copy this from the literate module of doom.
-#+BEGIN_SRC elisp
-(defun dx:literate/tangle (SRC DEST)
-  "Tangle a source org file into a destination el file using a new emacs instance"
-  (let ((default-directory doom-private-dir))
-    (when (file-newer-than-file-p SRC DEST)
-      (let ((output (get-buffer-create "*org-tangle*")))
-        (unwind-protect
-            (async-shell-command
-             (concat "emacs "
-                     "-q " "--batch "
-                     "-l " "ob-tangle "
-                     "--eval "
-                     (format "'(org-babel-tangle-file %S %S)'" SRC DEST))
-             "*org-tangle-messages*"
-             "*org-tangle-errors*"))))))
-#+END_SRC
-** Popup rules
-I don't want Emacs to focus onto the output buffer of the tangling process when I save, which is what happens with a standard async-shell-command.
-So setup a rule for the 'messages' and 'errors' buffers to not focus them (by setting their time to live to 0).
-#+BEGIN_SRC elisp
-(set-popup-rule! "\*org-tangle-.*" :ttl 0 :quit t)
-#+END_SRC
-* Hook on save
-Now we need to make a hook function that, when the current buffer is an org file in the doom directory, will run the literate config procedure from above.
-Use this hook function and add it to the after-save-hook once org mode has been loaded.
-README.org has been added as an exception because it doesn't contain literate contents.
-#+BEGIN_SRC elisp
-(defun dx:literate/compile-hook ()
-  "Any org file within $DOOM/org will be compiled on save"
-  (when (and (eq major-mode 'org-mode)
-             (or (file-in-directory-p buffer-file-name doom-private-dir)
-                 (file-in-directory-p buffer-file-name (concat doom-private-dir "org")))
-             (not (string= buffer-file-name (expand-file-name (concat doom-private-dir "README.org")))))
-    (dx:literate/tangle buffer-file-name (dx:literate/destination buffer-file-name))))
-
-(after! org
-  (add-hook 'after-save-hook #'dx:literate/compile-hook))
-#+END_SRC
-* Procedure for all files
-A procedure that parses all the org files in a given directory into Emacs lisp
-files, using the parser function made. Assume all org files in the "location"
-directory contribute to the config.
-The location is not set because this function could be easily programmed to use
-multiple /differing/ sources to produce the config. The tangle function is set
-because this is the function we'll be using for tangling all org files to ELisp files.
-#+BEGIN_SRC elisp
-(defun dx:literate/tangle-all (&optional location)
-  "Tangle all org files in `location' to el files in the `destination'"
-  (interactive)
-  (or location (setq location doom-private-dir))
-  (message "Starting compilation process")
-  (let ((files (directory-files-recursively location ".org")))
-    (dolist (file files)
-      (message "Compiling and parsing %s" file)
-      (dx:literate/tangle file (dx:literate/destination file)))))
-#+END_SRC
-* Load configuration
-Final step of the literate cycle: load the config for the first time. Load any org files in =dx:literate/load-files=.
-#+BEGIN_SRC elisp
-(dolist (file dx:literate/load-files)
-  (load (dx:literate/destination file)))
-#+END_SRC
diff --git a/Doom/.config/doom/obsolete/no_compile.org b/Doom/.config/doom/obsolete/no_compile.org
deleted file mode 100644
index fb6e217..0000000
--- a/Doom/.config/doom/obsolete/no_compile.org
+++ /dev/null
@@ -1,53 +0,0 @@
-#+TITLE: Don't compile this
-#+DESCRIPTION: Old bits and bobs that shouldn't exist anymore
-
-* Dashboard config
-My very own dashboard config using doom dashboard, with these features:
-- Custom load message
-- Custom splash image and dashboard buffer name
-- Custom dashboard sections for myself
-
-** Benchmark display
-Redo the display-benchmark function to display a different message
-#+BEGIN_SRC elisp
-(defun doom-display-benchmark-h (&optional return-p)
-  "Display a benchmark, showing number of packages and modules, and how quickly
-they were loaded at startup.
-
-If RETURN-P, return the message as a string instead of displaying it."
-  (funcall (if return-p #'format #'message)
-           "εmacs loaded %d packages, %d modules in %.03fs"
-           (- (length load-path) (length doom--initial-load-path))
-           (if doom-modules (hash-table-count doom-modules) 0)
-           (or doom-init-time
-               (setq doom-init-time
-                     (float-time (time-subtract (current-time) before-init-time))))))
-#+END_SRC
-
-** Image and buffer name
-Set the splash-image and dashboard buffer name
-Space image comes from [[https://flaticon.com][website]]
-#+BEGIN_SRC elisp
-(setq fancy-splash-image "~/Pictures/SplashScreens/space2.png") ; splash image
-(setq +doom-dashboard-name "*dashboard*")
-#+END_SRC
-** Dashboard items
-Set the dashboard functions (segments in overall buffer), set the sections of the interactive menu as well.
-#+BEGIN_SRC elisp
-(setq +doom-dashboard-functions ; limit the dashboard items
-      '(doom-dashboard-widget-banner
-        doom-dashboard-widget-loaded
-        doom-dashboard-widget-shortmenu))
-
-(setq +doom-dashboard-menu-sections ; Set a specific amount of items
-      '(("Open org-agenda"
-         :icon (all-the-icons-octicon "calendar" :face 'font-lock-keyword-face)
-         :when (fboundp 'org-agenda)
-         :action org-agenda)
-        ("Jump to bookmark"
-         :icon (all-the-icons-octicon "bookmark" :face 'font-lock-keyword-face)
-         :action bookmark-jump)
-        ("Open project"
-         :icon (all-the-icons-material "folder" :face 'font-lock-keyword-face)
-         :action projectile-switch-project)))
-#+END_SRC
diff --git a/Doom/.config/doom/org/config.org b/Doom/.config/doom/org/config.org
deleted file mode 100644
index 6534b4c..0000000
--- a/Doom/.config/doom/org/config.org
+++ /dev/null
@@ -1,325 +0,0 @@
-#+TITLE: Oreodave's Emacs configuration
-#+AUTHOR: Oreodave
-#+DESCRIPTION: My Doom Emacs configuration!
-
-* Preclude
-- This is my [[https://github.com/hlissner/doom-emacs][Doom Emacs]] configuration.
-- Use it for most of my code editing and development needs.
-- Incredibly versatile tool in my inventory.
-* Initial setup
-** Doom Variables
-- Good font choices:
-  - Hack
-  - Source Code Pro/Variable
-  - IBM Plex Mono
-  - Space Mono
-  - Z003 if I'm feeling fancy (▀̿Ĺ̯▀̿̿)
-#+BEGIN_SRC elisp
-(after! core-keybinds
-  (map! :leader "," nil)
-  (setq doom-themes-enable-italic nil
-        doom-themes-enable-bold t
-        doom-theme 'derivative-new-molokai
-        doom-font (font-spec :family "Source Code Pro" :size 15)))
-#+END_SRC
-** Other variables
-Some quality of life things and others that I couldn't really put in one category
-- Using line-numbers that are relative now instead of nothing.
-- Set org directory
-- Add libgen to search providers
-#+BEGIN_SRC elisp
-(setq completion-ignore-case t
-  truncate-lines t
-  display-line-numbers-type t
-  bookmark-default-file (expand-file-name (concat doom-private-dir "bookmarks")))
-(setq-default frame-title-format '("%b - Emacs"))
-(add-to-list 'default-frame-alist '(alpha . 90))
-(cl-pushnew '("Libgen" "http://gen.lib.rus.ec/search.php?req=%s") +lookup-provider-url-alist :key #'car :test 'string=)
-#+END_SRC
-** HACK: Load org mode again?
-#+BEGIN_SRC elisp
-(load (expand-file-name (concat user-emacs-directory "modules/lang/org/config.el")))
-#+END_SRC
-* Package Configuration
-Configuration for or based heavily around specific packages that I find very important
-** Modeline
-#+BEGIN_SRC elisp
-(setq-default mode-line-format (list "%l:%c \t %p \t %+%b(" '(:eval (format "%s" major-mode)) ") \t %I \t" vc-mode mode-line-end-spaces))
-#+END_SRC
-** DAP
-*** Function
-First to setup is a routine for setting up all the dap-panes for debugging.
-Easier to do than just running all those functions manually
-- Routine sets up the panes that I like to use, instead of M-x'ing it
-- *<SPC>cD* starts up the routine
-#+BEGIN_SRC elisp
-(after! dap-mode
-  (defun dx:debug ()
-    (interactive)
-    (dap-ui-mode)
-    (dap-ui-locals)
-    (dap-ui-sessions)))
-#+END_SRC
-*** Keybind
-#+BEGIN_SRC elisp
-(map!
- :after dap-mode
- :leader
- :desc "Start debugging setup" "cD" #'dx:debug)
-#+END_SRC
-** Spelling checker
-Keybinds to org-mode for flyspell package
-#+BEGIN_SRC elisp
-(map!
- :after (flyspell org)
- :localleader
- :map org-mode-map
- :prefix "w"
- :desc "Correct current word" "c" #'flyspell-correct-at-point
- :desc "Autocorrect word"     "a" #'flyspell-auto-correct-word
- :desc "Goto next error"      "w" #'flyspell-goto-next-error)
-#+END_SRC
-** Projectile
-Add CMakeLists.txt to projectile-project-roots.
-#+BEGIN_SRC elisp
-(after! projectile
-  (cl-pushnew "CMakeLists.txt" projectile-project-root-files :test 'string=)
-  (setq projectile-tags-command
-        "ctags -e -R --exclude=dist --exclude=.ccls --exclude=.ccls-cache"))
-#+END_SRC
-** Prettify symbols
-Configuration for the module (pretty-code).
-*** Setup symbols
-Some symbols aren't present in the current doom version, or my fonts are screwing up, so I wrote them here.
-Maybe a bit of a bandage over broken glass, but at least it's something.
-#+BEGIN_SRC elisp
-(setq +pretty-code-symbols
-      '(:name "»"
-        :src_block "»"
-        :src_block_end "«"
-        :quote "“"
-        :quote_end "”"
-        :lambda "λ"
-        :def "ƒ"
-        :composition "∘"
-        :map "↦"
-        :null "∅"
-        :true "𝕋"
-        :false "𝔽"
-        :int "ℤ"
-        :float "ℝ"
-        :str "𝕊"
-        :bool "𝔹"
-        :not "¬"
-        :in "∈"
-        :not-in "∉"
-        :and "∧"
-        :or "∨"
-        :for "∀"
-        :some "∃"
-        :return "⟼"
-        :yield "⟻"
-        :tuple "⨂"
-        :pipe "|"
-        :dot "•"))
-#+END_SRC
-
-The 'x' symbol in the =+pretty-code-fira-code-font-ligatures= is annoying, and unneeded.
-So I remove it.
-#+BEGIN_SRC elisp
-(assoc-delete-all "x" +pretty-code-fira-code-font-ligatures #'string=)
-#+END_SRC
-*** Pretty symbols
-Setup pretty symbols specifically for C++.
-I import the string type via `using std::string` which isn't supported in standard doom so I added support for it as well.
-#+BEGIN_SRC elisp
-(after! cc-mode
-  (set-pretty-symbols!
-    '(c-mode c++-mode)
-    :return "return"
-    :or "||"
-    :and "&&"
-    :not "!"
-    :bool "bool"
-    :str "string"
-    :str "std::string"
-    :float "float"
-    :int "int"
-    :false "false"
-    :true "true"
-    :null "nullptr"))
-#+END_SRC
-** Calc
-*** Configuration
-#+BEGIN_SRC elisp
-(use-package! calc
-  :config
-  (setq calc-angle-mode 'rad)
-  (map!
-   :leader
-   :desc "Calc" ":" #'calc))
-#+END_SRC
-** Dired and ranger
-I like doing shell comamnds from dired, but I don't want Emacs to hang when doing them.
-So, as '!' is a common use command and "&" is the async comamnd, I'll just switcheroo the "!" and "&" for their designated commands.
-#+BEGIN_SRC elisp
-(map!
- :map dired-mode-map
- :n "!" #'dired-do-async-shell-command
- :n "&" #'dired-do-shell-command)
-#+END_SRC
-** Compilation
-Add keybind to recompile (inside the buffer)
-#+BEGIN_SRC elisp
-(map!
- (:map 'compilation-mode-map
-  :n "u" #'recompile))
-#+END_SRC
-** Company
-#+BEGIN_SRC elisp
-(add-hook
- 'company-mode-hook
- #'(lambda () (setq company-frontends '(company-preview-frontend company-pseudo-tooltip-frontend))))
-#+END_SRC
-* Language Configuration
-Configuration for various languages which I feel can be useful
-** C-style languages
-Configuration for C and C++.
-Emacs doesn't have the full range of styles that I want, so lemme just do it myself.
-#+BEGIN_SRC elisp
-(after! cc-mode
-  (c-add-style
-   "user"
-   '((c-basic-offset . 2)
-     (c-comment-only-line-offset . 0)
-     (c-hanging-braces-alist (brace-list-open)
-                             (brace-entry-open)
-                             (substatement-open after)
-                             (block-close . c-snug-do-while)
-                             (arglist-cont-nonempty))
-     (c-cleanup-list brace-else-brace)
-     (c-offsets-alist
-      (statement-block-intro . +)
-      (knr-argdecl-intro . 0)
-      (substatement-open . 0)
-      (substatement-label . 0)
-      (access-label . 0)
-      (label . 0)
-      (statement-cont . +))))
-  (setq c-default-style "user"))
-#+END_SRC
-** Python
-Configuration for the Python language in doom
-*** Set interpreter and flycheck to Python 3
-I do python development for Python3 so I need to set the flycheck python checker, as well as the interpreter, to be Python3
-#+BEGIN_SRC elisp
-(after! python
-  (setq python-version-checked t)
-  (setq python-python-command "python3")
-  (setq python-shell-interpreter "python3")
-  (setq flycheck-python-pycompile-executable "python3"))
-#+END_SRC
-*** Map to python-mode-map
-Most of my python work is in scripts or ideas, so I don't need extensive testing utilities or anything like that
-I adhere greatly to the REPL in python, so I need access to it often.
-#+BEGIN_SRC elisp
-(after! python
-  (map! ; Python keybinds
-   :map python-mode-map
-   :localleader
-   :desc "Start python minor" "c" #'run-python
-   :desc "Format buffer"      "=" #'py-yapf-buffer
-   (:prefix "s"
-    :desc "Send region REPL" "r" #'python-shell-send-region
-    :desc "Send buffer"      "b" #'python-shell-send-buffer
-    :desc "Send function"    "f" #'python-shell-send-defun)))
-#+END_SRC
-** Typescript
-- Typescript (in my opinion) should be indented by 2
-- Setup the LSP server on the lsp-language-id-config in case it hasn't already
-#+BEGIN_SRC elisp
-(after! typescript-mode
-  (setq typescript-indent-level 2)
-  (setq tide-format-options '(:indentSize 2 :tabSize 2))
-  (after! lsp
-    (cl-pushnew '(typescript-mode . "typescript") lsp-language-id-configuration :key #'car)
-    (lsp-register-client
-     (make-lsp-client
-      :new-connection (lsp-stdio-connection "typescript-language-server --stdio")
-      :major-modes '(typescript-mode)
-      :server-id 'typescript))))
-#+END_SRC
-** Org
-Org configuration to maximise org workflow.
-*** Org variables
-Setup the agenda-files and the org-directory.
-#+BEGIN_SRC elisp
-(after! org
-  (add-hook 'org-mode-hook #'visual-line-mode)
-  (add-hook 'org-mode-hook #'org-toggle-latex-fragment)
-  (setq org-directory "~/Text"
-        org-agenda-files '("~/Text/")
-        org-src-window-setup 'split-window-right
-        org-superstar-headline-bullets-list '("◉" "‣" "⧈" "⬠")
-        org-log-repeat 'note))
-#+END_SRC
-*** Fragtog
-#+BEGIN_SRC elisp
-(use-package! org-fragtog
-  :config
-  (add-hook 'org-mode-hook #'org-fragtog-mode))
-#+END_SRC
-*** Thesaurus
-Powerthesaurus installation, added a keybind in org-mode for looking up words.
-#+BEGIN_SRC elisp
-(use-package! powerthesaurus
-  :after-call (org-mode)
-  :defer-incrementally (org)
-  :config
-  (map!
-   :localleader
-   :map org-mode-map
-   :prefix "w"
-   :desc "Thesaurus" "t" #'powerthesaurus-lookup-word-at-point))
-#+END_SRC
-Powerthesaurus for thesaurus on writer files
-*** Org keymap
-- I like using org-export often, so bind it to a primary bind.
-- Loading latex fragments is nice
-#+BEGIN_SRC elisp
-(map! ; Org keybinds
- :after org
- :map org-mode-map
- :localleader
- :desc "Org dispatch"        "e" #'org-export-dispatch
- :desc "Org LaTeX"           "E" #'org-latex-export-as-latex)
-#+END_SRC
-** Haskell
-Setup repl binds for Haskell
-#+BEGIN_SRC elisp
-(map!
- :after haskell-mode
- :map haskell-mode-map
- :localleader
- "l" #'haskell-process-load-file
- "r" #'haskell-process-reload
- "o" #'haskell-process-start)
-#+END_SRC
-** Sxhkd
-Define a major-mode for sxhkd config files.
-#+BEGIN_SRC elisp
-(define-generic-mode sxhkd-mode
-  '(?#)
-  '("alt" "Escape" "super" "bspc" "ctrl" "space" "shift" "hyper" "XF86*")
-  '("{" "}")
-  '("sxhkdrc")
-  nil
-  "Simple mode for sxhkdrc files.")
-#+END_SRC
-* Key-map
-General keymap, load the keymap elisp file.
-This elisp file is basically two big maps, which are better explained in that document than this one.
-Furthermore, debugging and working on that document is something I do so often, it's just better to do it in an Elisp file than a org file.
-#+BEGIN_SRC elisp
-(load (concat doom-private-dir "+keymap.el"))
-#+END_SRC
diff --git a/Doom/.config/doom/org/packages.org b/Doom/.config/doom/org/packages.org
deleted file mode 100644
index 67040fa..0000000
--- a/Doom/.config/doom/org/packages.org
+++ /dev/null
@@ -1,59 +0,0 @@
-#+TITLE: Packages
-
-* Preclude
-A list of extra packages I have added to doom, and justification for why.
-Here are some examples of how to do packages in Doom.
-#+BEGIN_SRC elisp :tangle no
-(package! some-package) ;melpa
-(package! another-package :recipe (:host github :repo "username/repo"))
-(package! builtin-package :disable t)
-#+END_SRC
-* Header
-Don't byte compile this, not a good idea.
-#+BEGIN_SRC elisp
-;; -*-no-byte-compile: t-*-
-#+END_SRC
-* General
-** powerthesaurus
-Thesaurus for Emacs, amazingly useful.
-I do know that doom has it's own dictionary and thesaurus module, but I wish to use my own cos I have very specific needs
-#+BEGIN_SRC elisp
-(package! powerthesaurus)
-#+END_SRC
-* Org-mode
-** Fragtog
-Fragtog allows for latex segments to be instantly compiled and only when you hover over them will you get the code, similar to prettify-symbols.
-#+BEGIN_SRC elisp
-(package! org-fragtog :recipe (:host github :repo "io12/org-fragtog"))
-#+END_SRC
-* Coding
-** Tags
-Should really be an inbuilt feature for Ivy, as it is so damn useful.
-Better than the Helm or inbuilt "TAGS" searching options as it provides ways to quickly filter data from the tag set which makes it incredibly fast.
-I use it in some of my personal functions such as the global testing function I have for C# using both tags and OmniSharp.
-#+BEGIN_SRC elisp
-(package! counsel-etags)
-#+END_SRC
-** Arduino
-I sometimes dabble in Arduino coding, and absolutely adore Emacs, so who says I can't make Emacs an Arduino IDE?
-*** arduino-mode
-Absolutely necessary for Arduino development: syntax highlighting.
-I soon plan to make my own Arduino mode on the back of cc-mode, but who knows when that will happen?
-#+BEGIN_SRC elisp
-(package! arduino-mode)
-#+END_SRC
-*** company-arduino
-Auto complete is essential to make the ultimate IDE experience™. Thus, company-arduino.
-#+BEGIN_SRC elisp
-(package! company-arduino)
-#+END_SRC
-** YAML
-YAML packages which I think would be cool to use:
-- yaml-mode is just necessary as you can't edit without coloring (in my opinion)
-- yaml-imenu is a cool package for large yaml files
-- flycheck-yamllint is a nice little package which
-#+BEGIN_SRC elisp
-(package! yaml-mode)
-(package! yaml-imenu)
-(package! flycheck-yamllint)
-#+END_SRC
diff --git a/Doom/.config/doom/org/personal.org b/Doom/.config/doom/org/personal.org
deleted file mode 100644
index 7398769..0000000
--- a/Doom/.config/doom/org/personal.org
+++ /dev/null
@@ -1,101 +0,0 @@
-#+TITLE: Personal module
-
-* Preclude
-Personal functionality or variables that aid my workflow or are just cool.
-* Variables
-Some user variables
-#+BEGIN_SRC elisp
-(setq user-full-name "Aryadev Chavali"
-      user-mail-address "aryadevchavali1@gmail.com")
-#+END_SRC
-* Change theme
-Allow user to set a theme from a limited set of candidates, based on "dx:theme-list".
-
-- Themes sanctioned by me:
-  - doom-solarized-dark: just the right everything. best for day.
-  - doom-gruvbox: good contrast, better for night.
-  - doom-city-lights: Eh contrast, quite dark
-  - doom-outrun-electric: Interesting colour palette
-  - doom-vibrant: Good contrast, bit lighter
-  - doom-molokai/doom-monokai-classic: hacker style
-  - doom-solarized-light: Light orange theme that's actually okay on the eyes
-  - doom-acario-light: Light theme with not bad colours
-- Themes not sanctioned:
-  - Light themes other than solarized-light and acario
-  - Horrid low contrast ones with no colour. Grayscale particularly. I can't
-    handle those.
-
-#+BEGIN_SRC elisp
-(setq dx:themes/theme-list '(doom-solarized-dark
-                             doom-gruvbox
-                             doom-molokai
-                             doom-monokai-classic
-                             doom-solarized-light
-                             doom-acario-light))
-
-(defun dx:themes/set-new-theme ()
-  "Set the theme from my own selection, mutate as you see fit"
-  (interactive)
-  (let ((theme (completing-read "Select theme: " dx:themes/theme-list)))
-    (condition-case nil
-        (progn
-          (mapc #'disable-theme custom-enabled-themes)
-          (load-theme (intern theme) t)
-          (when (fboundp 'powerline-reset)
-            (powerline-reset)))
-      (error "Problem loading theme %s" theme))))
-#+END_SRC
-* Password store
-Function to get a password given a key.
-#+BEGIN_SRC elisp
-(defun dx:password-store/get-password (KEY)
-  (shell-command-to-string (concat "pass " KEY)))
-#+END_SRC
-* Insert newlines without o/O
-Insert a newline without having to exit normal mode!
-#+BEGIN_SRC elisp
-(defun dx:newline (&optional BACKWARD)
-  (interactive)
-  (message "%s" BACKWARD)
-  (let ((old (point)))
-    (cond ((and BACKWARD (= BACKWARD 1)) (+default/newline-above))
-          (t (+default/newline-below)))
-    (goto-char (+ old 1))
-    (evil-normal-state)))
-#+END_SRC
-* Convert auto-fill lines to long truncate-lines
-Consider some org file with auto filled lines.
-I don't like auto-filled lines.
-So I want to convert them.
-I've setup macros countless times to do this operation for me, may as well formalize it as a function.
-
-Firstly, I need a function to count the number of instances of some substring occur in some other string.
-Shamelessly copied from rosetta code.
-#+BEGIN_SRC elisp
-(defun dx:org/count-sub (str pat)
-  (loop with z = 0 with s = 0 while s do
-        (when (setf s (cl-search pat str :start2 s))
-          (incf z) (incf s (length pat)))
-        finally (return z)))
-#+END_SRC
-
-Then the main function, works like so:
-1) Search the text in the region for newlines then join the lines to make a single segment
-2) Search for sentences through Emacs builtin =forward-sentence= and =forward-char= functions then newline via sentences
-#+BEGIN_SRC elisp
-(defun dx:org/fill-to-long-lines ()
-  (interactive)
-  (let* ((beg (region-beginning))
-         (end (region-end))
-         (region-text (buffer-substring-no-properties beg end))
-         (n-sentences (dx:org/count-sub region-text "."))
-         (parsed-text (apply #'concatenate 'string (cl-loop for c from beg to end collect
-                                                            (if (string= (buffer-substring-no-properties c (+ c 1)) "\n") " "
-                                                              (buffer-substring-no-properties c (+ c 1)))))))
-    (delete-region beg end)
-    (insert parsed-text)
-    (message "%s" n-sentences)
-    (evil-normal-state)
-    (evil-digit-argument-or-evil-beginning-of-line)
-    (cl-loop for i from 1 to n-sentences do (forward-sentence) (forward-char) (newline))))
-#+END_SRC
diff --git a/Doom/.config/doom/packages.el b/Doom/.config/doom/packages.el
deleted file mode 100644
index d8532fd..0000000
--- a/Doom/.config/doom/packages.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;; -*- no-byte-compile: t; -*-
-;;; ~/.doom.d/packages.el
-
-(org-babel-load-file (expand-file-name (concat doom-private-dir "org/packages.org")))
diff --git a/Doom/.config/doom/snippets/c++-mode/For_reverse b/Doom/.config/doom/snippets/c++-mode/For_reverse
deleted file mode 100644
index 6dd5f56..0000000
--- a/Doom/.config/doom/snippets/c++-mode/For_reverse
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: For_reverse
-# key: forr
-# --
-for (${1:int} ${2:i} = ${3:sz}; $2 >= ${4:0}; --$2) {
-  $0
-}
\ No newline at end of file
diff --git a/Doom/.config/doom/snippets/csharp-mode/class ... { ... } b/Doom/.config/doom/snippets/csharp-mode/class ... { ... }
deleted file mode 100644
index 5e96938..0000000
--- a/Doom/.config/doom/snippets/csharp-mode/class ... { ... }
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: class ... { ... }
-# key: class
-# --
-
-${1:public} class ${2:Name}
-{
-    $0
-}
diff --git a/Doom/.config/doom/snippets/csharp-mode/foreach b/Doom/.config/doom/snippets/csharp-mode/foreach
deleted file mode 100644
index 220fcd9..0000000
--- a/Doom/.config/doom/snippets/csharp-mode/foreach
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: Foreach loop
-# key: foreach
-# condition: t                       
-# --
-foreach (${1:var} ${2:i} in ${3:collection})
-{
-    $0
-}
diff --git a/Doom/.config/doom/snippets/csharp-mode/method b/Doom/.config/doom/snippets/csharp-mode/method
deleted file mode 100644
index a2aaf6b..0000000
--- a/Doom/.config/doom/snippets/csharp-mode/method
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: public void Method { ... }
-# key: method
-# --
-${1:public} ${2:void} ${3:Method}(${4:int x})
-{
-    ${0:return x;}
-}
diff --git a/Doom/.config/doom/snippets/csharp-mode/params b/Doom/.config/doom/snippets/csharp-mode/params
deleted file mode 100644
index b781710..0000000
--- a/Doom/.config/doom/snippets/csharp-mode/params
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: /// <param>...</param>
-# key: comment
-# --
-
-/// <param name="$1">$0</param>
\ No newline at end of file
diff --git a/Doom/.config/doom/snippets/csharp-mode/prop b/Doom/.config/doom/snippets/csharp-mode/prop
deleted file mode 100644
index eb2969e..0000000
--- a/Doom/.config/doom/snippets/csharp-mode/prop
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: property ... ... { ... }
-# key: prop
-# condition: t
-# --
-public ${1:int} ${2:property} { get; set; }$0
\ No newline at end of file
diff --git a/Doom/.config/doom/snippets/csharp-mode/returns b/Doom/.config/doom/snippets/csharp-mode/returns
deleted file mode 100644
index dee5e8d..0000000
--- a/Doom/.config/doom/snippets/csharp-mode/returns
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: /// <returns>...</returns>
-# key: comment
-# --
-/// <returns>$0</returns>
\ No newline at end of file
diff --git a/Doom/.config/doom/snippets/org-mode/author b/Doom/.config/doom/snippets/org-mode/author
deleted file mode 100644
index 3da977e..0000000
--- a/Doom/.config/doom/snippets/org-mode/author
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: author
-# key: <au
-# --
-#+AUTHOR: $1
\ No newline at end of file
diff --git a/Doom/.config/doom/snippets/org-mode/date b/Doom/.config/doom/snippets/org-mode/date
deleted file mode 100644
index 37fa30d..0000000
--- a/Doom/.config/doom/snippets/org-mode/date
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: date
-# key: <da
-# --
-#+DATE: ${1:Year}:${2:month}:${3:day}
\ No newline at end of file
diff --git a/Doom/.config/doom/snippets/org-mode/description b/Doom/.config/doom/snippets/org-mode/description
deleted file mode 100644
index c880c80..0000000
--- a/Doom/.config/doom/snippets/org-mode/description
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: description
-# key: desc
-# --
-#+DESCRIPTION: ${1:description of your org-mode file}
\ No newline at end of file
diff --git a/Doom/.config/doom/snippets/org-mode/img b/Doom/.config/doom/snippets/org-mode/img
deleted file mode 100644
index 9da54ba..0000000
--- a/Doom/.config/doom/snippets/org-mode/img
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: img
-# key: img_
-# --
-<img src="$1"
- alt="$2" align="${3:left}"
- title="${4:image title}"
- class="img"
-</img>
-$0
\ No newline at end of file
diff --git a/Doom/.config/doom/snippets/org-mode/include b/Doom/.config/doom/snippets/org-mode/include
deleted file mode 100644
index 4938877..0000000
--- a/Doom/.config/doom/snippets/org-mode/include
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: include
-# key: <i
-# --
-#+INCLUDE: $1
\ No newline at end of file
diff --git a/Doom/.config/doom/snippets/org-mode/review b/Doom/.config/doom/snippets/org-mode/review
deleted file mode 100644
index c8143df..0000000
--- a/Doom/.config/doom/snippets/org-mode/review
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- mode: snippet -*-
-# name: Review template
-# key: REVIEW
-# --
-
-#+TITLE: $1
-
-* Short description
-$0
-* Where and when did I hear about $1?
-* What did I like about $1?
-* What did I dislike about $1?
-* Conclusion
-* Rating
diff --git a/Doom/.config/doom/snippets/org-mode/title b/Doom/.config/doom/snippets/org-mode/title
deleted file mode 100644
index 30d763a..0000000
--- a/Doom/.config/doom/snippets/org-mode/title
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: Title
-# key: <ti
-# --
-#+TITLE: ${1:What the hell}
diff --git a/Doom/.config/doom/snippets/web-mode/New component b/Doom/.config/doom/snippets/web-mode/New component
deleted file mode 100644
index 6f71f94..0000000
--- a/Doom/.config/doom/snippets/web-mode/New component
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- mode: snippet -*-
-# name: New component
-# key: rce
-# --
-
-import React, { Component } from 'react';
-
-class $1 extends Component {
-    state = {};
-    render() {
-        return (
-            <div>
-                $0
-            </div>
-        )
-    }
-}
-
-export default $1
\ No newline at end of file
diff --git a/Doom/.config/doom/themes/derivative-new-molokai-theme.el b/Doom/.config/doom/themes/derivative-new-molokai-theme.el
deleted file mode 100644
index 20abc7c..0000000
--- a/Doom/.config/doom/themes/derivative-new-molokai-theme.el
+++ /dev/null
@@ -1,55 +0,0 @@
-(deftheme derivative-new-molokai
-  "Created 2020-07-19.")
-
-(custom-theme-set-faces
- 'derivative-new-molokai
- '(cursor ((t (:background "#F92660"))))
- '(fixed-pitch ((t (:family "Source Code Pro" :foundry "ADBO" :width normal :height 113 :weight normal :slant normal))))
- '(variable-pitch ((((type w32)) (:foundry "outline" :family "Arial")) (t (:family "Sans Serif"))))
- '(escape-glyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown"))))
- '(homoglyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown"))))
- '(minibuffer-prompt ((t (:foreground "#FD971F"))))
- '(highlight ((t (:background "#333333"))))
- '(region ((t (:extend t :background "dim gray"))))
- '(shadow ((t (:foreground "#555556"))))
- '(secondary-selection ((t (:extend t :background "#525254"))))
- '(trailing-whitespace ((t (:background "red"))))
- '(font-lock-builtin-face ((t (:foreground "#FD971F"))))
- '(font-lock-comment-delimiter-face ((t (:inherit (font-lock-comment-face)))))
- '(font-lock-comment-face ((t (:slant normal :foreground "#555556"))))
- '(font-lock-constant-face ((t (:foreground "#FFFFFFF"))))
- '(font-lock-doc-face ((t (:slant normal :foreground "#7f7f80"))))
- '(font-lock-function-name-face ((t (:foreground "#A6E22E"))))
- '(font-lock-keyword-face ((t (:foreground "#F92660"))))
- '(font-lock-negation-char-face ((t (:foreground "#F92660" :inherit (bold)))))
- '(font-lock-preprocessor-face ((t (:foreground "#F92660" :inherit (bold)))))
- '(font-lock-regexp-grouping-backslash ((t (:foreground "#F92660" :inherit (bold)))))
- '(font-lock-regexp-grouping-construct ((t (:foreground "#F92660" :inherit (bold)))))
- '(font-lock-string-face ((t (:foreground "#E6DB74"))))
- '(font-lock-type-face ((t (:slant normal :foreground "#66D9EF"))))
- '(font-lock-variable-name-face ((t (:foreground "#F8F8F2"))))
- '(font-lock-warning-face ((t (:inherit (warning)))))
- '(button ((t (:inherit (link)))))
- '(link ((t (:weight bold :underline (:color foreground-color :style line) :foreground "#FD971F"))))
- '(link-visited ((t (:foreground "violet" :inherit (link)))))
- '(fringe ((t (:foreground "#4E4E4E" :inherit (default)))))
- '(header-line ((t (:foreground "#F8F8F2" :background "#272822"))))
- '(tooltip ((t (:foreground "#F8F8F2" :background "#2D2E2E"))))
- '(mode-line ((t (:box nil :background "#161613"))))
- '(mode-line-buffer-id ((t (:weight bold))))
- '(mode-line-emphasis ((t (:foreground "#FD971F"))))
- '(mode-line-highlight ((t (:inherit (highlight)))))
- '(mode-line-inactive ((t (:box nil :foreground "#4E4E4E" :background "#171819"))))
- '(isearch ((t (:foreground "#1B2229" :background "#A6E22E"))))
- '(isearch-fail ((t (:weight bold :foreground "#1B2229" :background "#E74C3C"))))
- '(lazy-highlight ((t (:weight bold :foreground "#1B2229" :background "#9C91E4"))))
- '(match ((t (:weight bold :foreground "#A6E22E" :background "#1B2229"))))
- '(next-error ((t (:inherit (region)))))
- '(query-replace ((t (:inherit (isearch)))))
- '(company-tooltip-selection ((t (:background "blue"))))
- '(company-tooltip-annotation ((t (:foreground "deep sky blue"))))
- '(default ((t (:inherit nil :extend nil :stipple nil :background "black" :foreground "#F8F8F2" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 113 :width normal :foundry "ADBO" :family "Source Code Pro"))))
- '(company-box-background ((t (:inherit company-tooltip))))
- '(company-tooltip ((t (:background "dim gray" :foreground "white")))))
-
-(provide-theme 'derivative-new-molokai)
diff --git a/Emacs/.config/emacs/.config/custom.el b/Emacs/.config/emacs/.config/custom.el
index b23ebcd..36813a8 100644
--- a/Emacs/.config/emacs/.config/custom.el
+++ b/Emacs/.config/emacs/.config/custom.el
@@ -4,13 +4,10 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(safe-local-variable-values
-   '((+license/license-choice            . "GPLv2")
-     (+license/license-choice            . "MIT")
-     (projectile-project-configure-cmd   . "make clean")
-     (projectile-project-test-cmd        . "make test")
-     (projectile-project-test-cmd        . "make run-test")
-     (projectile-project-run-cmd         . "make run")
-     (projectile-project-compilation-cmd . "make"))))
+   '((eval eglot-ensure)
+     (+license/license-choice . "GPLv2")
+     (+license/license-choice . "Unlicense")
+     (+license/license-choice . "MIT"))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/Emacs/.config/emacs/.config/eshell/aliases b/Emacs/.config/emacs/.config/eshell/aliases
index 17fa780..17b23f2 100644
--- a/Emacs/.config/emacs/.config/eshell/aliases
+++ b/Emacs/.config/emacs/.config/eshell/aliases
@@ -1,3 +1,5 @@
-alias ff find-file-other-window $1
+alias p~ project-root
+alias gt goto
+alias clear clear-scrollback
 alias d dired $1
-alias clear clear-scrollback
\ No newline at end of file
+alias ff find-file-other-window $1
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/accumulate b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/accumulate
deleted file mode 100644
index 496b75c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/accumulate
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: accumulate
-# key: acm
-# --
-auto sum = std::accumulate(std::begin(${1:container}), std::end($1), 0);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/accumulate-with-closure b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/accumulate-with-closure
deleted file mode 100644
index f2fd2cd..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/accumulate-with-closure
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: accumulate w/ closure
-# key: acl
-# --
-auto sum = std::accumulate(std::begin(${1:container}), std::end($1), 0, [](int total, $2) {
-  $3
-});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/adjacent_find b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/adjacent_find
deleted file mode 100644
index fd4c436..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/adjacent_find
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: adjacent_find
-# key: ajf
-# --
-auto pos = std::adjacent_find(std::begin(${1:container}), std::end($1));
-if (pos != std::end($1)) {
-  $2
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/all_of b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/all_of
deleted file mode 100644
index 299f837..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/all_of
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: all_of
-# key: alo
-# --
-if (std::all_of(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-})) {
-  $4
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/any_of b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/any_of
deleted file mode 100644
index 7c957f8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/any_of
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: any_of
-# key: ano
-# --
-if (std::any_of(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-})) {
-  $4
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/assert b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/assert
deleted file mode 100644
index a662dd8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/assert
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: assert
-# --
-assert($0);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/beginend b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/bend
index 26ee232..e5cc387 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/beginend
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/bend
@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: v.begin(), v.end()
-# key: beginend
+# key: bend
 # uuid: beginend
 # --
-${1:v}.begin(), $1.end
\ No newline at end of file
+${1:a}.begin(), $1.end()
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/boost_require b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/boost_require
deleted file mode 100644
index 7b05028..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/boost_require
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: boost_require
-# key: req
-# uuid: req
-# group: boost
-# --
-BOOST_REQUIRE( ${1:condition} );
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/class b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/class
deleted file mode 100644
index dcd73f9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/class
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: class
-# --
-class ${1:Name} {
-    public:
-        ${1:$(yas/substr yas-text "[^: ]*")}();
-        ${2:virtual ~${1:$(yas/substr yas-text "[^: ]*")}();}
-    $0
-};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/const_[] b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/const_[]
deleted file mode 100644
index 57eed01..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/const_[]
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: const_[]
-# key: c[
-# uuid: c[
-# --
-const ${1:Type}& operator[](${2:int index}) const
-{
-        $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/constructor b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/constructor
deleted file mode 100644
index f76454b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/constructor
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: constructor
-# key: ct
-# uuid: ct
-# --
-${1:Class}::$1(${2:args}) ${3: : ${4:init}} {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy
index 6db7b97..490d344 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: copy
-# key: cpy
+# key: copy
 # --
-std::copy(std::begin(${1:container}), std::end($1), std::begin($2));
\ No newline at end of file
+std::copy(${1:std::begin(${2:a})}, ${3:std::end($2)}, ${4:std::begin(${5:b})})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_backward b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_backward
deleted file mode 100644
index 74a986c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_backward
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: copy_backward
-# key: cpb
-# --
-std::copy_backward(std::begin(${1:container}), std::end($1), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_if b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_if
index 611aa75..05cdb6e 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_if
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_if
@@ -1,8 +1,8 @@
 # -*- mode: snippet -*-
 # name: copy_if
-# key: cpi
+# key: copy_if
 # --
-std::copy_if(std::begin(${1:container}), std::end($1), std::begin($2),
-[]($3) {
-  $4
-});
\ No newline at end of file
+std::copy_if(std::begin(${1:a}), std::end($1), std::begin(${2:b}),
+${3:[](${4:auto x}) {
+  ${5:return true;}
+}});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_n b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_n
index af2f225..281f094 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_n
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_n
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: copy_n
-# key: cpn
+# key: copy_n
 # --
-std::copy_n(std::begin(${1:container}), $2, std::end($1));
\ No newline at end of file
+std::copy_n(std::begin(${1:a}), ${2:n}, std::begin(${3:b}));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_ostream_iter b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_ostream_iter
deleted file mode 100644
index d836ecb..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_ostream_iter
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: copy
-# key: oit
-# --
-std::copy(std::begin(${1:container}), std::end($1), std::ostream_iterator<$2>{
-%\istd::cout, "$3"
-});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/count b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/count
index 95936e2..453fd11 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/count
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/count
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: count
-# key: cnt
+# key: count
 # --
-auto n = std::count(std::begin(${1:container}), std::end($1), $2);
\ No newline at end of file
+std::count(std::begin(${1:a}), std::end($1), ${2:b});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/count_if b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/count_if
index dccc852..6abbf9c 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/count_if
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/count_if
@@ -2,6 +2,6 @@
 # name: count_if
 # key: count_if
 # --
-auto n = std::count_if(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-});
\ No newline at end of file
+std::count_if(std::begin(${1:a}), std::end($1), ${2:[](${3:auto x}) {
+  ${4:return true;}
+}});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/cstd b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/cstd
deleted file mode 100644
index 44074c9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/cstd
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: cstd
-# key: cstd
-# uuid: cstd
-# --
-#include <cstdlib>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d+= b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d+=
deleted file mode 100644
index e5c32c9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d+=
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: d+=
-# key: d+=
-# uuid: d+=
-# --
-${1:MyClass}& operator+=(${2:const $1 &});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator
deleted file mode 100644
index b92780d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: d_operator<<
-# key: <<
-# uuid: <<
-# --
-friend std::ostream& operator<<(std::ostream&, const ${1:Class}&);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator[] b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator[]
deleted file mode 100644
index a96be67..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator[]
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: d_operator[]
-# key: [
-# uuid: [
-# --
-${1:Type}& operator[](${2:int index});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator[]_const b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator[]_const
deleted file mode 100644
index 9c3a1ab..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator[]_const
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: d_operator[]_const
-# key: c[
-# uuid: c[
-# --
-const ${1:Type}& operator[](${2:int index}) const;
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator_istream b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator_istream
deleted file mode 100644
index d38c0fc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator_istream
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: d_operator>>
-# key: >>
-# --
-friend std::istream& operator>>(std::istream&, const ${1:Name}&);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator_ostream b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator_ostream
deleted file mode 100644
index d23f4d6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator_ostream
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: d_operator<<
-# key: <<
-# --
-friend std::ostream& operator<<(std::ostream&, const ${1:Name}&);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/delete b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/delete
deleted file mode 100644
index cf0376c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/delete
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: delete
-# key: dl
-# uuid: dl
-# --
-delete ${1:pointer};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/delete[] b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/delete[]
deleted file mode 100644
index eb85608..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/delete[]
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: delete[]
-# key: dla
-# uuid: dla
-# --
-delete[] ${1:arr};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/dynamic_casting b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/dynamic_casting
deleted file mode 100644
index a016c70..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/dynamic_casting
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: dynamic_casting
-# key: cast
-# uuid: cast
-# --
-check_and_cast<${1:Type} *>(${2:msg});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/enum b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/enum
deleted file mode 100644
index 99f9923..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/enum
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: enum
-# --
-enum ${1:NAME} {$0};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/equal b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/equal
index 09cfb44..a46eeb2 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/equal
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/equal
@@ -1,7 +1,5 @@
 # -*- mode: snippet -*-
 # name: equal
-# key: eql
+# key: equal
 # --
-if (std::equal(std::begin(${1:container}), std::end($1), std::begin($2))) {
-  $3
-}
\ No newline at end of file
+std::equal(std::begin(${1:a}), std::end($1), std::begin(${2:b}))
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/erase b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/erase
deleted file mode 100644
index 4ab6679..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/erase
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: remove
-# key: erm
-# --
-${1:container}.erase(std::remove(std::begin($1), std::end($1), $2), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/erase_find_last_not_of b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/erase_find_last_not_of
deleted file mode 100644
index d2cf0b1..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/erase_find_last_not_of
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: generate_n
-# key: erf
-# --
-${1:container}.erase($1.find_last_not_of(" \t\n\r") + 1);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fill b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fill
index 99130c9..e5e6923 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fill
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fill
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: fill
-# key: fil
+# key: fill
 # --
-std::fill(std::begin(${1:container}), std::end($1), $2);
\ No newline at end of file
+std::fill(std::begin(${1:a}), std::end($1), ${2:n});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fill_n b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fill_n
index 5c6b04a..f48a218 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fill_n
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fill_n
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: fill_n
-# key: fln
+# key: fill_n
 # --
-std::fill_n(std::begin(${1:container}), $2, $3);
\ No newline at end of file
+std::fill_n(std::begin(${1:v}), ${2:a}, ${3:n});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fin b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fin
deleted file mode 100644
index 41eaf6c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fin
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: find_if_not
-# key: fin
-# --
-auto pos = std::find_if_not(std::begin(${1:container}), std::end($1),[]($2) {
-  $3
-});
-if (pos != std::end($1)) {
-  $4
-}
-$0
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find
index f45093b..c4f16e1 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find
@@ -1,8 +1,5 @@
 # -*- mode: snippet -*-
 # name: find
-# key: fnd
+# key: find
 # --
-auto pos = std::find(std::begin(${1:container}), std::end($1), $2);
-if (pos != std::end($1)) {
-  $3
-}
\ No newline at end of file
+std::find(std::begin(${1:v}), std::end$(1), ${2:a});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_end b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_end
deleted file mode 100644
index 2eca444..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_end
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: find_end
-# key: fne
-# --
-auto pos = std::find_std::end(
-  std::begin(${1:container}), std::end($1),
-  std::begin($2), std::end($3)
-);
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_first_of b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_first_of
index 8217cc1..6d845f4 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_first_of
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_first_of
@@ -1,11 +1,8 @@
 # -*- mode: snippet -*-
 # name: find_first_of
-# key: ffo
+# key: find_first_of
 # --
-auto pos = std::find_first_of(
-  std::begin(${1:container}), std::end($1),
-  std::begin($2), std::end($3)
-);
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
+std::find_first_of(
+  std::begin(${1:a}), std::end($1),
+  std::begin(${2:b}), std::end($2)
+);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_if b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_if
index 1c02a0b..985aa0d 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_if
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_if
@@ -1,10 +1,7 @@
 # -*- mode: snippet -*-
 # name: find_if
-# key: fni
+# key: find_if
 # --
-auto pos = std::find_if(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-});
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
+std::find_if(std::begin(${1:v}), std::end($1), ${2:[](${3:auto x}) {
+  ${4:return true;}
+}});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_if_not b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_if_not
new file mode 100644
index 0000000..b1d32f4
--- /dev/null
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_if_not
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: find_if_not
+# key: find_if_not
+# --
+std::find_if_not(std::begin(${1:v}), std::end($1), ${2:[](${3:auto x}) {
+  ${4:return true;}
+}});
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fixture b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fixture
deleted file mode 100644
index f628b95..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fixture
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: fixture
-# key: fixt
-# uuid: fixt
-# --
-BOOST_FIXTURE_TEST_SUITE( ${1:name}, ${2:Fixture} )
-
-$0
-
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_each b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_each
index de1fbbb..22f9fb0 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_each
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_each
@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: for_each
-# key: fre
+# key: for_each
 # --
-std::for_each(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-});
\ No newline at end of file
+std::for_each(std::begin(${1:container}), std::end($1), ${2:[](${3:auto x}) {
+  ${4:(void) x;}
+}});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_element b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_element
new file mode 100644
index 0000000..9295e64
--- /dev/null
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_element
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: for_element
+# key: fore
+# --
+for (${1:const auto &x} : ${2:u}) {
+  $0
+}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_iter b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_iter
index 2e76242..3199fea 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_iter
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_iter
@@ -3,6 +3,6 @@
 # key: fori
 # uuid: fori
 # --
-for (${1:iter}=${2:var}.begin(); $1!=$2.end(); ++$1) {
+for (auto ${1:iter} = std::begin(${2:var}); $1 != std::end($2); ++$1) {
     $0
 }
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/friend b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/friend
deleted file mode 100644
index df0c024..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/friend
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: friend
-# key: fr
-# uuid: fr
-# --
-friend $0;
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fun_declaration b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fun_declaration
deleted file mode 100644
index 795365c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fun_declaration
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: fun_declaration
-# key: f
-# uuid: f
-# --
-${1:void} ${2:name}($3)$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/function b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/function
deleted file mode 100644
index 52d0402..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/function
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: function
-# --
-${1:void} ${2:Class}::${3:name}($4)${5: const} {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/generate b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/generate
deleted file mode 100644
index 73d65a9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/generate
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: generate
-# key: gnr
-# --
-std::generate(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/generate_n b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/generate_n
deleted file mode 100644
index 8084b14..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/generate_n
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: generate_n
-# key: gnn
-# --
-std::generate_n(std::begin(${1:container}), $2, []($3) {
-  $4
-});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/gtest b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/gtest
deleted file mode 100644
index 4cc61a8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/gtest
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: gtest
-# key: gtest
-# uuid: gtest
-# group: testing
-# --
-#include <gtest/gtest.h>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/ignore b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/ignore
deleted file mode 100644
index 3a3c610..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/ignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: ignore
-# key: ignore
-# uuid: ignore
-# --
-${1:std::}cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include
deleted file mode 100644
index c4f4d44..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: #include <lib>
-# key: inc
-# --
-#include <${1:lib}>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_iostream b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_iostream
deleted file mode 100644
index b1ba34c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_iostream
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: #include <iostream>
-# key: iio
-# uuid: iio
-# --
-#include <iostream>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_sstream b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_sstream
deleted file mode 100644
index bd97bcb..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_sstream
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: #include <sstream>
-# key: iss
-# uuid: iss
-# --
-#include <sstream>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_string b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_string
deleted file mode 100644
index 686660a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_string
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: #include <string>
-# key: istr
-# uuid: istr
-# --
-#include <string>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/inline b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/inline
deleted file mode 100644
index e545492..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/inline
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: inline
-# key: il
-# uuid: il
-# --
-inline $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/iota b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/iota
index 2690ac4..742dbb7 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/iota
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/iota
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: iota
-# key: ita
+# key: iota
 # --
-std::iota(std::begin(${1:container}), std::end($1), $2);
\ No newline at end of file
+std::iota(std::begin(${1:v}), std::end($1), ${2:n});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_heap b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_heap
deleted file mode 100644
index 24048b2..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_heap
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: is_heap
-# key: ihp
-# --
-if (std::is_heap(std::begin(${1:container}), std::end($1))) {
-  $2
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_heap_until b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_heap_until
deleted file mode 100644
index 99bf8f0..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_heap_until
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: is_heap_until
-# key: ihu
-# --
-auto pos = std::is_heap_until(std::begin(${1:container}), std::end($1));
-if (pos != std::end($1)) {
-  $2
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_partitioned b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_partitioned
deleted file mode 100644
index 48877b5..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_partitioned
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: is_partitioned
-# key: ipt
-# --
-if (std::is_partitioned(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-})) {
-  $4
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_permutation b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_permutation
deleted file mode 100644
index eee5ba3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_permutation
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: is_permutation
-# key: ipr
-# --
-if (std::is_permutation(std::begin(${1:container}), std::end($1), std::begin($2))) {
-  $3
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_sorted b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_sorted
index ddc3a96..46de96d 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_sorted
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_sorted
@@ -1,7 +1,5 @@
 # -*- mode: snippet -*-
 # name: is_sorted
-# key: iss
+# key: is_sorted
 # --
-if (std::is_sorted(std::begin(${1:container}), std::end($1))) {
-  $2
-}
\ No newline at end of file
+std::is_sorted(std::begin(${1:v}), std::end($1))
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_sorted_until b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_sorted_until
deleted file mode 100644
index 9eb6699..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_sorted_until
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: is_sorted_until
-# key: isu
-# --
-auto pos = std::is_sorted_until(std::begin(${1:container}), std::end($1));
-if (pos != std::end($1)) {
-  $2
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/iterator b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/iterator
index fe2b5cd..85c812d 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/iterator
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/iterator
@@ -3,4 +3,4 @@
 # key: iter
 # uuid: iter
 # --
-${1:std::}${2:vector<int>}::iterator ${3:iter};
+${1:std::vector<int>}::iterator ${3:iter};
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/lambda b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/lambda
index aa72fa3..59fa225 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/lambda
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/lambda
@@ -2,4 +2,4 @@
 # name: lambda
 # key: lam
 # --
-[$1]($2) { `(!%!)`$3 }
\ No newline at end of file
+[$1]($2) { $0 }
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/lexigraphical_compare b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/lexigraphical_compare
index 2d6dd06..f6c19d6 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/lexigraphical_compare
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/lexigraphical_compare
@@ -1,7 +1,5 @@
 # -*- mode: snippet -*-
 # name: lexigraphical_compare
-# key: lxc
+# key: lexigraphical_compare
 # --
-if (std::lexigraphical_compare(std::begin(${1:container}), std::end($1), std::begin($2), std::end($3))) {
-  $4
-}
\ No newline at end of file
+std::lexigraphical_compare(std::begin(${1:a}), std::end($1), std::begin(${2:b}), std::end($2))
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/make_heap b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/make_heap
deleted file mode 100644
index 6640b0e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/make_heap
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: make_heap
-# key: mkh
-# --
-std::make_heap(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/map b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/map
deleted file mode 100644
index ff349e1..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/map
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: map
-# key: map
-# uuid: map
-# --
-std::map<${1:type1}$0> ${2:var};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/max_element b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/max_element
index 4a29080..2cd3721 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/max_element
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/max_element
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: max_element
-# key: mxe
+# key: max_element
 # --
-auto pos = std::max_element(std::begin(${1:container}), std::end($1));
\ No newline at end of file
+std::max_element(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/member_function b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/member_function
deleted file mode 100644
index ccc03fd..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/member_function
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: member_function
-# key: mf
-# --
-${1:type} ${2:Name}::${3:name}(${4:args})${5: const}
-{
-        $0
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/merge b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/merge
deleted file mode 100644
index c4753a2..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/merge
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: merge
-# key: mrg
-# --
-std::merge(std::begin(${1:container}), std::end($1),
-std::begin($2), std::end($3), std::begin($4));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/min_element b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/min_element
index e85d6f2..39fcfc6 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/min_element
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/min_element
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: min_element
-# key: mne
+# key: min_element
 # --
-auto pos = std::min_element(std::begin(${1:container}), std::end($1));
\ No newline at end of file
+std::min_element(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/minmax_element b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/minmax_element
index b80f63b..4c36571 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/minmax_element
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/minmax_element
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: minmax_element
-# key: mme
+# key: minmax_element
 # --
-auto minmax = std::minmax_element(std::begin(${1:container}), std::end($1));
\ No newline at end of file
+std::minmax_element(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/mismatch b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/mismatch
deleted file mode 100644
index 243ee0f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/mismatch
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: mismatch
-# key: msm
-# --
-auto values = std::mismatch(std::begin(${1:container}), std::end($1), std::begin($1));
-if (values.first == std::end($1)) {
-  $2
-} else {
-  $3
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/module b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/module
deleted file mode 100644
index c203632..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/module
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: module
-# key: mod
-# uuid: mod
-# --
-class ${1:Class} : public cSimpleModule
-{
-   $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/move_backward b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/move_backward
deleted file mode 100644
index 62e7849..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/move_backward
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: move_backward
-# key: mpb
-# --
-std::move_backward(std::begin(${1:container}), std::end($1), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/namespace b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/namespace
deleted file mode 100644
index e4afdb0..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/namespace
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name : namespace ...
-# key: ns
-# uuid: ns
-# --
-namespace ${1:name}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/namespace_block b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/namespace_block
deleted file mode 100644
index 839ef70..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/namespace_block
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: namespace
-# key: nss
-# --
-namespace ${1:name} {
-  $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/next_permutation b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/next_permutation
deleted file mode 100644
index 78b468a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/next_permutation
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: next_permutation
-# key: nxp
-# --
-if (std::next_permutation(std::begin(${1:container}), std::end($1))) {
-  $2
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/none_of b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/none_of
index 88a716d..eb9b23e 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/none_of
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/none_of
@@ -1,9 +1,7 @@
 # -*- mode: snippet -*-
 # name: none_of
-# key: nno
+# key: none_of
 # --
-if (std::none_of(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-})) {
-  $4
-}
\ No newline at end of file
+std::none_of(std::begin(${1:container}), std::end($1), ${2:[](${3:auto x}) {
+  ${4:return true;}
+}});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/nth_element b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/nth_element
deleted file mode 100644
index b0da080..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/nth_element
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: nth_element
-# key: nth
-# --
-std::nth_element(std::begin(${1:container}), std::end($1), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator!= b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator!=
deleted file mode 100644
index 5cf876b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator!=
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator!=
-# key: !=
-# uuid: !=
-# group: operator overloading
-# --
-bool ${1:MyClass}::operator!=(const $1 &other) const {
-    return !(*this == other);
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator+ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator+
deleted file mode 100644
index 0d4d10c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator+
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator+
-# key: +
-# uuid: +
-# group: operator overloading
-# --
-${1:MyClass} $1::operator+(const $1 &other)
-{
-    $1 result = *this;
-    result += other;
-    return result;
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator+= b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator+=
deleted file mode 100644
index 643a65e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator+=
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator+=
-# key: +=
-# uuid: +=
-# group: operator overloading
-# --
-${1:MyClass}& $1::operator+=(${2:const $1 &rhs})
-{
-  $0
-  return *this;
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator= b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator=
deleted file mode 100644
index 08f2e67..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator=
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator=
-# key: =
-# uuid: =
-# where this is a reference to myself
-# group: operator overloading
-# --
-${1:MyClass}& $1::operator=(const $1 &rhs) {
-    // Check for self-assignment!
-    if (this == &rhs)
-      return *this;
-    $0
-    return *this;
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator== b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator==
deleted file mode 100644
index 08f804e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator==
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator==
-# key: ==
-# uuid: ==
-# group: operator overloading
-# --
-bool ${1:MyClass}::operator==(const $1 &other) const {
-     $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator[] b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator[]
deleted file mode 100644
index 9bfea7d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator[]
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator[]
-# key: []
-# uuid: []
-# group: operator overloading
-# --
-${1:Type}& operator[](${2:int index})
-{
-        $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator_istream b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator_istream
index 9b4c8c2..73c3ff7 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator_istream
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator_istream
@@ -1,10 +1,11 @@
 # -*- mode: snippet -*-
 # name: operator>>
-# key: >>
+# key: operator>>
 # uuid: >>
 # group: operator overloading
 # --
 istream& operator>>(istream& s, const ${1:type}& ${2:c})
 {
-         $0
+  $0
+  return s;
 }
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator_ostream b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator_ostream
index 9463e2c..ac28638 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator_ostream
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator_ostream
@@ -1,11 +1,11 @@
 # -*- mode: snippet -*-
 # name: operator<<
-# key: <<
+# key: operator<<
 # uuid: <<
 # group: operator overloading
 # --
 std::ostream& operator<<(std::ostream& s, const ${1:type}& ${2:c})
 {
-         $0
-         return s;
+  $0
+  return s;
 }
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/ostream b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/ostream
deleted file mode 100644
index b0054f7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/ostream
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: ostream
-# key: os
-# uuid: os
-# --
-#include <ostream>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/pack b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/pack
deleted file mode 100644
index c15b02e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/pack
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: pack
-# key: pack
-# uuid: pack
-# --
-void cNetCommBuffer::pack(${1:type}) {
-
-}
-
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partial_sort b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partial_sort
deleted file mode 100644
index eafb136..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partial_sort
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: partial_sort
-# key: pst
-# --
-std::partial_sort(std::begin(${1:container}), std::end($1), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partial_sort_copy b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partial_sort_copy
deleted file mode 100644
index be91ecd..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partial_sort_copy
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: partial_sort_copy
-# key: psc
-# --
-std::partial_sort_copy(std::begin(${1:container}), std::end($1),
-                       std::begin($2), std::end($3));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition
deleted file mode 100644
index e381b28..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: partition
-# key: ptn
-# --
-auto pos = std::partition(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-});
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition_copy b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition_copy
deleted file mode 100644
index f74d0da..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition_copy
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: partition_copy
-# key: ptc
-# --
-std::partition_copy(std::begin(${1:container}), std::end($1),
-                    std::begin($2), std::end($3));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition_point b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition_point
deleted file mode 100644
index d890532..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition_point
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: partition_point
-# key: ppt
-# --
-auto pos = std::partition_point(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-});
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/prev_permutation b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/prev_permutation
deleted file mode 100644
index 9b202f6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/prev_permutation
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: prev_permutation
-# key: prp
-# --
-if (std::prev_permutation(std::begin(${1:container}), std::end($1))) {
-  $2
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/private b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/private
deleted file mode 100644
index ddf50d7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/private
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: private
-# expand-env: ((yas-also-auto-indent-first-line t))
-# --
-private:
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/protected b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/protected
deleted file mode 100644
index 931eb2e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/protected
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: protected
-# expand-env: ((yas-also-auto-indent-first-line t))
-# --
-protected:
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/public b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/public
deleted file mode 100644
index 04b1afb..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/public
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: public
-# expand-env: ((yas-also-auto-indent-first-line t))
-# --
-public:
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/push_heap b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/push_heap
deleted file mode 100644
index 281a847..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/push_heap
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: push_heap
-# key: phh
-# --
-std::push_heap(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/random_shuffle b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/random_shuffle
index bbc078d..af7be45 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/random_shuffle
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/random_shuffle
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: random_shuffle
-# key: shf
+# key: random_shuffle
 # --
 std::random_shuffle(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove
index 3cbee04..10b0d10 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove
@@ -1,8 +1,5 @@
 # -*- mode: snippet -*-
 # name: remove
-# key: rmv
+# key: remove
 # --
-auto pos = std::remove(std::begin(${1:container}), std::end($1), $2);
-if (pos != std::end($1)) {
-  $3
-}
\ No newline at end of file
+std::remove(std::begin(${1:v}), std::end($1), ${2:n});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_copy b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_copy
index 3dbf85a..4312811 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_copy
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_copy
@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: remove_copy
-# key: rmc
+# key: remove_copy
 # --
-std::remove_copy(std::begin(${1:container}), std::end($1),
-  std::begin($1), $2);
\ No newline at end of file
+std::remove_copy(std::begin(${1:u}), std::end($1),
+  std::begin(${2:v}), ${3:n});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_copy_if b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_copy_if
index cba8760..66be9b8 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_copy_if
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_copy_if
@@ -1,9 +1,9 @@
 # -*- mode: snippet -*-
 # name: remove_copy_if
-# key: rmf
+# key: remove_copy_if
 # --
-std::remove_copy_if(std::begin(${1:container}), std::end($1),
-  std::begin($1), []($2) {
-    $3
-  }
+std::remove_copy_if(std::begin(${1:u}), ${2:std::end($1)},
+  std::begin(${3:v}), ${4:[](${5:auto x}) {
+    ${6:return true;}
+  }}
 );
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_if b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_if
index e12d0c8..b4f7814 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_if
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_if
@@ -1,10 +1,7 @@
 # -*- mode: snippet -*-
 # name: remove_if
-# key: rmi
+# key: remove_if
 # --
-auto pos = std::remove_if(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-});
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
+std::remove_if(std::begin(${1:u}), ${2:std::end($1)}, ${3:[](${4:auto x}) {
+  ${5:return true;}
+}});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace
index be2729e..c765530 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: replace
-# key: rpl
+# key: replace
 # --
-std::replace(std::begin(${1:container}), std::end($1), $2, $3);
\ No newline at end of file
+std::replace(std::begin(${1:container}), std::end($1), ${2:old}, ${3:new});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_copy b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_copy
index a085f1d..67a0866 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_copy
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_copy
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: replace_copy
-# key: rpc
+# key: replace_copy
 # --
-std::replace_copy(std::begin(${1:container}), std::end($1), std::begin($1), $2, $3);
\ No newline at end of file
+std::replace_copy(std::begin(${1:u}), std::end($1), std::begin(${2:v}), ${3:old}, ${4:new});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_copy_if b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_copy_if
index 4558e0d..709026d 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_copy_if
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_copy_if
@@ -1,12 +1,13 @@
 # -*- mode: snippet -*-
 # name: replace_copy_if
-# key: rci
+# key: replace_copy_if
 # --
 std::replace_copy_if(
-  std::begin(${1:container}),
+  std::begin(${1:u}),
   std::end($1),
-  std::begin($1), []($2) {
-    $3
-  },
-  $4
+  std::begin(${2:v}),
+  ${3:[](${4:auto x}) {
+    ${5:return true;}
+  }},
+  ${6:new}
 );
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_if b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_if
index 9cc11d3..494238c 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_if
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_if
@@ -1,11 +1,11 @@
 # -*- mode: snippet -*-
 # name: replace_if
-# key: rpi
+# key: replace_if
 # --
 std::replace_if(
-  std::begin(${1:container}),
-  std::end($1), []($2) {
-    $3
-  },
-  $4
+  std::begin(${1:v}),
+  std::end($1), ${2:[](${3:auto x}) {
+    ${4:return true;}
+  }},
+  ${5:new}
 );
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/reverse b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/reverse
index 8a64ca1..48c6105 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/reverse
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/reverse
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: reverse
-# key: rvr
+# key: reverse
 # --
-std::reverse(std::begin(${1:container}), std::end($1));
\ No newline at end of file
+std::reverse(std::begin(${1:container}, std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/rotate b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/rotate
index 1fb59ec..b2786ed 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/rotate
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/rotate
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: rotate
-# key: rte
+# key: rotate
 # --
-std::rotate(std::begin(${1:container}), std::begin($2), std::end($1));
\ No newline at end of file
+std::rotate(std::begin(${1:u}), ${2:middle}, std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/rotate_copy b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/rotate_copy
deleted file mode 100644
index 287fb07..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/rotate_copy
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: rotate_copy
-# key: rtc
-# --
-std::rotate_copy(std::begin(${1:container}), std::begin($2), std::end($1), std::begin($3));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/search b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/search
index 580a29a..324b483 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/search
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/search
@@ -1,9 +1,5 @@
 # -*- mode: snippet -*-
 # name: search
-# key: srh
+# key: search
 # --
-auto pos = std::search(std::begin(${1:container}), std::end($1),
-  std::begin($2), std::end($3));
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
+std::search(std::begin(${1:u}), std::end($1), std::begin(${2:v}), std::end($2));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/search_n b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/search_n
index 7f7f879..0b6338b 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/search_n
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/search_n
@@ -1,8 +1,5 @@
 # -*- mode: snippet -*-
 # name: search_n
-# key: srn
+# key: search_n
 # --
-auto pos = std::search_n(std::begin(${1:container}), std::end($1),$2,$3);
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
+std::search_n(std::begin(${1:u}), std::end($1), ${2:size}, ${3:value});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/sort b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/sort
index 4b88ee8..3574a79 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/sort
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/sort
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: sort
-# key: srt
+# key: sort
 # --
 std::sort(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/sort_heap b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/sort_heap
index c83c6a9..8516bd5 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/sort_heap
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/sort_heap
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: sort_heap
-# key: sth
+# key: sort_heap
 # --
 std::sort_heap(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/stable_partition b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/stable_partition
index 1c3b9f7..035c844 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/stable_partition
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/stable_partition
@@ -1,10 +1,7 @@
 # -*- mode: snippet -*-
 # name: stable_partition
-# key: spt
+# key: stable_partition
 # --
-auto pos = std::stable_partition(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-});
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
+std::stable_partition(std::begin(${1:u}), std::end($1), ${3:[](${4:auto x}) {
+  ${5:return true;}
+}});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/stable_sort b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/stable_sort
index 74cede9..7248aa8 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/stable_sort
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/stable_sort
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: stable_sort
-# key: sts
+# key: stable_sort
 # --
 std::stable_sort(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/std b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/std
deleted file mode 100644
index 5df8934..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/std
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: std
-# key: std
-# uuid: std
-# --
-using namespace std;
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/std_colon b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/std_colon
deleted file mode 100644
index 950aa0e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/std_colon
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: std::
-# key: st
-# uuid: st
-# --
-std::$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/swap_ranges b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/swap_ranges
index 9f2f4b5..17c60f3 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/swap_ranges
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/swap_ranges
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: swap_ranges
-# key: swr
+# key: swap_ranges
 # --
-std::swap_ranges(std::begin(${1:container}), std::end($1), std::begin($2));
\ No newline at end of file
+std::swap_ranges(std::begin(${1:u}), std::end($1), std::begin(${2:v}));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/template b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/template
deleted file mode 100644
index f40864d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/template
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: template
-# key: temp
-# uuid: temp
-# --
-template<${1:$$(yas/choose-value '("typename" "class"))} ${2:T}>
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test-case b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test-case
deleted file mode 100644
index 8af5260..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test-case
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: test case
-# key: tc
-# uuid: tc
-# group: testing
-# --
-BOOST_AUTO_TEST_CASE( ${1:test_case} )
-{
-        $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test_main b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test_main
deleted file mode 100644
index c96e40d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test_main
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: test_main
-# key: test_main
-# uuid: test_main
-# group: testing
-# --
-int main(int argc, char **argv) {
-      ::testing::InitGoogleTest(&argc, argv);
-       return RUN_ALL_TESTS();
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test_suite b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test_suite
deleted file mode 100644
index dc6dda3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test_suite
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: test_suite
-# key: ts
-# uuid: ts
-# group: testing
-# --
-BOOST_AUTO_TEST_SUITE( ${1:test_suite1} )
-
-$0
-
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/this b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/this
deleted file mode 100644
index 173cb26..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/this
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: this
-# --
-this
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/throw b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/throw
deleted file mode 100644
index d264dd7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/throw
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: throw
-# key: throw
-# uuid: throw
-# --
-throw ${1:MyError}($0);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform
index 12d4881..d3fb9ee 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform
@@ -1,9 +1,8 @@
 # -*- mode: snippet -*-
 # name: transform
-# key: tfm
+# key: transform
 # --
-std::transform(std::begin(${1:container}), std::end($1),
-  std::begin($1), []($2) {
-$3%
-});
-$0
+std::transform(std::begin(${1:u}), std::end($1),
+  std::begin(${2:$1}), ${3:[](${4:auto x}) {
+  ${5:return x;}
+}});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform-with-closure b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform-with-closure
deleted file mode 100644
index 51427c7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform-with-closure
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: transform
-# key: upr
-# --
-std::transform(std::begin(${1:container}), std::end($1), std::begin($1), [](char c) {
-  `(or (concat % "\n") "")`return std::toupper(c);
-});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform_lowercase b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform_lowercase
deleted file mode 100644
index 045c98b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform_lowercase
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: string to lower case
-# key: lwr
-# --
-std::transform(std::begin(${1:container}), std::end($1), std::begin($1), [](char c) {
-  `(or (concat % "\n") "")`return std::tolower(c);
-});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/trim_left b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/trim_left
deleted file mode 100644
index c456570..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/trim_left
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: remove whitespace at beginning
-# key: ltr
-# --
-${1:container}.erase(0, $1.find_first_not_of(" \t\n\r"));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/tryw b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/tryw
deleted file mode 100644
index 004d15c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/tryw
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: tryw
-# key: tryw
-# uuid: tryw
-# --
-try {
-    `(or yas/selected-text (car kill-ring))`
-} catch ${1:Exception} {
-
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/unique b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/unique
index 7268a3d..fff99af 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/unique
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/unique
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: unique
-# key: uqe
+# key: unique
 # --
-auto pos = std::unique(std::begin(${1:container}), std::end($1));
\ No newline at end of file
+std::unique(std::begin(${1:u}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/unique_copy b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/unique_copy
index 709b875..3738983 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/unique_copy
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/unique_copy
@@ -1,6 +1,5 @@
 # -*- mode: snippet -*-
 # name: unique_copy
-# key: ucp
+# key: unique_copy
 # --
-std::unique_copy(std::begin(${1:container}), std::end($1),
-  std::ostream_iterator<string>(std::cout, "\n"));
\ No newline at end of file
+std::unique_copy(std::begin(${1:u}), std::end($1), std::begin(${2:v}));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/using b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/using
deleted file mode 100644
index 3c113ce..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/using
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: using namespace ... 
-# key: using
-# uuid: using
-# --
-using namespace ${std};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/define b/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/define
deleted file mode 100644
index d4dc177..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/define
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: define
-# key: def
-# uuid: def
-# --
-#define $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/malloc b/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/malloc
index 77b7465..af0aa98 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/malloc
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/malloc
@@ -3,5 +3,5 @@
 # key: malloc
 # uuid: malloc
 # --
-malloc(sizeof($1)${2: * ${3:3}});
+malloc(sizeof($1)${2: * ${3:0}});
 $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/packed b/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/packed
deleted file mode 100644
index 1f352fc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/packed
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: packed
-# key: packed
-# uuid: packed
-# --
-__attribute__((__packed__))$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/printf b/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/printf
index dda7206..1af5fb6 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/printf
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/printf
@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: printf
-# key: p
-# uuid: p
+# key: printf
+# uuid: printf
 # --
 printf("${1:format}"${2:, $3});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/stdio b/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/stdio
deleted file mode 100644
index 76618fd..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/stdio
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: stdio
-# --
-#include <stdio.h>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/stdlib b/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/stdlib
deleted file mode 100644
index d853ac4..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/stdlib
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: stdlib
-# --
-#include <stdlib.h>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/string b/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/string
deleted file mode 100644
index 3240494..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/string
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: string
-# --
-#include <string.h>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/union b/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/union
index a1c60cb..8f2693c 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/union
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/union
@@ -3,6 +3,6 @@
 # key: union
 # uuid: union
 # --
-typedef union {
+union ${1:name} {
         $0
-} ${1:name};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/unistd b/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/unistd
deleted file mode 100644
index de59d9e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/unistd
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: unistd
-# key: uni
-# uuid: uni
-# --
-#include <unistd.h>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/assert b/Emacs/.config/emacs/.config/yasnippet/snippets/cc-mode/assert
index 15dbcc3..c4538bc 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c-mode/assert
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/cc-mode/assert
@@ -3,5 +3,4 @@
 # key: ass
 # uuid: ass
 # --
-#include <assert.h>
-$0
\ No newline at end of file
+assert($1 && $2);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/cc-mode/define b/Emacs/.config/emacs/.config/yasnippet/snippets/cc-mode/define
new file mode 100644
index 0000000..ad12f3b
--- /dev/null
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/cc-mode/define
@@ -0,0 +1,4 @@
+# key: #def
+# name: define
+# --
+#define $1 $2
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/doc b/Emacs/.config/emacs/.config/yasnippet/snippets/cc-mode/dox
index 6f100ae..424de7c 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/doc
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/cc-mode/dox
@@ -1,8 +1,8 @@
 # -*- mode: snippet -*-
 # name: doc
-# key: /**
+# key: dox
 # uuid: /**
 # --
 /**
- * $0
+   $0
  */
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/cc-mode/once b/Emacs/.config/emacs/.config/yasnippet/snippets/cc-mode/once
index b982970..f01599f 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/cc-mode/once
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/cc-mode/once
@@ -3,7 +3,7 @@
 # key: once
 # uuid: once
 # --
-#ifndef ${1:`(upcase (file-name-nondirectory (file-name-sans-extension (buffer-file-name))))`_H}
+#ifndef $1
 #define $1
 
 $0
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/.yas-parents b/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/.yas-parents
deleted file mode 100644
index 2f29616..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-cc-mode text-mode prog-mode
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/attrib b/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/attrib
deleted file mode 100644
index 3d835f8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/attrib
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: private attribute ....;
-# key: attrib
-# uuid: attrib
-# --
-/// <summary>
-/// $3
-/// </summary>
-private $1 $2;
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/attrib.1 b/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/attrib.1
deleted file mode 100644
index dd7669f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/attrib.1
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: private attribute ....; public property ... ... { ... }
-# key: attrib
-# uuid: attrib
-# --
-/// <summary>
-/// $3
-/// </summary>
-private $1 $2;
-
-/// <summary>
-/// $4
-/// </summary>
-/// <value>$5</value>
-public $1 $2
-{
-    get {
-        return this.$2;
-    }
-    set {
-        this.$2 = value;
-    }
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/attrib.2 b/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/attrib.2
deleted file mode 100644
index b152875..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/attrib.2
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: private _attribute ....; public Property ... ... { ... }
-# key: attrib
-# uuid: attrib
-# --
-/// <summary>
-/// $3
-/// </summary>
-private $1 ${2:$(if (> (length yas-text) 0) (format "_%s%s" (downcase (substring yas-text 0 1)) (substring yas-text 1 (length yas-text))) "")};
-
-/// <summary>
-/// ${3:Description}
-/// </summary>
-/// <value><c>$1</c></value>
-public ${1:Type} ${2:Name}
-{
-    get {
-        return this.${2:$(if (> (length yas-text) 0) (format "_%s%s" (downcase (substring yas-text 0 1)) (substring yas-text 1 (length yas-text))) "")};
-    }
-    set {
-        this.${2:$(if (> (length yas-text) 0) (format "_%s%s" (downcase (substring yas-text 0 1)) (substring yas-text 1 (length yas-text))) "")} = value;
-    }
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/class b/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/class
deleted file mode 100644
index 8b03934..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/class
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: class ... { ... }
-# key: class
-# uuid: class
-# --
-${5:public} class ${1:Name}
-{
-    #region Ctor & Destructor
-    /// <summary>
-    /// ${3:Standard Constructor}
-    /// </summary>
-    public $1($2)
-    {
-    }
-
-    /// <summary>
-    /// ${4:Default Destructor}
-    /// </summary>    
-    public ~$1()
-    {
-    }
-    #endregion
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/comment b/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/comment
deleted file mode 100644
index d4a4712..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/comment
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: /// <summary> ... </summary>
-# key: comment
-# uuid: comment
-# --
-/// <summary>
-/// $1
-/// </summary>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/comment.1 b/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/comment.1
deleted file mode 100644
index 202dc4a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/comment.1
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: /// <param name="..."> ... </param>
-# key: comment
-# uuid: comment
-# --
-/// <param name="$1">$2</param>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/comment.2 b/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/comment.2
deleted file mode 100644
index a5dd138..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/comment.2
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: /// <param name="..."> ... </param>
-# key: comment
-# uuid: comment
-# --
-/// <returns>$1</returns>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/comment.3 b/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/comment.3
deleted file mode 100644
index 4a17b61..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/comment.3
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: /// <exception cref="..."> ... </exception>
-# key: comment
-# uuid: comment
-# --
-/// <exception cref="$1">$2</exception>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/method b/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/method
deleted file mode 100644
index 742ff77..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/method
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: public void Method { ... }
-# key: method
-# uuid: method
-# --
-/// <summary>
-/// ${5:Description}
-/// </summary>${2:$(if (string= (upcase yas-text) "VOID") "" (format "%s%s%s" "\n/// <returns><c>" yas-text "</c></returns>"))}
-${1:public} ${2:void} ${3:MethodName}($4)
-{
-$0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/namespace b/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/namespace
deleted file mode 100644
index ac9c143..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/namespace
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: namespace .. { ... }
-# key: namespace
-# uuid: namespace
-# --
-namespace $1
-{
-$0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/prop b/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/prop
deleted file mode 100644
index 21d89dc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/prop
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: property ... ... { ... }
-# key: prop
-# uuid: prop
-# --
-/// <summary>
-/// $5
-/// </summary>
-/// <value>$6</value>
-$1 $2 $3
-{
-    get {
-        return this.$4;
-    }
-    set {
-        this.$4 = value;
-    }
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/region b/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/region
deleted file mode 100644
index d92ebd9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/region
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: #region ... #endregion
-# key: region
-# uuid: region
-# --
-#region $1
-$0
-#endregion
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/using b/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/using
deleted file mode 100644
index 439c790..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/using
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: using ...;
-# key: using
-# uuid: using
-# --
-using $1;
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/using.1 b/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/using.1
deleted file mode 100644
index 8799467..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/using.1
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: using System;
-# key: using
-# uuid: using
-# --
-using System;
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/using.2 b/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/using.2
deleted file mode 100644
index f1b12c3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/csharp-mode/using.2
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: using System....;
-# key: using
-# uuid: using
-# --
-using System.$1;
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/importfont b/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/importfont
deleted file mode 100644
index 39faa2b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/importfont
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: @import url("//fonts.googleapis...")
-# key: impfont
-# uuid: impfont
-# --
-@import url("http://fonts.googleapis.com/css?family=${1:Open+Sans}");
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/margin b/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/margin
deleted file mode 100644
index 6431e56..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/margin
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: margin: ...;
-# key: mar
-# uuid: mar
-# --
-margin: ${1:0 auto};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/media b/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/media
deleted file mode 100644
index f58e11a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/media
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: @media
-# key: med
-# uuid: med
-# --
-@media ${1:screen} {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/media_orientation b/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/media_orientation
deleted file mode 100644
index 2aea9e0..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/media_orientation
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: @media (orientation: ?)
-# condition: (looking-back "@media " (line-beginning-position))
-# --
-(orientation: ${1:landscape})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/media_print b/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/media_print
deleted file mode 100644
index fdc89a2..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/media_print
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: @media print { ... }
-# --
-@media print {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/padding b/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/padding
deleted file mode 100644
index e667956..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/padding
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: padding: ...;
-# key: pad
-# uuid: pad
-# --
-padding: ${1:10px};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/property b/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/property
deleted file mode 100644
index 9bd42a7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/css-mode/property
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: ...: ...;
-# key: :
-# uuid: :
-# --
-${1:prop}: ${2:};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/advise b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/advise
deleted file mode 100644
index 2e74532..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/advise
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: advise function
-# key: adv
-# uuid: adv
-# --
-(defun ${3:adviser-name} (orig-fn &rest args)
-  ${4:}
-  (apply orig-fn args))
-(advice-add #'${1:function-name} ${2::around} #'${3:adviser-name})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/and b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/and
deleted file mode 100644
index 63a0fc2..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/and
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: and
-# --
-(and $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/append b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/append
deleted file mode 100644
index 86c62c7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/append
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: append
-# --
-(append $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/apply b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/apply
deleted file mode 100644
index 894e746..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/apply
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: apply
-# key: apply
-# uuid: apply
-# --
-(apply $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/aref b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/aref
deleted file mode 100644
index 1bc181a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/aref
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: aref
-# --
-(aref ${1:array} ${0:index})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/aset b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/aset
deleted file mode 100644
index 40ed691..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/aset
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: aset
-# --
-(aset ${1:array} ${2:index} ${3:newelt})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/assq b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/assq
deleted file mode 100644
index f2de7c6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/assq
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: assq
-# --
-(assq ${0:sym} ${1:list})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/au b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/au
deleted file mode 100644
index b76c3a1..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/au
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: autoload tag
-# --
-;;;###autoload`(%emacs-lisp-evil-autoload)`$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/autodef b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/autodef
deleted file mode 100644
index 0658ee4..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/autodef
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: doom autodef tag
-# key: ad
-# uuid: ad
-# --
-;;;###autodef
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/autoload b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/autoload
deleted file mode 100644
index 7ffdf3b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/autoload
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: autoload
-# --
-(autoload '${1:fn} "${2:file}"${3:"${4:doc}" ${5:t} ${6:type}})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/backward-char b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/backward-char
deleted file mode 100644
index d483463..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/backward-char
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: backward-char
-# key: backward-char
-# uuid: backward-char
-# key: bc
-# --
-(backward-char $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/beginning-of-line b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/beginning-of-line
deleted file mode 100644
index f0d4359..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/beginning-of-line
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: beginning-of-line
-# key: beginning-of-line
-# uuid: beginning-of-line
-# key: bol
-# --
-(beginning-of-line)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/bounds-of-thing-at-point b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/bounds-of-thing-at-point
deleted file mode 100644
index d74228f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/bounds-of-thing-at-point
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: bounds-of-thing-at-point
-# key: bounds-of-thing-at-point
-# uuid: bounds-of-thing-at-point
-# key: botap
-# --
-(bounds-of-thing-at-point '$0) ; symbol, list, sexp, defun, filename, url, email, word, sentence, whitespace, line, page ...
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/buffer-file-name b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/buffer-file-name
deleted file mode 100644
index 9fe30b6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/buffer-file-name
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: buffer-file-name
-# key: bfn
-# uuid: bfn
-# --
-buffer-file-name
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/buffer-modified-p b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/buffer-modified-p
deleted file mode 100644
index cf4f2df..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/buffer-modified-p
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: buffer-modified-p
-# key: buffer-modified-p
-# uuid: buffer-modified-p
-# key: bmp
-# --
-(buffer-modified-p $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/buffer-substring b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/buffer-substring
deleted file mode 100644
index d9c9dba..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/buffer-substring
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: buffer-substring
-# key: bs
-# uuid: bs
-# --
-(buffer-substring ${1:start} ${2:end})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/buffer-substring-no-properties b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/buffer-substring-no-properties
deleted file mode 100644
index d286c08..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/buffer-substring-no-properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: buffer-substring-no-properties
-# key: bsnp
-# uuid: bsnp
-# --
-(buffer-substring-no-properties ${1:start} ${2:end})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/car b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/car
deleted file mode 100644
index f18c455..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/car
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: car
-# --
-(car ${0:})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/cdr b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/cdr
deleted file mode 100644
index c5a2e1e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/cdr
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: cdr
-# --
-(cdr ${0:})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/cl-destructuring-bind b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/cl-destructuring-bind
deleted file mode 100644
index 6f08a67..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/cl-destructuring-bind
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: cl-destructuring-bind
-# key: cdb
-# uuid: cdb
-# --
-(cl-destructuring-bind (${1:args})
-    ${2:expr}
-  $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/concat b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/concat
deleted file mode 100644
index bc7bd50..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/concat
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: concat
-# --
-(concat $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/condition-case b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/condition-case
deleted file mode 100644
index 5e80e4b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/condition-case
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: condition-case
-# key: cc
-# uuid: cc
-# --
-(condition-case ex
-    $>${0:}
-  (error $0))
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/cons b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/cons
deleted file mode 100644
index 82e8c98..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/cons
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: cons
-# --
-(cons ${1:} $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/consp b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/consp
deleted file mode 100644
index 869e831..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/consp
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: consp
-# key: consp
-# uuid: consp
-# --
-(consp $0 )
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/copy-directory b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/copy-directory
deleted file mode 100644
index 9c89c78..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/copy-directory
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: copy-directory
-# key: copy-directory
-# uuid: copy-directory
-# key: cd
-# --
-(copy-directory $0 NEWNAME &optional KEEP-TIME PARENTS)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/copy-file b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/copy-file
deleted file mode 100644
index d79e1aa..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/copy-file
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: copy-file
-# key: copy-file
-# uuid: copy-file
-# key: cf
-# --
-(copy-file FILE$0 NEWNAME &optional OK-IF-ALREADY-EXISTS KEEP-TIME PRESERVE-UID-GID)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/current-buffer b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/current-buffer
deleted file mode 100644
index 4d8217f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/current-buffer
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: current-buffer
-# key: cb
-# uuid: cb
-# --
-(current-buffer)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/custom-autoload b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/custom-autoload
deleted file mode 100644
index c84d862..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/custom-autoload
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: custom-autoload
-# key: custom-autoload
-# uuid: custom-autoload
-# key: ca
-# --
-(custom-autoload$0 SYMBOL LOAD &optional NOSET)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/def-package! b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/def-package!
deleted file mode 100644
index 4579471..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/def-package!
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: def-package! ...
-# key: dp
-# uuid: dp
-# --
-(def-package! ${1:package}
-  :${2:config}
-  $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/defalias b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/defalias
deleted file mode 100644
index 80f18df..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/defalias
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: defalias
-# key: defalias
-# uuid: defalias
-# --
-(defalias 'SYMBOL$0 'DEFINITION &optional DOCSTRING)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/defconst b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/defconst
deleted file mode 100644
index f8b3749..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/defconst
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: defconst
-# --
-(defconst ${1:var} ${2:`(or % "value")`}
-  $>"${3:TODO}")
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/defcustom b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/defcustom
deleted file mode 100644
index 865cf39..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/defcustom
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: defcustom
-# --
-(defcustom $1 ${2:VALUE} "${3:doc}" $4)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/define-key b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/define-key
deleted file mode 100644
index 6f0126b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/define-key
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: define-key
-# key: dk
-# uuid: dk
-# --
-(define-key ${1:keymap} ${2:key} ${0:fn})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/defsubst b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/defsubst
deleted file mode 100644
index db7c62f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/defsubst
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: defsubst
-# key: defsubst
-# uuid: defsubst
-# --
-(defsubst $0 )
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/defvar b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/defvar
deleted file mode 100644
index 96647f7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/defvar
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: defvar
-# --
-(defvar ${1:var} ${2:`(or % "value")`}
-  $>"${3:TODO}")
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/delete-char b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/delete-char
deleted file mode 100644
index b003ee4..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/delete-char
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: delete-char
-# key: delete-char
-# uuid: delete-char
-# key: dc
-# --
-(delete-char $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/delete-directory b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/delete-directory
deleted file mode 100644
index 3cd42e4..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/delete-directory
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: delete-directory
-# key: delete-directory
-# uuid: delete-directory
-# key: dd
-# --
-(delete-directory $0 &optional RECURSIVE)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/delete-file b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/delete-file
deleted file mode 100644
index 3d280ec..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/delete-file
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: delete-file
-# key: delete-file
-# uuid: delete-file
-# key: df
-# --
-(delete-file $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/delete-region b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/delete-region
deleted file mode 100644
index 8df1afa..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/delete-region
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: delete-region
-# key: delete-region
-# uuid: delete-region
-# key: dr
-# --
-(delete-region $0 )
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/directory-files b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/directory-files
deleted file mode 100644
index 444bb03..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/directory-files
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: directory-files
-# key: directory-files
-# uuid: directory-files
-# key: df
-# --
-(directory-files $0 &optional FULL MATCH NOSORT)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/dired.process_marked b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/dired.process_marked
deleted file mode 100644
index ec2df13..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/dired.process_marked
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- mode: snippet -*-
-# name: process marked files in dired
-# contributor: Xah Lee
-# --
-;; idiom for processing a list of files in dired's marked files
- 
-;; suppose myProcessFile is your function that takes a file path
-;; and do some processing on the file
-
-(defun dired-myProcessFile ()
-  "apply myProcessFile function to marked files in dired."
-  (interactive)
-  (require 'dired)
-  (mapc 'myProcessFile (dired-get-marked-files))
-)
-
-;; to use it, type M-x dired-myProcessFile
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/end-of-line b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/end-of-line
deleted file mode 100644
index e01053d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/end-of-line
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: end-of-line
-# key: end-of-line
-# uuid: end-of-line
-# key: eol
-# --
-(end-of-line)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/eq b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/eq
deleted file mode 100644
index 704f6a3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/eq
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: eq
-# key: eq
-# uuid: eq
-# --
-(eq $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/equal b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/equal
deleted file mode 100644
index 2387712..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/equal
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: equal
-# key: equal
-# uuid: equal
-# --
-(equal $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/error b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/error
deleted file mode 100644
index 5f8d3c7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/error
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: error
-# key: error
-# uuid: error
-# --
-(error "$0" &optional ARGS)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/expand-file-name b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/expand-file-name
deleted file mode 100644
index fee7367..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/expand-file-name
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: expand-file-name
-# --
-(expand-file-name $0${1: ${2:default-directory}})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/fboundp b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/fboundp
deleted file mode 100644
index af9d098..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/fboundp
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: fboundp
-# --
-(fboundp '$0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file-name-directory b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file-name-directory
deleted file mode 100644
index f899866..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file-name-directory
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: file-name-directory
-# key: file-name-directory
-# uuid: file-name-directory
-# key: fnd
-# --
-(file-name-directory $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file-name-extension b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file-name-extension
deleted file mode 100644
index 8e2665f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file-name-extension
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: file-name-extension
-# --
-(file-name-extension $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file-name-nondirectory b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file-name-nondirectory
deleted file mode 100644
index a637eb7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file-name-nondirectory
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: file-name-nondirectory
-# key: file-name-nondirectory
-# uuid: file-name-nondirectory
-# key: fnn
-# --
-(file-name-nondirectory $0 )
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file-name-sans-extension b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file-name-sans-extension
deleted file mode 100644
index c97007c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file-name-sans-extension
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: file-name-sans-extension
-# key: file-name-sans-extension
-# uuid: file-name-sans-extension
-# key: fnse
-# --
-(file-name-sans-extension $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file-relative-name b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file-relative-name
deleted file mode 100644
index 634caaf..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file-relative-name
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: file-relative-name
-# key: file-relative-name
-# uuid: file-relative-name
-# key: frn
-# --
-(file-relative-name $0 )
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file.process b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file.process
deleted file mode 100644
index cbf0563..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file.process
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- mode: snippet -*-
-# name: a function that process a file
-# contributor: Xah Lee
-# --
-(defun doThisFile (fpath)
-  "Process the file at path FPATH ..."
-  (let ()
-    ;; create temp buffer without undo record or font lock. (more efficient)
-    ;; first space in temp buff name is necessary
-    (set-buffer (get-buffer-create " myTemp"))
-    (insert-file-contents fpath nil nil nil t)
-
-    ;; process it ...
-    ;; (goto-char 0) ; move to begining of file's content (in case it was open)
-    ;; ... do something here
-    ;; (write-file fpath) ;; write back to the file
-
-    (kill-buffer " myTemp")))
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file.read-lines b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file.read-lines
deleted file mode 100644
index 0cf8d25..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/file.read-lines
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- mode: snippet -*-
-# name: read lines of a file
-# contributor: Xah Lee
-# --
-(defun read-lines (filePath)
-  "Return a list of lines in FILEPATH."
-  (with-temp-buffer
-    (insert-file-contents filePath)
-    (split-string
-     (buffer-string) "\n" t)) )
-
-;; process all lines
-(mapc 
- (lambda (aLine) 
-   (message aLine) ; do your stuff here
-   )
- (read-lines "inputFilePath")
-)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/find-file b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/find-file
deleted file mode 100644
index 8f74392..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/find-file
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: find-file
-# key: find-file
-# uuid: find-file
-# key: ff
-# --
-(find-file $0 )
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/find-replace b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/find-replace
deleted file mode 100644
index 3372a23..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/find-replace
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- mode: snippet -*-
-# name: find and replace on region
-# contributor: Xah Lee
-# --
-(defun replace-html-chars-region (start end)
-  "Replace “<” to “&lt;” and other chars in HTML.
-This works on the current region."
-  (interactive "r")
-  (save-restriction 
-    (narrow-to-region start end)
-    (goto-char (point-min))
-    (while (search-forward "&" nil t) (replace-match "&amp;" nil t))
-    (goto-char (point-min))
-    (while (search-forward "<" nil t) (replace-match "&lt;" nil t))
-    (goto-char (point-min))
-    (while (search-forward ">" nil t) (replace-match "&gt;" nil t))
-    )
-  )
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/format b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/format
deleted file mode 100644
index 993ac1d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/format
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: format
-# --
-(format "$0" $1)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/forward-char b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/forward-char
deleted file mode 100644
index c1aa8a0..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/forward-char
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: forward-char
-# key: forward-char
-# uuid: forward-char
-# key: fc
-# --
-(forward-char $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/forward-line b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/forward-line
deleted file mode 100644
index 79d91ca..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/forward-line
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: forward-line
-# key: forward-line
-# uuid: forward-line
-# key: fl
-# --
-(forward-line $0 )
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/funcall b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/funcall
deleted file mode 100644
index df30971..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/funcall
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: funcall
-# key: funcall
-# uuid: funcall
-# --
-(funcall $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/function b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/function
deleted file mode 100644
index db9565a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/function
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: function
-# --
-(function $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/get b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/get
deleted file mode 100644
index 1fa0a11..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/get
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: get
-# key: get
-# uuid: get
-# --
-(get SYMBOL$0 PROPNAME)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/global-set-key b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/global-set-key
deleted file mode 100644
index 0c9f70e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/global-set-key
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: global-set-key
-# key: global-set-key
-# uuid: global-set-key
-# key: gsk
-# --
-(global-set-key (kbd "C-$0") 'COMMAND)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/goto-char b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/goto-char
deleted file mode 100644
index 3eeec19..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/goto-char
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: goto-char
-# --
-(goto-char $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/grabstring b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/grabstring
deleted file mode 100644
index 95f52b6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/grabstring
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: grab buffer substring
-# contributor: Xah Lee
-# --
-(setq $0 (buffer-substring-no-properties myStartPos myEndPos))
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/grabthing b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/grabthing
deleted file mode 100644
index de0cd3f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/grabthing
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: grab word under cursor
-# contributor: Xah Lee
-# --
-(setq $0 (thing-at-point 'symbol))
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/if-let b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/if-let
deleted file mode 100644
index 18398b5..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/if-let
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: if-let
-# condition: (<= (doom-snippets-count-lines %) 1)
-# --
-(if-let* (($1)) $0)`(doom-snippets-newline-or-eol)`
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/if-let-2 b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/if-let-2
deleted file mode 100644
index 2adf3e7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/if-let-2
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: if-let
-# uuid: if-let-2
-# key: if-let
-# condition: (> (doom-snippets-count-lines %) 1)
-# --
-(if-let (($1)) $0 `(doom-snippets-format "%n%s")`)`(doom-snippets-newline-or-eol)`
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/insert b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/insert
deleted file mode 100644
index ea1a081..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/insert
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: insert
-# key: insert
-# uuid: insert
-# key: i
-# --
-(insert $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/insert-file-contents b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/insert-file-contents
deleted file mode 100644
index 1fcc121..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/insert-file-contents
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: insert-file-contents
-# key: insert-file-contents
-# uuid: insert-file-contents
-# key: ifc
-# --
-(insert-file-contents $0 &optional VISIT BEG END REPLACE)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/int b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/int
deleted file mode 100644
index 3413c41..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/int
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: interactive
-# uuid: int
-# --
-(interactive)$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/interactive b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/interactive
deleted file mode 100644
index 916bc85..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/interactive
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: interactive
-# --
-(interactive$1)$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/kbd b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/kbd
deleted file mode 100644
index 50b26c0..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/kbd
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: kbd
-# --
-(kbd "${0:}")
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/kill-buffer b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/kill-buffer
deleted file mode 100644
index 27d0f44..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/kill-buffer
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: kill-buffer
-# key: kill-buffer
-# uuid: kill-buffer
-# key: kb
-# --
-(kill-buffer $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/lam b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/lam
deleted file mode 100644
index 50cf6ff..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/lam
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Henrik Lissner (henrik.io)
-# name: lambda shortcut
-# key: lam
-# uuid: lam
-# --
-(λ! $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/length b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/length
deleted file mode 100644
index 8f89a17..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/length
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: length
-# --
-(length $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/line-beginning-position b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/line-beginning-position
deleted file mode 100644
index d6f9bcc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/line-beginning-position
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: line-beginning-position
-# key: line-beginning-position
-# uuid: line-beginning-position
-# key: lbp
-# --
-(line-beginning-position)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/line-end-position b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/line-end-position
deleted file mode 100644
index 986732b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/line-end-position
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: line-end-position
-# key: line-end-position
-# uuid: line-end-position
-# key: lep
-# --
-(line-end-position)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/list b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/list
deleted file mode 100644
index b19d670..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/list
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: list
-# --
-(list $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/looking-at b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/looking-at
deleted file mode 100644
index 79d554a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/looking-at
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: looking-at
-# --
-(looking-at $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/make-directory b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/make-directory
deleted file mode 100644
index 6eec6ff..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/make-directory
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: make-directory
-# key: make-directory
-# uuid: make-directory
-# key: md
-# --
-(make-directory $0 &optional PARENTS)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/make-hash-table b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/make-hash-table
deleted file mode 100644
index ee3a5e6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/make-hash-table
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: hash
-# key: mht
-# uuid: mht
-# --
-(make-hash-table${1: :test '${2:equal}})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/make-local-variable b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/make-local-variable
deleted file mode 100644
index fea5a14..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/make-local-variable
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: make-local-variable
-# key: make-local-variable
-# uuid: make-local-variable
-# key: mlv
-# --
-(make-local-variable $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/mapc b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/mapc
deleted file mode 100644
index 4ea1bed..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/mapc
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: mapc
-# --
-(mapc ${1:fn} ${0:list})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/mapcar b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/mapcar
deleted file mode 100644
index f1ef8e9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/mapcar
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: mapcar
-# --
-(mapcar ${1:fn} ${0:list})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/match-beginning b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/match-beginning
deleted file mode 100644
index 6694bb7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/match-beginning
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: match-beginning
-# key: match-beginning
-# uuid: match-beginning
-# key: mb
-# --
-(match-beginning N$0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/match-end b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/match-end
deleted file mode 100644
index 9fc2690..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/match-end
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: match-end
-# key: match-end
-# uuid: match-end
-# key: me
-# --
-(match-end N$0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/match-string b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/match-string
deleted file mode 100644
index c64d45b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/match-string
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: match-string
-# key: match-string
-# uuid: match-string
-# key: ms
-# --
-(match-string $0 )
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/memq b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/memq
deleted file mode 100644
index 33fbf30..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/memq
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: memq
-# --
-(memq ${0:sym} ${1:list})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/message b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/message
deleted file mode 100644
index 76f2650..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/message
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: message
-# key: m
-# uuid: m
-# --
-(message "${1:}"$0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/minor_mode b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/minor_mode
deleted file mode 100644
index 214a00c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/minor_mode
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- mode: snippet -*-
-# name: minor_mode
-# key: minor
-# uuid: minor
-# --
-(defvar ${1:mode}-modeline-indicator " ${2:INDICATOR}"
-  "call ($1-install-mode) again if this is changed")
-
-(defvar $1-mode nil)
-(make-variable-buffer-local '$1-mode)
-(put '$1-mode 'permanent-local t)
-
-(defun $1-mode (&optional arg)
-  "$0"
-  (interactive "P")
-  (setq $1-mode
-        (if (null arg) (not $1-mode)
-          (> (prefix-numeric-value arg) 0)))
-  (force-mode-line-update))
-
-(provide '$1-mode)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/not b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/not
deleted file mode 100644
index 78bec14..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/not
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: not
-# --
-(not $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/nth b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/nth
deleted file mode 100644
index b8b6351..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/nth
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: nth
-# --
-(nth ${0:n} ${1:list})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/optional b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/optional
deleted file mode 100644
index 006715b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/optional
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: &optional ...
-# uuid: optional
-# --
-&optional $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/or b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/or
deleted file mode 100644
index e865ba5..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/or
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: or
-# --
-(or $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/point b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/point
deleted file mode 100644
index 55b6623..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/point
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: point
-# key: pt
-# --
-(point)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/point-max b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/point-max
deleted file mode 100644
index 389a243..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/point-max
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: point-max
-# uuid: point-max
-# key: pma
-# --
-(point-max)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/point-min b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/point-min
deleted file mode 100644
index 9bf5c5e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/point-min
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: point-min
-# uuid: point-min
-# key: pmi
-# --
-(point-min)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/princ b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/princ
deleted file mode 100644
index f0c308c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/princ
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: princ
-# key: princ
-# uuid: princ
-# --
-(princ $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/print b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/print
deleted file mode 100644
index 2649da8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/print
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: print
-# key: print
-# uuid: print
-# --
-(print $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/provide b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/provide
deleted file mode 100644
index 374effc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/provide
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: provide
-# --
-(provide '`(file-name-base buffer-file-name)`)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/put b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/put
deleted file mode 100644
index 0f8b96f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/put
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: put
-# key: put
-# uuid: put
-# --
-(put $0 PROPNAME VALUE)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/re-search-backward b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/re-search-backward
deleted file mode 100644
index eb3f210..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/re-search-backward
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: re-search-backward
-# key: re-search-backward
-# uuid: re-search-backward
-# key: rsb
-# --
-(re-search-backward REGEXP$0 &optional BOUND NOERROR COUNT)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/re-search-forward b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/re-search-forward
deleted file mode 100644
index 970b23e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/re-search-forward
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: re-search-forward
-# key: re-search-forward
-# uuid: re-search-forward
-# key: rsf
-# --
-(re-search-forward REGEXP$0 &optional BOUND NOERROR COUNT)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/region-active-p b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/region-active-p
deleted file mode 100644
index d696b97..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/region-active-p
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: region-active-p
-# key: region-active-p
-# uuid: region-active-p
-# key: rap
-# --
-(region-active-p)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/region-beginning b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/region-beginning
deleted file mode 100644
index 8c06c3f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/region-beginning
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: region-beginning
-# key: region-beginning
-# uuid: region-beginning
-# key: rb
-# --
-(region-beginning)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/region-end b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/region-end
deleted file mode 100644
index 1ab4f60..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/region-end
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: region-end
-# key: region-end
-# uuid: region-end
-# key: re
-# --
-(region-end)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/rename-file b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/rename-file
deleted file mode 100644
index e61ee95..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/rename-file
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: rename-file
-# key: rename-file
-# uuid: rename-file
-# key: rf
-# --
-(rename-file FILE$0 NEWNAME &optional OK-IF-ALREADY-EXISTS)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/repeat b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/repeat
deleted file mode 100644
index 754fd26..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/repeat
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: repeat
-# key: repeat
-# uuid: repeat
-# --
-(repeat $0 )
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/replace-regexp b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/replace-regexp
deleted file mode 100644
index b2a78aa..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/replace-regexp
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: replace-regexp
-# key: replace-regexp
-# uuid: replace-regexp
-# key: rr
-# --
-(replace-regexp REGEXP$0 TO-STRING &optional DELIMITED START END)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/replace-regexp-in-string b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/replace-regexp-in-string
deleted file mode 100644
index 4648f3d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/replace-regexp-in-string
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: replace-regexp-in-string
-# key: replace-regexp-in-string
-# uuid: replace-regexp-in-string
-# key: rris
-# --
-(replace-regexp-in-string REGEXP$0 REP STRING &optional FIXEDCASE LITERAL SUBEXP START)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/require b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/require
deleted file mode 100644
index eed355f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/require
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: require
-# --
-(require '${1:package})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/rest b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/rest
deleted file mode 100644
index af50300..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/rest
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: &rest ...
-# --
-&rest $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/save-buffer b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/save-buffer
deleted file mode 100644
index 0f7df36..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/save-buffer
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: save-buffer
-# key: save-buffer
-# uuid: save-buffer
-# key: sb
-# --
-(save-buffer $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/search-backward b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/search-backward
deleted file mode 100644
index 9ef33cc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/search-backward
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: search-backward
-# key: search-backward
-# uuid: search-backward
-# key: sb
-# --
-(search-backward "$0" &optional BOUND NOERROR COUNT)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/search-backward-regexp b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/search-backward-regexp
deleted file mode 100644
index 43f4bb1..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/search-backward-regexp
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: search-backward-regexp
-# key: search-backward-regexp
-# uuid: search-backward-regexp
-# key: sbr
-# --
-(search-backward-regexp "$0" &optional BOUND NOERROR COUNT)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/search-forward b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/search-forward
deleted file mode 100644
index cb20dd2..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/search-forward
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: search-forward
-# key: search-forward
-# uuid: search-forward
-# key: sf
-# --
-(search-forward "$0" &optional BOUND NOERROR COUNT)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/search-forward-regexp b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/search-forward-regexp
deleted file mode 100644
index e70e3cb..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/search-forward-regexp
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: search-forward-regexp
-# key: search-forward-regexp
-# uuid: search-forward-regexp
-# key: sfr
-# --
-(search-forward-regexp "$0" &optional BOUND NOERROR COUNT)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/set b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/set
deleted file mode 100644
index c6f34aa..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/set
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: set
-# key: set
-# uuid: set
-# --
-(set $0 )
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/set-buffer b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/set-buffer
deleted file mode 100644
index b8692a9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/set-buffer
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: set-buffer
-# key: set-buffer
-# uuid: set-buffer
-# key: sb
-# --
-(set-buffer $0 )
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/set-file-modes b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/set-file-modes
deleted file mode 100644
index bc3aa1e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/set-file-modes
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: set-file-modes
-# key: set-file-modes
-# uuid: set-file-modes
-# key: sfm
-# --
-(set-file-modes $0 MODE)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/set-mark b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/set-mark
deleted file mode 100644
index 245cea9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/set-mark
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: set-mark
-# key: set-mark
-# uuid: set-mark
-# key: sm
-# --
-(set-mark $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/setq b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/setq
deleted file mode 100644
index 8dcb8c4..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/setq
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: setq
-# --
-(setq ${1:var} ${0:})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/setq-default b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/setq-default
deleted file mode 100644
index c69fe3a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/setq-default
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: setq-default
-# key: setqd
-# uuid: setqd
-# --
-(setq-default ${1:} ${0:value})
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/skip-chars-backward b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/skip-chars-backward
deleted file mode 100644
index c51cc5e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/skip-chars-backward
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: skip-chars-backward
-# key: skip-chars-backward
-# uuid: skip-chars-backward
-# key: scb
-# --
-(skip-chars-backward "$0" &optional LIM)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/skip-chars-forward b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/skip-chars-forward
deleted file mode 100644
index e3a6b00..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/skip-chars-forward
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: skip-chars-forward
-# key: skip-chars-forward
-# uuid: skip-chars-forward
-# key: scf
-# --
-(skip-chars-forward "$0" &optional LIM)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/split-string b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/split-string
deleted file mode 100644
index 9a59963..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/split-string
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: split-string
-# key: split-string
-# uuid: split-string
-# key: ss
-# --
-(split-string $0 &optional SEPARATORS OMIT-NULLS)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/string b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/string
deleted file mode 100644
index b102d6e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/string
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: string
-# key: string
-# uuid: string
-# --
-(string $0 )
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/string-match b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/string-match
deleted file mode 100644
index 67ae912..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/string-match
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: string-match
-# --
-(string-match "${0:regexp}" ${1:string}${2: ${3:START}})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/string-match-p b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/string-match-p
deleted file mode 100644
index d7ab230..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/string-match-p
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: string-match-p
-# --
-(string-match-p "${0:regexp}" ${1:string}${2: ${3:START}})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/string-to-number b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/string-to-number
deleted file mode 100644
index 3a108bd..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/string-to-number
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: string-to-number
-# key: stn
-# uuid: stn
-# --
-(string-to-number "$0")
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/string= b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/string=
deleted file mode 100644
index c6d2743..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/string=
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: string=
-# key: string=
-# uuid: string=
-# --
-(string= ${1:} ${2:str})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/stringp b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/stringp
deleted file mode 100644
index 7827762..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/stringp
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: stringp
-# key: stringp
-# uuid: stringp
-# --
-(stringp $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/substring b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/substring
deleted file mode 100644
index 0df2462..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/substring
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: substring
-# key: substring
-# uuid: substring
-# --
-(substring STRING$0 FROM &optional TO)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/thing-at-point b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/thing-at-point
deleted file mode 100644
index eb0ef1b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/thing-at-point
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: thing-at-point
-# key: thing-at-point
-# uuid: thing-at-point
-# key: tap
-# --
-(thing-at-point '$0) ; symbol, list, sexp, defun, filename, url, email, word, sentence, whitespace, line, page ...
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/traverse_dir b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/traverse_dir
deleted file mode 100644
index 1bf675f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/traverse_dir
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: traversing a directory
-# contributor: Xah Lee
-# --
-;; apply a function to all files in a dir
-(require 'find-lisp)
-(mapc 'my-process-file (find-lisp-find-files "~/myweb/" "\\.html$"))
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/use-package b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/use-package
deleted file mode 100644
index 3c1bbba..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/use-package
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: use-package
-# key: up
-# uuid: up
-# --
-(use-package ${1:package}
-  :${2:config}
-  $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/vector b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/vector
deleted file mode 100644
index af13f98..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/vector
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: vector
-# key: vector
-# uuid: vector
-# key: v
-# --
-(vector $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/widget-get b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/widget-get
deleted file mode 100644
index e74471a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/widget-get
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: widget-get
-# key: widget-get
-# uuid: widget-get
-# key: wg
-# --
-(widget-get $0 )
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/word-or-region b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/word-or-region
deleted file mode 100644
index e2cadda..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/word-or-region
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- mode: snippet -*-
-# name: Command that works on region or word
-# contributor: Xah Lee
-# --
-;; example of a command that works on current word or text selection
-(defun down-case-word-or-region ()
-  "Lower case the current word or text selection."
-(interactive)
-(let (pos1 pos2 meat)
-  (if (and transient-mark-mode mark-active)
-      (setq pos1 (region-beginning)
-            pos2 (region-end))
-    (setq pos1 (car (bounds-of-thing-at-point 'symbol))
-          pos2 (cdr (bounds-of-thing-at-point 'symbol))))
-
-  ; now, pos1 and pos2 are the starting and ending positions
-  ; of the current word, or current text selection if exists
-
-  ;; put your code here.
-  $0
-  ;; Some example of things you might want to do
-  (downcase-region pos1 pos2) ; example of a func that takes region as args
-  (setq meat (buffer-substring-no-properties pos1 pos2)) ; grab the text.
-  (delete-region pos1 pos2) ; get rid of it
-  (insert "newText") ; insert your new text
-
-  )
-)
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/word_regexp b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/word_regexp
deleted file mode 100644
index c94419d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/word_regexp
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: word_regexp
-# key: <
-# uuid: <
-# --
-"\\_<${1:word}\\_>"
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-dired.process_marked b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-dired.process_marked
deleted file mode 100644
index 81becbd..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-dired.process_marked
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: process marked files in dired
-# key: x-dired
-# uuid: x-dired
-# --
-;; idiom for processing a list of files in dired's marked files
- 
-;; suppose myProcessFile is your function that takes a file path
-;; and do some processing on the file
-
-(defun dired-myProcessFile ()
-  "apply myProcessFile function to marked files in dired."
-  (interactive)
-  (require 'dired)
-  (mapc 'myProcessFile (dired-get-marked-files))
-)
-
-;; to use it, type M-x dired-myProcessFile
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-file.process b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-file.process
deleted file mode 100644
index ec6870a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-file.process
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: a function that process a file
-# key: x-file
-# uuid: x-file
-# --
-(defun doThisFile (fpath)
-  "Process the file at path FPATH ..."
-  (let ()
-    ;; create temp buffer without undo record or font lock. (more efficient)
-    ;; first space in temp buff name is necessary
-    (set-buffer (get-buffer-create " myTemp"))
-    (insert-file-contents fpath nil nil nil t)
-
-    ;; process it ...
-    ;; (goto-char 0) ; move to begining of file's content (in case it was open)
-    ;; ... do something here
-    ;; (write-file fpath) ;; write back to the file
-
-    (kill-buffer " myTemp")))
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-file.read-lines b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-file.read-lines
deleted file mode 100644
index 0b034a1..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-file.read-lines
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: read lines of a file
-# key: x-file
-# uuid: x-file
-# --
-(defun read-lines (filePath)
-  "Return a list of lines in FILEPATH."
-  (with-temp-buffer
-    (insert-file-contents filePath)
-    (split-string
-     (buffer-string) "\n" t)) )
-
-;; process all lines
-(mapc 
- (lambda (aLine) 
-   (message aLine) ; do your stuff here
-   )
- (read-lines "inputFilePath")
-)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-find-replace b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-find-replace
deleted file mode 100644
index 8aadfc9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-find-replace
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: find and replace on region
-# key: x-find-replace
-# uuid: x-find-replace
-# --
-(defun replace-html-chars-region (start end)
-  "Replace “<” to “&lt;” and other chars in HTML.
-This works on the current region."
-  (interactive "r")
-  (save-restriction 
-    (narrow-to-region start end)
-    (goto-char (point-min))
-    (while (search-forward "&" nil t) (replace-match "&amp;" nil t))
-    (goto-char (point-min))
-    (while (search-forward "<" nil t) (replace-match "&lt;" nil t))
-    (goto-char (point-min))
-    (while (search-forward ">" nil t) (replace-match "&gt;" nil t))
-    )
-  )
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-grabstring b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-grabstring
deleted file mode 100644
index 4a5c008..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-grabstring
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: grab buffer substring
-# key: x-grabstring
-# uuid: x-grabstring
-# --
-(setq $0 (buffer-substring-no-properties myStartPos myEndPos))
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-grabthing b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-grabthing
deleted file mode 100644
index f59a37d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-grabthing
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: grab word under cursor
-# key: x-grabthing
-# uuid: x-grabthing
-# --
-(setq $0 (thing-at-point 'symbol))
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-traverse_dir b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-traverse_dir
deleted file mode 100644
index 57c487d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-traverse_dir
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: traversing a directory
-# contributor: Xah Lee (XahLee.org)
-# key: x-traverse_dir
-# uuid: x-traverse_dir
-# --
-;; apply a function to all files in a dir
-(require 'find-lisp)
-(mapc 'my-process-file (find-lisp-find-files "~/myweb/" "\\.html$"))
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-word-or-region b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-word-or-region
deleted file mode 100644
index 846c59f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/x-word-or-region
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Xah Lee (XahLee.org)
-# name: Command that works on region or word
-# key: x-word-or-region
-# uuid: x-word-or-region
-# --
-;; example of a command that works on current word or text selection
-(defun down-case-word-or-region ()
-  "Lower case the current word or text selection."
-(interactive)
-(let (pos1 pos2 meat)
-  (if (and transient-mark-mode mark-active)
-      (setq pos1 (region-beginning)
-            pos2 (region-end))
-    (setq pos1 (car (bounds-of-thing-at-point 'symbol))
-          pos2 (cdr (bounds-of-thing-at-point 'symbol))))
-
-  ; now, pos1 and pos2 are the starting and ending positions
-  ; of the current word, or current text selection if exists
-
-  ;; put your code here.
-  $0
-  ;; Some example of things you might want to do
-  (downcase-region pos1 pos2) ; example of a func that takes region as args
-  (setq meat (buffer-substring-no-properties pos1 pos2)) ; grab the text.
-  (delete-region pos1 pos2) ; get rid of it
-  (insert "newText") ; insert your new text
-
-  )
-)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/y-or-n-p b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/y-or-n-p
deleted file mode 100644
index c47d287..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/y-or-n-p
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: y-or-n-p
-# key: yn
-# --
-(y-or-n-p "$1")
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/yes-or-no-p b/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/yes-or-no-p
deleted file mode 100644
index fb2b64b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/emacs-lisp-mode/yes-or-no-p
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: y-or-n-p
-# key: yesno
-# --
-(yes-or-no-p "$1")
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/case b/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/case
deleted file mode 100644
index 0b2241b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/case
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: case
-# key: case
-# uuid: case
-# --
-case ${1:var} of
-     ${2:cond} -> ${3:value}
-     $0
-     otherwise -> ${4:other}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/data b/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/data
deleted file mode 100644
index 98ed8b4..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/data
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: data
-# key: da
-# uuid: da
-# --
-data ${1:Type} = $2
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/doc b/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/doc
deleted file mode 100644
index 390e096..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/doc
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: doc
-# key: d
-# uuid: d
-# --
-{-
-  $0
--}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/function b/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/function
deleted file mode 100644
index ba1ebe9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/function
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: Function
-# key: ::
-# uuid: ::
-# --
-${1:fn-name} :: ${2:type}
-$1
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/import b/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/import
deleted file mode 100644
index 2e5913b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/import
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: import
-# key: import
-# uuid: import
-# --
-import${1: qualified} ${2:Module${3:(symbols)}}${4: as ${5:alias}}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/instance b/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/instance
deleted file mode 100644
index e0bf941..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/instance
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: instance
-# key: ins
-# uuid: ins
-# --
-instance ${1:${2:(Show a)} => }${3:Ord} ${4:DataType} where
-$0
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/main b/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/main
deleted file mode 100644
index 65f6f06..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/main
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: main
-# key: main
-# uuid: main
-# --
-main = do $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/module b/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/module
deleted file mode 100644
index 0155fa1..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/module
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: module
-# key: mod
-# uuid: mod
-# --
-module ${1:Module} where
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/new-class b/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/new-class
deleted file mode 100644
index 76c3741..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/new-class
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: new class
-# key: class
-# uuid: class
-# --
-class ${1:Class Name} where
-      $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/pragma b/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/pragma
deleted file mode 100644
index 0b95488..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/pragma
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: pragma
-# key: {
-# uuid: {
-# --
-{-# ${1:PRAGMA} #-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/print b/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/print
deleted file mode 100644
index db6c70a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/haskell-mode/print
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: print
-# key: pr
-# uuid: pr
-# --
-print $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/dd b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/dd
deleted file mode 100644
index 30cbeb5..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/dd
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Rodrigo Setti <rodrigosetti@gmail.com>
-# name: <dd> ... </dd>
-# group: list
-# --
-<dd>$1</dd>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/dl b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/dl
deleted file mode 100644
index 1753361..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/dl
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Rodrigo Setti <rodrigosetti@gmail.com>
-# name: <dl> ... </dl>
-# group: list
-# --
-<dl>
-    $0
-</dl>
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/doctype b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/doctype
deleted file mode 100644
index 7bffad7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/doctype
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: Doctype HTML 5
-# group: meta
-# --
-<!DOCTYPE html>
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/doctype.xhml1 b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/doctype.xhml1
deleted file mode 100644
index b94dbf4..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/doctype.xhml1
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: DocType XHTML 1.0 frameset
-# group: meta
-# --
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/doctype.xhtml1_1 b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/doctype.xhtml1_1
deleted file mode 100644
index 875547d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/doctype.xhtml1_1
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: DocType XHTML 1.1
-# group: meta
-# --
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/doctype.xhtml1_strict b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/doctype.xhtml1_strict
deleted file mode 100644
index 8ddc158..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/doctype.xhtml1_strict
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: DocType XHTML 1.0 Strict
-# group: meta
-# --
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/doctype.xhtml1_transitional b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/doctype.xhtml1_transitional
deleted file mode 100644
index 144bc43..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/doctype.xhtml1_transitional
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: DocType XHTML 1.0 Transitional
-# group: meta
-# --
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/dt b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/dt
deleted file mode 100644
index 7641c8e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/dt
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Rodrigo Setti <rodrigosetti@gmail.com>
-# name: <dt> ... </dt>
-# group: list
-# --
-<dt>$1</dt>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/form b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/form
deleted file mode 100644
index 5511388..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/form
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Jimmy Wu <frozenthrone88@gmail.com>
-# name: <form method="..." id="..." action="..."></form>
-# --
-<form method="$1" id="$2" action="$3">
-  $0
-</form>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/html b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/html
deleted file mode 100644
index 8600a33..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/html
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Jimmy Wu <frozenthrone88@gmail.com>
-# name: <html>...</html>
-# --
-<html>
-  $0
-</html>
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/html.xmlns b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/html.xmlns
deleted file mode 100644
index a85689b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/html.xmlns
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Jimmy Wu <frozenthrone88@gmail.com>
-# name: <html xmlns="...">...</html>
-# --
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="${1:en}" lang="${2:en}">
-  $0
-</html>
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/link b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/link
deleted file mode 100644
index 3f97d00..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/link
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: <link rel="stylesheet" ... />
-# key: link
-# uuid: link
-# --
-<link rel="${1:stylesheet}" href="${2:url}" type="${3:text/css}" media="${4:screen}" />
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/linkie b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/linkie
deleted file mode 100644
index 6e2c2ee..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/linkie
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: <!--[if IE]><link stylesheet="..." /><![endif]-->
-# --
-<!--[if IE${1: version}]>
-<link rel="${2:stylesheet}" href="${3:url}" type="${4:text/css}" media="${5:screen}" />
-<![endif]-->
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/meta b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/meta
deleted file mode 100644
index 6cad73a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/meta
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# contributor : Jimmy Wu <frozenthrone88@gmail.com>
-# group: meta
-# name: <meta name="..." content="..." />
-# --
-<meta name="${1:generator}" content="${2:content}" />
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/meta.http-equiv b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/meta.http-equiv
deleted file mode 100644
index a7a5a50..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/meta.http-equiv
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Jimmy Wu <frozenthrone88@gmail.com>
-# name: <meta http-equiv="..." content="..." />
-# group: meta
-# --
-<meta name="${1:Content-Type}" content="${2:text/html; charset=UTF-8}" />
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/script b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/script
deleted file mode 100644
index d36430e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/script
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: <script type="text/javascript">...</script>
-# --
-<script type="text/javascript">
-  $0
-</script>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/scriptsrc b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/scriptsrc
deleted file mode 100644
index db4dbe5..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/scriptsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: <script type="text/javascript" src="..."></script>
-# --
-<script type="text/javascript" src="$1"></script>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/textarea b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/textarea
deleted file mode 100644
index d3f5c7a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/textarea
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Jimmy Wu <frozenthrone88@gmail.com>
-# name: <textarea ...></textarea>
-# --
-<textarea name="$1" id="$2" rows="$3" cols="$4" tabindex="$5"></textarea>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/th b/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/th
deleted file mode 100644
index 6d3e21a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/html-mode/th
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Jimmy Wu <frozenthrone88@gmail.com>
-# name: <th>...</th>
-# group: table
-# --
-<th$1>$2</th>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/.yas-parents b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/.yas-parents
deleted file mode 100644
index 2f29616..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-cc-mode text-mode prog-mode
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/@param b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/@param
deleted file mode 100644
index 9c7ed49..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/@param
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: param
-# key: @param
-# uuid: @param
-# condition: (sp-point-in-comment)
-# --
-@param ${1:paramater} $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/@return b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/@return
deleted file mode 100644
index f59a873..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/@return
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: return
-# key: @return
-# uuid: @return
-# condition: (sp-point-in-comment)
-# --
-@return ${1:description}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/apr_assert b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/apr_assert
deleted file mode 100644
index dca9f95..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/apr_assert
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: apr_assert
-# key: apr_assert
-# uuid: apr_assert
-# --
-if (Globals.useAssertions) {
-   ${1:assert ..};
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/class b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/class
deleted file mode 100644
index 4b23f00..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/class
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: class
-# key: class
-# uuid: class
-# --
-${1:public }class ${2:`(f-base buffer-file-name)`} {
-           $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/constructor b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/constructor
deleted file mode 100644
index 7a379cd..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/constructor
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: constructor
-# key: __init__
-# uuid: __init__
-# --
-public ${1:`(f-base buffer-file-name)`}($2) {
-       $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/doc b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/doc
deleted file mode 100644
index 7108ccf..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/doc
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: doc
-# key: /*
-# uuid: /*
-# condition: (not (use-region-p))
-# --
-/**
- * $0
- */
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/equals b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/equals
deleted file mode 100644
index 9b66be5..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/equals
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: equals
-# key: eq
-# uuid: eq
-# --
-public boolean equals(${1:Class} other) {
-       $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/file_class b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/file_class
deleted file mode 100644
index a0685b3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/file_class
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: file_class
-# key: file
-# uuid: file
-# --
-public class ${1:`(file-name-base
-                    (or (buffer-file-name)
-                        (buffer-name)))`} {
-  $0
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/for b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/for
deleted file mode 100644
index 64b99d2..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/for
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: for
-# key: for
-# uuid: for
-# --
-for (${1:int i = 0}; ${2:i < N}; ${3:i++}) {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/foreach b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/foreach
deleted file mode 100644
index 236a446..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/foreach
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: foreach
-# key: fore
-# uuid: fore
-# --
-for (${1:Object} ${2:var} : ${3:iterator}) {
-    $0
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/if b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/if
deleted file mode 100644
index bddbdd5..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/if
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: if
-# key: if
-# uuid: if
-# condition: (not (sp-point-in-string-or-comment))
-# --
-if (${1:true}) {
-   $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/ife b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/ife
deleted file mode 100644
index 0158f7a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/ife
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: ife
-# key: ife
-# uuid: ife
-# --
-if (${1:true}) {
-    $2
-} else {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/import b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/import
deleted file mode 100644
index f863d97..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/import
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: import
-# --
-import ${1:System.};
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/interface b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/interface
deleted file mode 100644
index b5cac51..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/interface
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: interface
-# key: interface
-# uuid: interface
-# --
-interface ${1:`(f-base buffer-file-name)`} {
-          $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/iterator b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/iterator
deleted file mode 100644
index 523310c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/iterator
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: iterator
-# key: iterator
-# uuid: iterator
-# --
-public Iterator<${1:type}> iterator() {
-       $0
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/javadoc b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/javadoc
deleted file mode 100644
index af9c339..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/javadoc
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: javadoc
-# key: doc
-# uuid: doc
-# --
-/**
- * $0
- *
- */
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/main b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/main
deleted file mode 100644
index 7b51d33..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/main
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: main
-# key: main
-# uuid: main
-# --
-public static void main(String[] args) {
-       $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/method b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/method
deleted file mode 100644
index d7159d4..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/method
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: method
-# key: method
-# uuid: method
-# condition: (not (sp-point-in-string-or-comment))
-# --
-${1:void} ${2:name}($3) {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/method@ b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/method@
deleted file mode 100644
index 697dbcb..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/method@
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: @Override method
-# key: method@
-# uuid: method@
-# condition: (not (sp-point-in-string-or-comment))
-# --
-@Override ${1:public} ${2:void} ${3:methodName}($4) {
-          $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/new b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/new
deleted file mode 100644
index 6c811c7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/new
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: new
-# key: new
-# uuid: new
-# --
-${1:Type} ${2:obj} = new ${3:$1}($4);$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/paintComponent b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/paintComponent
deleted file mode 100644
index 21770fc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/paintComponent
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: paintComponent (Swing)
-# key: paintComponent
-# uuid: paintComponent
-# condition: (not (sp-point-in-string-or-comment))
-# --
-@Override public void paintComponent(Graphics g) {
-          $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/printf b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/printf
deleted file mode 100644
index 6936057..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/printf
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: printf
-# key: printf
-# uuid: printf
-# --
-System.out.printf("$0%n");
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/println b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/println
deleted file mode 100644
index d8e46bc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/println
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: println
-# key: println
-# uuid: println
-# --
-System.out.println("$0");
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/private b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/private
deleted file mode 100644
index 32e58fe..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/private
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: private
-# key: pri
-# uuid: pri
-# --
-private $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/protected b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/protected
deleted file mode 100644
index cdc4c24..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/protected
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: protected
-# key: pr
-# uuid: pr
-# --
-protected $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/public b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/public
deleted file mode 100644
index 378b360..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/public
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: public
-# key: p
-# uuid: p
-# --
-public $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/return b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/return
deleted file mode 100644
index 27b6818..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/return
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: return
-# key: ret
-# uuid: ret
-# condition: (not (sp-point-in-string-or-comment))
-# --
-return $0;
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/test b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/test
deleted file mode 100644
index 2aa4d2d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/test
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: test
-# key: test
-# uuid: test
-# --
-@Test
-public void test_${1:Case}() {
-       $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/testClass b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/testClass
deleted file mode 100644
index 6bdeb91..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/testClass
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- mode: snippet -*-
-# name: testClass
-# key: tc
-# uuid: tc
-# --
-import junit.framework.*;
-import junit.textui.*;
-
-public class Test${1:Class} extends TestCase {
-       protected void setUp() {
-                 $0
-       }
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/this b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/this
deleted file mode 100644
index 2f67688..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/this
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: this
-# key: .
-# uuid: .
-# --
-this.$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/toString b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/toString
deleted file mode 100644
index 2e60c9d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/toString
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: toString
-# key: toStr
-# uuid: toStr
-# --
-public String toString() {
-       $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/try b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/try
deleted file mode 100644
index 3ce4885..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/try
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- mode: snippet -*-
-# name: try
-# key: try
-# uuid: try
-# condition: (not (sp-point-in-string-or-comment))
-# --
-try {
-    $0
-} catch (${1:Throwable} e) {
-      ${2:System.out.println("Error " + e.getMessage());
-      e.printStackTrace();}
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/var b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/var
deleted file mode 100644
index 7d9a3c6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/var
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: variable declaration
-# key: var
-# uuid: var
-# condition: (not (sp-point-in-string-or-comment))
-# --
-${1:int} ${2:variable}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/var= b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/var=
deleted file mode 100644
index 81afb6a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/var=
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: variable declaration & assignment
-# key: var=
-# uuid: var=
-# condition: (not (sp-point-in-string-or-comment))
-# --
-${1:int} ${2:variable} = $0;
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/void b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/void
deleted file mode 100644
index 71d7e81..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/void
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: void
-# key: v
-# uuid: v
-# --
-void $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/while b/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/while
deleted file mode 100644
index 42dbb9b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/java-mode/while
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: while loop
-# key: while
-# uuid: while
-# condition: (not (sp-point-in-string-or-comment))
-# --
-while (${1:true}) {
-      $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/json-mode/eslintConfig b/Emacs/.config/emacs/.config/yasnippet/snippets/json-mode/eslintConfig
deleted file mode 100644
index 8c9d2c4..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/json-mode/eslintConfig
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- mode: snippet -*-
-# name: eslintConfig
-# key: eslint
-# uuid: eslint
-# condition: (equal (file-name-nondirectory buffer-file-name) "package.json")
-# --
-"eslintConfig": {
-    "env": {
-        "es6": true,
-        "browser": true,
-        "commonjs": true,
-        "node": true
-    },
-    "parserOptions": {
-        "ecmaFeatures": {
-            "jsx": true
-        }
-    }
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/acronym b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/acronym
deleted file mode 100644
index 41fafdd..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/acronym
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: acronym
-# key: ac
-# uuid: ac
-# --
-\newacronym{${1:label}}{${1:$(upcase yas-text)}}{${2:Name}}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/alertblock b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/alertblock
deleted file mode 100644
index c8cfb62..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/alertblock
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: alertblock
-# key: al
-# uuid: al
-# --
-\begin{alertblock}{$2}
-        ${0:}
-\end{alertblock}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/alg b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/alg
deleted file mode 100644
index 568cf95..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/alg
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: alg
-# key: alg
-# uuid: alg
-# --
-\begin{algorithmic}
-${0:}
-\end{algorithmic}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/axiom b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/axiom
deleted file mode 100644
index 54d9b83..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/axiom
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: axiom
-# key: axm
-# group: theorems
-# --
-\begin{axiom}
-$0
-\end{axiom}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/begin b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/begin
deleted file mode 100644
index f998ce3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/begin
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: begin
-# key: begin
-# uuid: begin
-# --
-\begin{${1:environment}}
-$0
-\end{$1}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/bigcap_^ b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/bigcap_^
deleted file mode 100644
index b9a8319..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/bigcap_^
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: bigcap_^
-# key: cap
-# --
-\bigcap${1:$(when (> (length yas-text) 0) "_")
-}${1:$(when (> (length yas-text) 1) "{")
-}${1:i=0}${1:$(when (> (length yas-text) 1) "}")
-}${2:$(when (> (length yas-text) 0) "^")
-}${2:$(when (> (length yas-text) 1) "{")
-}${2:n}${2:$(when (> (length yas-text) 1) "}")} $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/bigcup_^ b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/bigcup_^
deleted file mode 100644
index d6c58e5..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/bigcup_^
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: bigcup_^
-# key: cup
-# --
-\bigcup${1:$(when (> (length yas-text) 0) "_")
-}${1:$(when (> (length yas-text) 1) "{")
-}${1:i=0}${1:$(when (> (length yas-text) 1) "}")
-}${2:$(when (> (length yas-text) 0) "^")
-}${2:$(when (> (length yas-text) 1) "{")
-}${2:n}${2:$(when (> (length yas-text) 1) "}")} $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/block b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/block
deleted file mode 100644
index 7c4ebd6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/block
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: block
-# key: bl
-# uuid: bl
-# --
-\begin{block}{$1}
-        ${0:}
-\end{block}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/capgls b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/capgls
deleted file mode 100644
index 5a5d021..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/capgls
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: Gls
-# key: G
-# uuid: G
-# condition: (not (save-restriction (widen) (texmathp)))
-# --
-\Gls{${1:label}}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/caption b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/caption
deleted file mode 100644
index 6d36c67..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/caption
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: caption
-# key: ca
-# uuid: ca
-# --
-\caption{${0:}}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/cite b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/cite
deleted file mode 100644
index b584ba7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/cite
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: cite
-# key: c
-# uuid: c
-# condition: (not (save-restriction (widen) (texmathp)))
-# --
-\cite{$1} $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/code b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/code
deleted file mode 100644
index 3ebea95..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/code
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: code
-# key: code
-# uuid: code
-# --
-\begin{lstlisting}
-${0:}
-\end{lstlisting}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/columns b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/columns
deleted file mode 100644
index 2d70450..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/columns
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- mode: snippet -*-
-# name: columns
-# key: cols
-# uuid: cols
-# --
-\begin{columns}
-  \begin{column}{.${1:5}\textwidth}
-  $0
-  \end{column}
-
-  \begin{column}{.${2:5}\textwidth}
-
-  \end{column}
-\end{columns}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/corollary b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/corollary
deleted file mode 100644
index f9590bc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/corollary
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: corollary
-# key: clr
-# group: theorems
-# --
-\begin{corollary}
-$0
-\end{corollary}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/definition b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/definition
deleted file mode 100644
index bf16e98..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/definition
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: definition
-# key: def
-# group: theorems
-# --
-\begin{definition}
-$0
-\end{definition}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/emph b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/emph
deleted file mode 100644
index 3b091c2..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/emph
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: emph
-# key: e
-# uuid: e
-# condition: (not (save-restriction (widen) (texmathp)))
-# --
-\emph{${1:}}$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/enumerate b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/enumerate
deleted file mode 100644
index 6e38ec9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/enumerate
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: enumerate
-# key: en
-# uuid: en
-# --
-\begin{enumerate}
-${0:}
-\end{enumerate}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/exercise b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/exercise
deleted file mode 100644
index 05b5a48..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/exercise
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: exercise
-# key: exc
-# group: theorems
-# --
-\begin{exercise}
-$0
-\end{exercise}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/figure b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/figure
deleted file mode 100644
index cd84b8d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/figure
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: figure
-# key: fig
-# uuid: fig
-# --
-\begin{figure}[ht]
-  \centering
-  \includegraphics[${1:options}]{figures/${2:path.pdf}}
-  \caption{\label{fig:${3:label}} $0}
-\end{figure}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/frac b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/frac
deleted file mode 100644
index 3989e42..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/frac
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: frac
-# key: frac
-# uuid: frac
-# --
-\frac{${1:`(or % "numerator")`}}{${2:denominator}}$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/frame b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/frame
deleted file mode 100644
index bc74ffc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/frame
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: frame
-# key: fr
-# uuid: fr
-# --
-\begin{frame}${1:[$2]}
-        ${3:\frametitle{$4}}
-        ${0:}
-\end{frame}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/gls b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/gls
deleted file mode 100644
index d21eb63..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/gls
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: gls
-# key: g
-# uuid: g
-# condition: (not (save-restriction (widen) (texmathp)))
-# --
-\gls{${1:label}}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/glspl b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/glspl
deleted file mode 100644
index 4a613b7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/glspl
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: glspl
-# key: gp
-# uuid: gp
-# --
-\glspl{${1:label}}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/if b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/if
deleted file mode 100644
index a7a7133..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/if
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: if
-# key: if
-# uuid: if
-# --
-\IF {$${1:cond}$}
-    $0
-\ELSE
-\ENDIF
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/includegraphics b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/includegraphics
deleted file mode 100644
index dc290e3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/includegraphics
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: includegraphics
-# key: ig
-# uuid: ig
-# --
-\includegraphics${1:[$2]}{$0}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/int_^ b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/int_^
deleted file mode 100644
index 9edfb61..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/int_^
+++ /dev/null
@@ -1,9 +0,0 @@
-# key: int
-# name: int_^
-# --
-\int${1:$(when (> (length yas-text) 0) "_")
-}${1:$(when (> (length yas-text) 1) "{")
-}${1:left}${1:$(when (> (length yas-text) 1) "}")
-}${2:$(when (> (length yas-text) 0) "^")
-}${2:$(when (> (length yas-text) 1) "{")
-}${2:right}${2:$(when (> (length yas-text) 1) "}")} $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/item b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/item
deleted file mode 100644
index 49d61c7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/item
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: item
-# key: -
-# uuid: -
-# condition: (not (save-restriction (widen) (texmathp)))
-# --
-\item ${0:}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/itemize b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/itemize
deleted file mode 100644
index dc64b1c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/itemize
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: itemize
-# key: it
-# uuid: it
-# --
-\begin{itemize}
-${0:}
-\end{itemize}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/label b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/label
deleted file mode 100644
index 237ef67..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/label
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: label
-# key: lab
-# uuid: lab
-# --
-\label{$0}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/lemma b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/lemma
deleted file mode 100644
index 40aebf8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/lemma
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: lemma
-# key: lmm
-# group: theorems
-# --
-\begin{lemma}
-$0
-\end{lemma}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/lim b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/lim
deleted file mode 100644
index db43ca3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/lim
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: lim
-# key: lim
-# --
-\lim_{${1:n} \to ${2:\infty}} $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/liminf b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/liminf
deleted file mode 100644
index 19ae703..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/liminf
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: liminf
-# key: liminf
-# --
-\liminf_{${1:n} \to ${2:\infty}} $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/limsup b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/limsup
deleted file mode 100644
index bdba92b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/limsup
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: limsup
-# key: limsup
-# --
-\limsup_{${1:n} \to ${2:\infty}} $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/listing b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/listing
deleted file mode 100644
index 36f34b8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/listing
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: listing
-# key: lst
-# uuid: lst
-# --
-\begin{lstlisting}[float,label=lst:${1:label},caption=nextHopInfo: ${2:caption}]
-${0:}
-\end{lstlisting}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/mathclap b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/mathclap
deleted file mode 100644
index 872794a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/mathclap
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: mathclap
-# key: mc
-# --
-\mathclap{$0}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/movie b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/movie
deleted file mode 100644
index 2047bbf..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/movie
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- mode: snippet -*-
-# name: movie
-# key: movie
-# uuid: movie
-# --
-\begin{center}
-\includemovie[
-  label=test,
-  controls=false,
-  text={\includegraphics[width=4in]{${1:image.pdf}}}
-]{4in}{4in}{${2:video file}}
-
-\movieref[rate=3]{test}{Play Fast}
-\movieref[rate=1]{test}{Play Normal Speed} 
-\movieref[rate=0.2]{test}{Play Slow}
-\movieref[resume]{test}{Pause/Resume}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/newcommand b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/newcommand
deleted file mode 100644
index 69da1fd..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/newcommand
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: newcommand
-# key: cmd
-# uuid: cmd
-# --
-\newcommand{\\${1:name}}${2:[${3:0}]}{$0}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/newglossaryentry b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/newglossaryentry
deleted file mode 100644
index 45fe438..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/newglossaryentry
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: newglossaryentry
-# key: gl
-# uuid: gl
-# --
-\newglossaryentry{${1:AC}}{name=${2:Andrea Crotti}${3:, description=${4:description}}}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/note b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/note
deleted file mode 100644
index 4e80006..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/note
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: note
-# key: no
-# uuid: no
-# --
-\note{${0:}}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/prod_^ b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/prod_^
deleted file mode 100644
index aaa1544..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/prod_^
+++ /dev/null
@@ -1,9 +0,0 @@
-# key: prod
-# name: prod_^
-# --
-\prod${1:$(when (> (length yas-text) 0) "_")
-}${1:$(when (> (length yas-text) 1) "{")
-}${1:i=0}${1:$(when (> (length yas-text) 1) "}")
-}${2:$(when (> (length yas-text) 0) "^")
-}${2:$(when (> (length yas-text) 1) "{")
-}${2:n}${2:$(when (> (length yas-text) 1) "}")} $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/proof b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/proof
deleted file mode 100644
index 37c58d0..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/proof
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: proof
-# key: prf
-# group: theorems
-# --
-\begin{proof}
-$0
-\end{proof}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/python b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/python
deleted file mode 100644
index 2f05399..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/python
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: python
-# key: py
-# uuid: py
-# --
-\lstset{language=python}
-\begin[language=python]{lstlisting}
-${0:}
-\end{lstlisting}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/question b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/question
deleted file mode 100644
index 1b41306..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/question
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: question
-# key: q
-# uuid: q
-# condition: (not (save-restriction (widen) (texmathp)))
-# --
-\question{${0:}}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/remark b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/remark
deleted file mode 100644
index 176ed84..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/remark
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: remark
-# key: rmk
-# group: theorems
-# --
-\begin{remark}
-$0
-\end{remark}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/root b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/root
deleted file mode 100644
index 55fc666..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/root
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: sqrt[]{}
-# key: root
-# --
-\sqrt[$1]{$2}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/section b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/section
deleted file mode 100644
index c9b7709..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/section
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: section
-# key: sec
-# uuid: sec
-# --
-\section{${1:name}}
-\label{sec:${2:label}}
-
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/sqrt b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/sqrt
deleted file mode 100644
index 705d977..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/sqrt
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: sqrt
-# key: sq
-# --
-\sqrt{$1}$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/subf b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/subf
deleted file mode 100644
index 58b1853..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/subf
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: subf
-# key: sf
-# uuid: sf
-# --
-\subfigure[${1:caption}]{
-  \label{fig:${2:label}} 
-  \includegraphics[width=.${3:3}\textwidth]{${4:path}}}
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/subfigure b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/subfigure
deleted file mode 100644
index dc2fe84..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/subfigure
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- mode: snippet -*-
-# name: subfigure
-# key: subfig
-# uuid: subfig
-# --
-\begin{figure}[ht]
-  \centering
-  \subfigure[$1]
-  {\label{fig:${2:label}} 
-    \includegraphics[width=.${3:5}\textwidth]{${4:path}}}
-
-  \caption{${5:caption}}
-\label{fig:${6:label}}
-\end{figure}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/subsec b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/subsec
deleted file mode 100644
index c716170..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/subsec
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: subsec
-# key: sub
-# uuid: sub
-# --
-\subsection{${1:name}}
-\label{subsec:${2:label}}
-
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/sum_^ b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/sum_^
deleted file mode 100644
index 4071127..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/sum_^
+++ /dev/null
@@ -1,9 +0,0 @@
-# key: sum
-# name: sum_^
-# --
-\sum${1:$(when (> (length yas-text) 0) "_")
-}${1:$(when (> (length yas-text) 1) "{")
-}${1:i=0}${1:$(when (> (length yas-text) 1) "}")
-}${2:$(when (> (length yas-text) 0) "^")
-}${2:$(when (> (length yas-text) 1) "{")
-}${2:n}${2:$(when (> (length yas-text) 1) "}")} $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/textbf b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/textbf
deleted file mode 100644
index 8201e09..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/textbf
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: textbf
-# key: b
-# uuid: b
-# condition: (not (save-restriction (widen) (texmathp)))
-# --
-\textbf{$1}$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/theorem b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/theorem
deleted file mode 100644
index eff29da..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/theorem
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: theorem
-# key: thm
-# group: theorems
-# --
-\begin{theorem}
-$0
-\end{theorem}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/usepackage b/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/usepackage
deleted file mode 100644
index 67e3758..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/latex-mode/usepackage
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: usepackage
-# key: pkg
-# uuid: pkg
-# --
-\usepackage{$0}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-interaction-mode/defun b/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-interaction-mode/defun
deleted file mode 100644
index 4dd266a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-interaction-mode/defun
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: defun
-# key: defun
-# uuid: defun
-# --
-(defun ${1:fun} (${2:args})
-       $0
-)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/class b/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/class
deleted file mode 100644
index 7f4547f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/class
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: defclass
-# key: defc
-# uuid: defc
-# --
-(defclass ${1:name} (${2:inherits})
-  (${4:slots})
-  (:documentation "${3:...}"))
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/cond b/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/cond
deleted file mode 100644
index fe254dc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/cond
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: cond
-# --
-(cond ($1)$2)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/defpackage b/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/defpackage
deleted file mode 100644
index f1b7fc3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/defpackage
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: defpackage
-# key: defp
-# uuid: defp
-# --
-(defpackage #:${1:name}
-   (:nicknames #:${2:nick})
-   (:use #:cl #:closer-mop #:${3:package})
-   (:shadow :${4.symbol})
-   (:shadowing-import-from #:${5:package} #:${6:symbol})
-   (:export :$0))
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/do b/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/do
deleted file mode 100644
index e905a40..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/do
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: do
-# key: do
-# uuid: do
-# --
-(do ((${1:var1} ${2:init-form} ${3:step-form})
-     (${4:var2} ${5:init-form} ${6:step-form}))  
-    (${7:condition} ${8:return-value})
-    (${9:body}))
-$0
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/format b/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/format
deleted file mode 100644
index 0010752..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/format
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: format
-# --
-(format t "~& $0 ~%")
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/slot b/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/slot
deleted file mode 100644
index 42f0c3b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/slot
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- mode: snippet -*-
-# name: slot
-# --
-(${1:name} :initarg :${1:$(yas/substr yas-text "[^: ]*")}
-           :initform (error ":${1:$(yas/substr yas-text "[^: ]*")} must be specified")
-           ;; :accessor ${1:$(yas/substr yas-text "[^: ]*")}
-           :reader ${1:$(yas/substr yas-text "[^: ]*")}-changed
-           :writer set-${1:$(yas/substr yas-text "[^: ]*")}
-           :type
-           :allocation ${3::class :instance}
-           :documentation "${2:about-slot}")
-$0
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/typecast b/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/typecast
deleted file mode 100644
index 1b61f47..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/lisp-mode/typecast
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: typecast
-# name: cast
-# --
-(coerce ${1:object} ${2:type})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-automake-mode/noinst_HEADERS b/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-automake-mode/noinst_HEADERS
deleted file mode 100644
index 2877a45..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-automake-mode/noinst_HEADERS
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: noinst_HEADERS
-# key: noinst
-# uuid: noinst
-# --
-noinst_HEADERS = $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-bsdmake-mode/PHONY b/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-bsdmake-mode/PHONY
deleted file mode 100644
index c64a5d9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-bsdmake-mode/PHONY
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: PHONY
-# key: phony
-# uuid: phony
-# --
-.PHONY: $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-bsdmake-mode/echo b/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-bsdmake-mode/echo
deleted file mode 100644
index d1a288d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-bsdmake-mode/echo
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: echo
-# key: echo
-# uuid: echo
-# --
-@echo ${1:"message to output"}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-bsdmake-mode/gen b/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-bsdmake-mode/gen
deleted file mode 100644
index 28e2fe5..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-bsdmake-mode/gen
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- mode: snippet -*-
-# name: gen
-# key: gen
-# uuid: gen
-# possibly add some smart control over the list
-# --
-all: ${1:targets}
-
-$0
-
-clean:
-        ${2:clean actions}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-bsdmake-mode/if b/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-bsdmake-mode/if
deleted file mode 100644
index 89617a8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-bsdmake-mode/if
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: if
-# key: if
-# uuid: if
-# --
-@if [ ${1:cond} ]
-    then $0
-fi
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-bsdmake-mode/var b/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-bsdmake-mode/var
deleted file mode 100644
index aeb17b6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-bsdmake-mode/var
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: var
-# key: $
-# uuid: $
-# --
-$(${1:VAR})$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-gmake-mode/patsubst b/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-gmake-mode/patsubst
deleted file mode 100644
index 902b260..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-gmake-mode/patsubst
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: patsubst
-# --
-$(patsubst ${1:from},${2:to},${3:src})
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-gmake-mode/phony b/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-gmake-mode/phony
deleted file mode 100644
index d11d342..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-gmake-mode/phony
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: phony
-# --
-.PHONY = $0
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-gmake-mode/wildcard b/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-gmake-mode/wildcard
deleted file mode 100644
index efa944a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-gmake-mode/wildcard
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: wildcard
-# --
-$(wildcard $0)
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-mode/all b/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-mode/all
deleted file mode 100644
index 7d0b0e6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/makefile-mode/all
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: all
-# key: all
-# uuid: all
-# --
-all:
-        $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/code b/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/code
deleted file mode 100644
index 453bb40..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/code
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: Code block
-# --
-\`\`\`${1:lang}
-$0
-\`\`\`
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h1 b/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h1
deleted file mode 100644
index f5c5194..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h1
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: Header 1 (#)
-# key: h1
-# uuid: h1
-# --
-# ${1:Header 1}`(unless markdown-asymmetric-header " #")`
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h2 b/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h2
deleted file mode 100644
index f1edaf5..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h2
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: Header 2 (##)
-# key: h2
-# uuid: h2
-# --
-## ${1:Header 2}`(unless markdown-asymmetric-header " ##")`
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h3 b/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h3
deleted file mode 100644
index 0b36721..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h3
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: Header 3
-# key: h3
-# uuid: h3
-# --
-### ${1:Header 3}`(unless markdown-asymmetric-header " ###")`
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h4 b/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h4
deleted file mode 100644
index df69bfd..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h4
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: Header 4
-# key: h4
-# uuid: h4
-# --
-#### ${1:Header 4}`(unless markdown-asymmetric-header " ####")`
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h5 b/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h5
deleted file mode 100644
index 8d5408d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h5
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: Header 5
-# key: h5
-# uuid: h5
-# --
-##### ${1:Header 5}`(unless markdown-asymmetric-header " #####")`
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h6 b/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h6
deleted file mode 100644
index 59ba638..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/h6
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: Header 6
-# key: h6
-# uuid: h6
-# --
-###### ${1:Header 6}`(unless markdown-asymmetric-header " ######")`
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/hr b/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/hr
deleted file mode 100644
index a1a48f6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/hr
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: hr
-# key: ---
-# uuid: ---
-# binding: direct-keybinding
-# --
--------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/img b/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/img
deleted file mode 100644
index 3f0fb0f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/img
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: Image
-# --
-![${1:Alt Text}](${2:URL})$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/kbd b/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/kbd
deleted file mode 100644
index 4817324..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/kbd
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: <kbd>...</kbd>
-# --
-<kbd>$0</kbd>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/link b/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/link
deleted file mode 100644
index 2c12223..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/link
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: Link
-# --
-[${1:`(or % "text")`}](${2:http://$3})$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/ol b/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/ol
deleted file mode 100644
index cf8e31a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/ol
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: Ordered List
-# --
-${1:1}. ${2:Text}
-${1:$(number-to-string (1+ (string-to-number %)))}. $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/rimg b/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/rimg
deleted file mode 100644
index e14964d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/rimg
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: Referenced Image
-# --
-![${1:Alt Text}][$2]$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/rlb b/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/rlb
deleted file mode 100644
index 44b5f5e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/rlb
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: Reference Label
-# contributor: Peng Deng <dengpeng@gmail.com>
-# --
-[${1:Reference}]: ${2:URL} $3
-$0
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/rlink b/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/rlink
deleted file mode 100644
index be20fa4..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/rlink
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: Reference Link
-# --
-[${1:Link Text}][$2]$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/utf8 b/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/utf8
deleted file mode 100644
index f21e9a6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/markdown-mode/utf8
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: utf-8 encoding
-# --
-<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/org-mode/no-tangle b/Emacs/.config/emacs/.config/yasnippet/snippets/org-mode/no-tangle
new file mode 100644
index 0000000..c4bbb93
--- /dev/null
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/org-mode/no-tangle
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: no-tangle
+# key: <no-tangle
+# --
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/org-mode/src_block b/Emacs/.config/emacs/.config/yasnippet/snippets/org-mode/src_block
new file mode 100644
index 0000000..5f0195f
--- /dev/null
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/org-mode/src_block
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: src_block
+# key: <src
+# --
+#+begin_src $1
+$0
+#+end_src
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__contains__ b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__contains__
deleted file mode 100644
index c101840..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__contains__
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: __contains__
-# key: cont
-# uuid: cont
-# group: dunder methods
-# --
-def __contains__(self, el):
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__enter__ b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__enter__
deleted file mode 100644
index 1356004..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__enter__
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: __enter__
-# key: ent
-# uuid: ent
-# group: dunder methods
-# --
-def __enter__(self):
-    $0
-
-    return self
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__exit__ b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__exit__
deleted file mode 100644
index 7b006dc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__exit__
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: __exit__
-# key: ex
-# uuid: ex
-# group: dunder methods
-# --
-def __exit__(self, type, value, traceback):
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__getitem__ b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__getitem__
deleted file mode 100644
index 8f911ec..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__getitem__
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: __getitem__
-# key: getit
-# uuid: getit
-# group: dunder methods
-# --
-def __getitem__(self, ${1:key}):
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/init b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__init__
index 4d11fe6..40bfac1 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/init
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__init__
@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
-# name: init
-# key: init
+# name: __init__
+# key: __init__
 # uuid: init
 # group: definitions
 # --
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__len__ b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__len__
deleted file mode 100644
index 0e3fadc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__len__
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: __len__
-# key: len
-# uuid: len
-# group: dunder methods
-# --
-def __len__(self):
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__new__ b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__new__
deleted file mode 100644
index 3c31a33..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__new__
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: __new__
-# key: new
-# uuid: new
-# group: dunder methods
-# --
-def __new__(mcs, name, bases, dict):
-    $0
-    return type.__new__(mcs, name, bases, dict)
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__setitem__ b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__setitem__
deleted file mode 100644
index dcb86ac..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/__setitem__
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: __setitem__
-# key: setit
-# uuid: setit
-# group: dunder methods
-# --
-def __setitem__(self, ${1:key}, ${2:val}):
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/all b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/all
deleted file mode 100644
index 8bea140..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/all
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: all
-# --
-__all__ = [
-        $0
-]
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/arg b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/arg
deleted file mode 100644
index afd9443..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/arg
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: arg
-# key: arg
-# uuid: arg
-# group: argparser
-# --
-parser.add_argument('-$1', '--$2',
-                    $0)
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/arg_positional b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/arg_positional
deleted file mode 100644
index 7e27e79..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/arg_positional
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: arg_positional
-# key: argp
-# uuid: argp
-# group: argparser
-# --
-parser.add_argument('${1:varname}', $0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assert b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assert
deleted file mode 100644
index f78542a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assert
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: assert
-# group: testing
-# --
-assert $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertEqual b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertEqual
deleted file mode 100644
index 784461a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertEqual
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: assertEqual
-# key: ae
-# uuid: ae
-# group: testing
-# --
-self.assertEqual($1, $2)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertFalse b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertFalse
deleted file mode 100644
index e99ae75..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertFalse
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: assertFalse
-# key: af
-# uuid: af
-# group: testing
-# --
-self.assertFalse($0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertIn b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertIn
deleted file mode 100644
index 1a40c0a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertIn
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: assertIn
-# key: ai
-# uuid: ai
-# group: testing
-# --
-self.assertIn(${1:member}, ${2:container})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertNotEqual b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertNotEqual
deleted file mode 100644
index a5ef25f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertNotEqual
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: assertNotEqual
-# key: ane
-# uuid: ane
-# group: testing
-# --
-self.assertNotEqual($1, $2)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertRaises b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertRaises
deleted file mode 100644
index 3d5d2c4..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertRaises
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: assertRaises
-# group: testing
-# --
-assertRaises(${1:Exception}, ${2:fun})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertRaises.with b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertRaises.with
deleted file mode 100644
index b59d4e9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertRaises.with
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: assertRaises
-# key: ar
-# uuid: ar
-# --
-with self.assertRaises(${1:Exception}):
-     $0
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertTrue b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertTrue
deleted file mode 100644
index 7c07d30..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/assertTrue
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: assertTrue
-# key: at
-# uuid: at
-# group: testing
-# --
-self.assertTrue($0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/celery_pdb b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/celery_pdb
deleted file mode 100644
index cb483a2..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/celery_pdb
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: celery pdb
-# key: cdb
-# uuid: cdb
-# group: debug
-# --
-from celery.contrib import rdb; rdb.set_trace()
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/class b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/class
deleted file mode 100644
index 9e43aff..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/class
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: class
-# key: cl
-# uuid: cl
-# group: object oriented
-# --
-class ${1:Name}($2):
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/classmethod b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/classmethod
deleted file mode 100644
index 74cd7d2..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/classmethod
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: classmethod
-# key: defc
-# uuid: defc
-# group: object oriented
-# --
-@classmethod
-def ${1:method_name}(cls, $1):
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/dec b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/dec
deleted file mode 100644
index 1ecae49..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/dec
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- mode: snippet -*-
-# name: def decorator
-# key: dec
-# uuid: dec
-# group: definitions
-# --
-def ${1:decorator}(func):
-    $2
-    def _$1(*args, **kwargs):
-        $3
-        ret = func(*args, **kwargs)
-        $4
-        return ret
-
-    return _$1
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/def b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/def
index 76256b0..94ed687 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/def
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/def
@@ -5,4 +5,4 @@
 # group: definitions
 # --
 def ${1:func_name}($2):
-    ${3:`(or % "pass")`}
\ No newline at end of file
+    ${3:pass}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/defm b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/defm
deleted file mode 100644
index 7714eb5..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/defm
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: method
-# key: defm
-# uuid: defm
-# group: object oriented
-# --
-def ${1:method_name}(self${2:, $3}):
-    ${4:`(or % "pass")`}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/doc b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/doc
deleted file mode 100644
index 60dda5e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/doc
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: doc
-# key: d
-# uuid: d
-# --
-"""$0
-"""
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/doctest b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/doctest
deleted file mode 100644
index adb39a3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/doctest
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: doctest
-# key: doc
-# uuid: doc
-# group: testing
-# --
->>> ${1:function calls}
-${2:desired output}
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/eq b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/eq
deleted file mode 100644
index 685506f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/eq
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: __eq__
-# key: eq
-# uuid: eq
-# group: dunder methods
-# --
-def __eq__(self, other):
-    return self.$1 == other.$1
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/for b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/for
index edadb43..e58eb33 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/for
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/for
@@ -5,4 +5,4 @@
 # group: control structure
 # --
 for ${1:var} in ${2:collection}:
-    ${3:`(or % "pass")`}
\ No newline at end of file
+    ${3:pass}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/from b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/from
deleted file mode 100644
index 52d27c9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/from
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: from
-# key: from
-# uuid: from
-# group: general
-# --
-from ${1:lib} import ${2:funs}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/function_docstring b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/function_docstring
deleted file mode 100644
index b7f77dc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/function_docstring
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: function_docstring
-# key: fd
-# uuid: fd
-# group: definitions
-# --
-def ${1:name}($2):
-    \"\"\"$3
-    ${2:$(python-args-to-docstring)}
-    \"\"\"
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/if b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/if
deleted file mode 100644
index e055028..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/if
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: if
-# key: if
-# uuid: if
-# group: control structure
-# --
-if ${1:cond}:
-    ${2:`(or % "pass")`}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/ife b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/ife
deleted file mode 100644
index 017e88a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/ife
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: ife
-# key: ife
-# uuid: ife
-# group: control structure
-# --
-if $1:
-    ${2:`(or % "pass")`}
-else:
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/ifmain b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/ifmain
index 29a6650..eee8f0f 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/ifmain
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/ifmain
@@ -2,4 +2,4 @@
 # name: ifmain
 # --
 if __name__ == '__main__':
-    ${1:`(or % "pass")`}
\ No newline at end of file
+    ${1:pass}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/import b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/import
deleted file mode 100644
index 2989140..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/import
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: import
-# key: imp
-# uuid: imp
-# group: general
-# --
-import ${1:lib}${2: as ${3:alias}}
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/init_docstring b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/init_docstring
deleted file mode 100644
index e3a8509..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/init_docstring
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: init_docstring
-# key: initd
-# uuid: initd
-# group: definitions
-# --
-def __init__(self$1):
-    \"\"\"$2
-    ${1:$(python-args-to-docstring)}
-    \"\"\"
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/interact b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/interact
deleted file mode 100644
index 85b0215..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/interact
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: interact
-# key: int
-# uuid: int
-# --
-import code; code.interact(local=locals())
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/ipdbdebug b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/ipdbdebug
deleted file mode 100644
index 6dabcfe..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/ipdbdebug
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: ipdb trace
-# key: itr
-# uuid: itr
-# group: debug
-# --
-import ipdb; ipdb.set_trace()
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/iter b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/iter
deleted file mode 100644
index 83792d7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/iter
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: __iter__
-# key: iter
-# uuid: iter
-# group: dunder methods
-# --
-def __iter__(self):
-    return ${1:iter($2)}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/lambda b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/lambda
deleted file mode 100644
index 302d71c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/lambda
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: lambda
-# key: lam
-# uuid: lam
-# --
-lambda ${1:x}: $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/list b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/list
index 6934c76..46099d0 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/list
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/list
@@ -4,4 +4,4 @@
 # uuid: li
 # group: definitions
 # --
-[${1:x} for $1 in ${2:list}]
\ No newline at end of file
+[${3:$1} for ${1:x} in ${2:list}]
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/logger_name b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/logger_name
deleted file mode 100644
index ae7d86a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/logger_name
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: logger_name
-# key: ln
-# uuid: ln
-# --
-logger = logging.getLogger(__name__)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/logging b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/logging
deleted file mode 100644
index df0a9b4..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/logging
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: logging
-# key: log
-# uuid: log
-# --
-logger = logging.getLogger("${1:name}")
-logger.setLevel(logging.${2:level})
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/main b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/main
deleted file mode 100644
index d835607..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/main
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: main
-# key: main
-# uuid: main
-# --
-def main():
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/metaclass b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/metaclass
deleted file mode 100644
index 9fce8cc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/metaclass
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: metaclass
-# key: mt
-# uuid: mt
-# group: object oriented
-# --
-__metaclass__ = type
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/method b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/method
deleted file mode 100644
index 9eb1afa..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/method
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: method
-# group: object oriented
-# --
-def ${1:method_name}(self${2:, $3}):
-    $0
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/method_docstring b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/method_docstring
deleted file mode 100644
index 861e276..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/method_docstring
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: method_docstring
-# key: defd
-# uuid: defd
-# group: object oriented
-# --
-def ${1:name}(self$2):
-    \"\"\"$3
-    ${2:$(python-args-to-docstring)}
-    \"\"\"
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/not_impl b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/not_impl
deleted file mode 100644
index 00c35d1..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/not_impl
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: not_impl
-# key: not_impl
-# uuid: not_impl
-# --
-raise NotImplementedError
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/np b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/np
deleted file mode 100644
index 21b05a7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/np
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: np
-# key: np
-# uuid: np
-# group: general
-# --
-import numpy as np
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/parse_args b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/parse_args
deleted file mode 100644
index dd3636a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/parse_args
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: parse_args
-# key: pargs
-# uuid: pargs
-# group: argparser
-# --
-def parse_arguments():
-    parser = argparse.ArgumentParser(description='$1')
-    $0
-    return parser.parse_args()
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/parser b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/parser
deleted file mode 100644
index 4b85de0..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/parser
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: parser
-# key: pars
-# uuid: pars
-# group: argparser
-# --
-parser = argparse.ArgumentParser(description='$1')
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/pass b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/pass
deleted file mode 100644
index c201916..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/pass
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: pass
-# key: ps
-# uuid: ps
-# --
-pass
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/print b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/print
deleted file mode 100644
index 867c8fc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/print
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: print
-# key: p
-# uuid: p
-# --
-print($0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/prop b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/prop
deleted file mode 100644
index 6ca454a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/prop
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Mads D. Kristensen <madsdk@gmail.com>
-# name: prop
-# --
-def ${1:foo}():
-   doc = """${2:Doc string}"""
-   def fget(self):
-       return self._$1
-
-   def fset(self, value):
-       self._$1 = value
-
-   def fdel(self):
-       del self._$1
-   return locals()
-$1 = property(**$1())
-
-$0
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/reg b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/reg
deleted file mode 100644
index b4c5b60..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/reg
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: reg
-# key: reg
-# uuid: reg
-# group: general
-# --
-${1:regexp} = re.compile(r"${2:expr}")
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/repr b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/repr
deleted file mode 100644
index 3aa66b9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/repr
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: __repr__
-# key: repr
-# uuid: repr
-# group: dunder methods
-# --
-def __repr__(self):
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/return b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/return
deleted file mode 100644
index 70eda2f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/return
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: return
-# key: r
-# uuid: r
-# --
-return $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/script b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/script
deleted file mode 100644
index c08d0bb..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/script
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- mode: snippet -*-
-# name: script
-# key: script
-# uuid: script
-# --
-#!/usr/bin/env python
-
-def main():
-   pass
-
-if __name__ == '__main__':
-   main()
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/self b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/self
deleted file mode 100644
index abbad8c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/self
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: self
-# key: .
-# uuid: .
-# group: object oriented
-# --
-self.$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/self_without_dot b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/self_without_dot
deleted file mode 100644
index fd68278..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/self_without_dot
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: self_without_dot
-# key: s
-# uuid: s
-# group: object oriented
-# --
-self
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/selfassign b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/selfassign
deleted file mode 100644
index 68e2630..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/selfassign
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: selfassign
-# key: sn
-# uuid: sn
-# group: object oriented
-# --
-self.$1 = $1
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/setdef b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/setdef
deleted file mode 100644
index 6f97f5d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/setdef
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: setdef
-# key: setdef
-# uuid: setdef
-# --
-${1:var}.setdefault(${2:key}, []).append(${3:value})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/setup b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/setup
deleted file mode 100644
index 524c4ca..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/setup
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- mode: snippet -*-
-# name: setup
-# key: setup
-# uuid: setup
-# group: distribute
-# --
-from setuptools import setup
-
-package = '${1:name}'
-version = '${2:0.1}'
-
-setup(name=package,
-      version=version,
-      description="${3:description}",
-      url='${4:url}'$0)
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/size b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/size
deleted file mode 100644
index abe249f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/size
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: size
-# key: size
-# uuid: size
-# --
-sys.getsizeof($0)
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/static b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/static
deleted file mode 100644
index 3222c2f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/static
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: static
-# key: defs
-# uuid: defs
-# --
-@staticmethod
-def ${1:method_name}($1):
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/str b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/str
deleted file mode 100644
index 21f50cd..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/str
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: __str__
-# key: str
-# uuid: str
-# group: dunder methods
-# --
-def __str__(self):
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/super b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/super
deleted file mode 100644
index 83d98e8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/super
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: super
-# key: super
-# uuid: super
-# group: object oriented
-# --
-super(${1:Class}, self).${2:function}(${3:args})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/test_class b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/test_class
deleted file mode 100644
index 18b5415..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/test_class
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: test_class
-# key: tcs
-# uuid: tcs
-# group : testing
-# --
-class Test${1:toTest}(${2:unittest.TestCase}):
-      $0
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/test_file b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/test_file
deleted file mode 100644
index 42911c8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/test_file
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- mode: snippet -*-
-# name: test_file
-# key: tf
-# uuid: tf
-# group : testing
-# --
-import unittest
-${1:from ${2:test_file} import *}
-
-$0
-
-if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/trace b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/trace
deleted file mode 100644
index f4e356f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/trace
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: trace
-# key: tr
-# uuid: tr
-# group: debug
-# --
-import pdb; pdb.set_trace()
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/try b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/try
index bc77831..8bf0b8b 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/try
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/try
@@ -4,6 +4,6 @@
 # uuid: try
 # --
 try:
-    ${1:`(or % "pass")`}
+    ${1:pass}
 except ${2:Exception}:
     $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/tryelse b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/tryelse
index 505dac7..d155184 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/tryelse
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/tryelse
@@ -4,8 +4,8 @@
 # uuid: try
 # --
 try:
-    $1
-except $2:
-    $3
+    ${1:pass}
+except ${2:Exception}:
+    ${3:pass}
 else:
     $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/unicode b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/unicode
deleted file mode 100644
index 9546668..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/unicode
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: __unicode__
-# key: un
-# uuid: un
-# group: dunder methods
-# --
-def __unicode__(self):
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/utf8 b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/utf8
deleted file mode 100644
index 7ab1671..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/utf8
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: utf-8 encoding
-# key: utf8
-# uuid: utf8
-# --
-# -*- coding: utf-8 -*-
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/while b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/while
deleted file mode 100644
index 6eb8d34..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/while
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: while
-# key: wh
-# uuid: wh
-# group: control structure
-# --
-while ${1:True}:
-      $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/with_statement b/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/with_statement
deleted file mode 100644
index 218e7b7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/python-mode/with_statement
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: with_statement
-# key: fw
-# uuid: fw
-# group: future
-# --
-from __future__ import with_statement
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/File-open b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/File-open
deleted file mode 100644
index cf49c23..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/File-open
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: File::open(...)
-# key: fo
-# uuid: fo
-# --
-File::open(${1:})`(if (eolp) ";" "")`
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/None b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/None
deleted file mode 100644
index 63c3f82..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/None
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: None
-# key: no
-# uuid: no
-# --
-None
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/Result b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/Result
deleted file mode 100644
index 4e3df10..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/Result
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: Result<T, E>
-# key: res
-# uuid: res
-# --
-Result<${1:T}, ${2:()}>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/Some b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/Some
deleted file mode 100644
index d6de2c3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/Some
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: Some(...)
-# key: so
-# uuid: so
-# --
-Some(${1:})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/String_from b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/String_from
deleted file mode 100644
index d01f2a6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/String_from
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: String::from(...)
-# key: sf
-# uuid: sf
-# --
-String::from("$0")
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/Vec-with_capacity b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/Vec-with_capacity
deleted file mode 100644
index 2eb50ec..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/Vec-with_capacity
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: Vec::with_capacity(...)
-# key: vwc
-# uuid: vwc
-# --
-Vec::with_capacity(${1:n})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/allow b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/allow
deleted file mode 100644
index c30c1e8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/allow
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: #[allow(lint)]
-# key: allow
-# --
-#[allow(${1:lint})]
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/allow! b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/allow!
deleted file mode 100644
index cfb0c7d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/allow!
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: #![allow(lint)]
-# key: allow!
-# --
-#![allow(${1:lint})]
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/arrow b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/arrow
deleted file mode 100644
index 404cf5c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/arrow
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: x => y
-# key: =>
-# uuid: =>
-# --
-${1:_} => ${0:...}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/asref b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/asref
deleted file mode 100644
index 063f82a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/asref
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: impl AsRef<Type> for Type
-# key: asref
-# uuid: asref
-# --
-impl std::convert::AsRef<${1:Type}> for ${2:Type} {
-    fn as_ref(&self) -> &$2 {
-        $0
-    }
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/assert b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/assert
deleted file mode 100644
index bbdc741..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/assert
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: assert!(...)
-# key: ass
-# uuid: ass
-# --
-assert!($0);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/assert_eq b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/assert_eq
deleted file mode 100644
index 3de462f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/assert_eq
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: assert_eq!(..., ...)
-# key: asse
-# uuid: asse
-# --
-assert_eq!(${1:}, $2);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/assert_ne b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/assert_ne
deleted file mode 100644
index 2c83c1a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/assert_ne
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: assert_ne!(..., ...)
-# key: assn
-# uuid: assn
-# --
-assert_ne!(${1:}, $2);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/assignment b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/assignment
deleted file mode 100644
index c410d3e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/assignment
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: assignment
-# key: =
-# uuid: =
-# --
-${1:x} = ${2:value}`(if (eolp) ";" "")`$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/case b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/case
deleted file mode 100644
index 9ea6609..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/case
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: pattern => expression,
-# key: case
-# --
-${1:pattern} => ${2:expression},
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/cfg b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/cfg
deleted file mode 100644
index ce00c0a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: #[cfg(...)]
-# --
-#[cfg($0)]
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/cfg= b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/cfg=
deleted file mode 100644
index 588596f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/cfg=
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: #[cfg(option = "value")]
-# --
-#[cfg(${1:option} = "${2:value}")]
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/const b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/const
deleted file mode 100644
index e352aad..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/const
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: const VAR = ...
-# key: const
-# uuid: const
-# --
-const ${1:VARNAME}${2: ${3:i32}} = ${4:value};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/debug_assert b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/debug_assert
deleted file mode 100644
index 21ddad4..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/debug_assert
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: debug_assert!(...)
-# key: dass
-# uuid: dass
-# --
-debug_assert!($0);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/deref b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/deref
deleted file mode 100644
index 7cf9c02..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/deref
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: impl Deref for Type
-# key: deref
-# uuid: deref
-# --
-impl std::ops::Deref for ${1:Type} {
-    type Target = ${2:Type};
-    fn deref(&self) -> &Self::Target {
-        &self.$0
-    }
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/deref_mut b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/deref_mut
deleted file mode 100644
index 7ea39a0..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/deref_mut
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: impl DerefMut for Type
-# key: deref_mut
-# uuid: deref_mut
-# --
-impl std::ops::DerefMut for ${1:Type} {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.$0
-    }
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/derive b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/derive
deleted file mode 100644
index cf30bcc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/derive
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: #[derive(...)]
-# key: der
-# uuid: der
-# --
-#[derive($1)]
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/disperror b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/disperror
deleted file mode 100644
index fd91031..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/disperror
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- mode: snippet -*-
-# name: Display and Error Traits
-# key: disperror
-# uuid: disperror
-# --
-impl Display for $1 {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", $0)
-    }
-}
-
-impl std::error::Error for ${1:Type} {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        None
-    }
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/display b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/display
deleted file mode 100644
index 1764f67..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/display
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: impl Display for Type { fn fmt (...) }
-# key: display
-# --
-impl Display for ${1:Type} {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "$0")
-    }
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/else b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/else
deleted file mode 100644
index 4f835c1..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/else
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: else { ... }
-# key: else
-# uuid: else
-# --
-else {
-   $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/elseif b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/elseif
deleted file mode 100644
index 39650b0..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/elseif
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: else if ... { ... }
-# key: elif
-# uuid: elif
-# --
-else if ${1:true} {
-   $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/enum b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/enum
deleted file mode 100644
index 25527be..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/enum
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: enum
-# key: enum
-# uuid: enum
-# --
-enum ${1:EnumName} {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/env-args b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/env-args
deleted file mode 100644
index 2e07306..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/env-args
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: env::args()
-# key: argv
-# uuid: argv
-# --
-env::args()
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/env-var b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/env-var
deleted file mode 100644
index 1c2fd6c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/env-var
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: env::var(...)
-# key: envv
-# uuid: envv
-# --
-env::var("$1")
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/eprintln b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/eprintln
deleted file mode 100644
index d4c7d4b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/eprintln
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: eprintln!(...)
-# key: ep
-# uuid: ep
-# --
-eprintln!("$1", ${2:});$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/error b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/error
deleted file mode 100644
index fc77089..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/error
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: impl Error for Type { fn source(...) }
-# key: error
-# uuid: error
-# --
-impl std::error::Error for ${1:Type} {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        $0
-        None
-    }
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/extern b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/extern
deleted file mode 100644
index a0dcd68..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/extern
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: extern "C" { ... }
-# key: extc
-# uuid: extc
-# --
-extern "C" {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/extern-crate b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/extern-crate
deleted file mode 100644
index d79399e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/extern-crate
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: extern crate ...
-# key: ec
-# uuid: ec
-# --
-extern crate ${1:name};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/fn b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/fn
deleted file mode 100644
index a68dad0..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/fn
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: function
-# key: fn
-# uuid: fn
-# --
-fn ${1:function_name}($2) ${3:-> ${4:i32} }{
-   $0
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/for b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/for
deleted file mode 100644
index 7a7df24..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/for
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: for in
-# key: for
-# uuid: for
-# --
-for ${1:x} in ${2:items} {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/format b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/format
deleted file mode 100644
index f187c86..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/format
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: format!(..., ...)
-# key: f
-# uuid: f
-# --
-format!("$1", ${2:})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/from b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/from
deleted file mode 100644
index e04e7f0..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/from
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: impl From<From> for Type { fn from(...) }
-# key: from
-# --
-impl From<${1:From}> for ${2:Type} {
-    fn from(source: $1) -> Self {
-       $0
-       Self { }
-    }
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/fromstr b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/fromstr
deleted file mode 100644
index db95288..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/fromstr
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- mode: snippet -*-
-# name: impl FromStr for Type { fn from_str(...) }
-# key: fromstr
-# --
-impl FromStr for ${1:Type} {
-    type Err = ${2:Error};
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-
-        Ok(Self{})
-    }
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/if b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/if
deleted file mode 100644
index 1981003..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/if
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: if ... { ... }
-# key: if
-# uuid: if
-# --
-if ${1:x} {
-   $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/if-let b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/if-let
deleted file mode 100644
index 0e2571c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/if-let
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: if let ...
-# key: ifl
-# uuid: ifl
-# --
-if let ${1:Some(${2:x})} = ${3:var} {
-   $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/ignore b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/ignore
deleted file mode 100644
index b2e9013..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/ignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: #[ignore]
-# key: ign
-# uuid: ign
-# --
-#[ignore]
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/impl b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/impl
deleted file mode 100644
index 3f15ec3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/impl
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: impl
-# --
-impl ${1:name}${2: for ${3:Type}} {
-   $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/inline-if-else b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/inline-if-else
deleted file mode 100644
index 3672fab..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/inline-if-else
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: inline if-else
-# key: ife
-# uuid: ife
-# --
-if ${1:x} {${2:}}${3: else {$4}}$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/iterator b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/iterator
deleted file mode 100644
index 4f026a9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/iterator
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: impl Iterator for Type
-# key: iterator
-# uuid: iterator
-# --
-impl Iterator for ${1:Type} {
-    type Item = ${2:Type};
-    fn next(&mut self) -> Option<Self::Item> {
-        $0
-    }
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/lambda b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/lambda
deleted file mode 100644
index eced267..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/lambda
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: anonymous function
-# key: fn
-# uuid: fn
-# --
-|${1:x}|${2: -> i32} `(if (> (doom-snippets-count-lines %) 1) "{ " "")``(doom-snippets-format "%n%s%n")`$0`(if (> (doom-snippets-count-lines %) 1) " }" "")`
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/let b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/let
deleted file mode 100644
index a9be8d7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/let
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: let
-# key: let
-# uuid: let
-# --
-let ${1:var} = $0`(if (eolp) ";" "")`
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/letm b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/letm
deleted file mode 100644
index 8cd6c1e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/letm
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: let mut
-# key: letm
-# uuid: letm
-# --
-let mut ${1:var} = $0`(if (eolp) ";" "")`
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/lifetime-static b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/lifetime-static
deleted file mode 100644
index 7c7d140..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/lifetime-static
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: 'static
-# key: 's
-# uuid: 's
-# --
-'static
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/macro b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/macro
deleted file mode 100644
index 9ec9d72..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/macro
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: macro_rules! name { (..) => (..); }
-# key: macro
-# uuid: macro
-# --
-macro_rules! ${1:name} {
-     ($2) => ($3);
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/main b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/main
deleted file mode 100644
index d6092bf..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/main
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: main
-# key: main
-# uuid: main
-# --
-fn main() {
-   $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/match b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/match
deleted file mode 100644
index aa4d1d2..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/match
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: match
-# uuid: match
-# key: match
-# --
-match ${1:x} {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/match-ok b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/match-ok
deleted file mode 100644
index c9762dd..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/match-ok
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: match n { Ok(x), Err(y) }
-# key: match?
-# uuid: match?
-# --
-match ${1:x} {
-    Ok(${2:var}) => $3,
-    Err(${4:error}) => $5
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/mod b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/mod
deleted file mode 100644
index bc8bd61..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/mod
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: mod
-# key: mod
-# uuid: mod
-# --
-mod ${1:name} {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/new b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/new
deleted file mode 100644
index b7d0def..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/new
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: Type::new(...)
-# key: new
-# uuid: new
-# --
-${1:Vec}::new(${2:})`(if (eolp) ";" "")`
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/panic b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/panic
deleted file mode 100644
index 74f5384..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/panic
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: panic!(...)
-# key: pa
-# uuid: pa
-# --
-panic!("$1", ${2:});$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/partial b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/partial
deleted file mode 100644
index 76c29fe..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/partial
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: impl PartialEq for Type
-# key: partial
-# uuid: partial
-# --
-impl PartialEq for ${1:Type} {
-    fn eq(&self, other: &Self) -> bool {
-        $0
-    }
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/println b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/println
deleted file mode 100644
index df122f2..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/println
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: println!(...)
-# key: p
-# uuid: p
-# --
-println!("$1", ${2:});$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/pub_fn b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/pub_fn
deleted file mode 100644
index 617e3c3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/pub_fn
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: public function
-# key: pfn
-# uuid: pfn
-# --
-pub fn ${1:function_name}($2) ${3:-> ${4:i32} }{
-   $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/pub_mod b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/pub_mod
deleted file mode 100644
index 9227242..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/pub_mod
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: pub mod
-# key: pmod
-# uuid: pmod
-# --
-pub mod ${1:name} {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/ret b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/ret
deleted file mode 100644
index 5804823..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/ret
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: return
-# key: ret
-# uuid: ret
-# --
-return ${1:};$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/static b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/static
deleted file mode 100644
index 8e66349..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/static
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: static VAR = ...
-# key: static
-# uuid: static
-# --
-static ${1:VARNAME}${2:: ${3:i32}} = ${4:value};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/struct b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/struct
deleted file mode 100644
index bce4ff2..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/struct
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: struct
-# uuid: struct
-# key: struct
-# --
-struct ${1:Name} {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/struct_alias b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/struct_alias
deleted file mode 100644
index bb0c2d7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/struct_alias
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: struct
-# uuid: struct_alias
-# key: st
-# type: command
-# --
-(doom-snippets-expand :uuid "struct")
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/test b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/test
deleted file mode 100644
index 836b057..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/test
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: test function
-# key: test
-# uuid: test
-# --
-#[test]
-fn ${1:test_name}() {
-   $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/testmod b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/testmod
deleted file mode 100644
index f0be987..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/testmod
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- mode: snippet -*-
-# name: test module
-# key: testmod
-# --
-#[cfg(test)]
-mod ${1:tests} {
-    use super::*;
-
-    #[test]
-    fn ${2:test_name}() {
-       $0
-    }
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/trait b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/trait
deleted file mode 100644
index 255e4a6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/trait
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: trait ... { ... }
-# uuid: trait
-# key: trait
-# --
-trait ${1:Name} {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/type b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/type
deleted file mode 100644
index 1b88ffb..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/type
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: type Name = ...;
-# key: type
-# uuid: type
-# --
-type ${1:TypeName} = ${2:i32};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/union b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/union
deleted file mode 100644
index bfd93aa..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/union
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: union Type { ... }
-# key: union
-# --
-union ${1:Type} {
-     $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/use b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/use
deleted file mode 100644
index 6613f91..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/use
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: use ...
-# key: use
-# uuid: use
-# --
-use ${1:std::${2:io}};$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/use-File b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/use-File
deleted file mode 100644
index a8f5700..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/use-File
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: use std::fs::File
-# key: ufile
-# uuid: ufile
-# --
-use std::fs::File;
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/use-HashMap b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/use-HashMap
deleted file mode 100644
index 339b4f6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/use-HashMap
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: use std::collections::HashMap
-# key: uhashmap
-# uuid: uhashmap
-# --
-use std::collections::HashMap;
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/vec b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/vec
deleted file mode 100644
index ea5fcc5..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/vec
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: vec![...]
-# key: v
-# uuid: v
-# --
-vec![${1:}]
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/warn b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/warn
deleted file mode 100644
index acf5c5c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/warn
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: #[warn(lint)]
-# key: warn
-# --
-#[warn(${1:lint})]
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/warn! b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/warn!
deleted file mode 100644
index 2f4885d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/warn!
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: #![warn(lint)]
-# key: warn!
-# --
-#![warn(${1:lint})]
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/while-let b/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/while-let
deleted file mode 100644
index 4e36327..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/rust-mode/while-let
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: while let PATTERN = EXPR { ... }
-# key: whilel
-# uuid: whilel
-# --
-while let ${1:pattern} = ${2:expression} {
-      $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/@if b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/@if
deleted file mode 100644
index be5e360..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/@if
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: @if
-# key: if
-# uuid: if
-# --
-@if ${1:condition} {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/@mixin b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/@mixin
deleted file mode 100644
index 58dc216..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/@mixin
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: @mixin
-# key: mix
-# uuid: mix
-# --
-@mixin ${1:mixin-name}($2) {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/@while b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/@while
deleted file mode 100644
index b26a377..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/@while
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: @while
-# key: while
-# uuid: while
-# --
-@while ${1:condition} {
-    $0
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/abs b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/abs
deleted file mode 100644
index 7b34ae3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/abs
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: abs($number)
-# group: Number functions
-# --
-abs(${1:$number})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/adjust-color b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/adjust-color
deleted file mode 100644
index 5b55f18..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/adjust-color
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: adjust-color($color, [$r], [$g], [$b], [$hue], [$sat], [$light], [$alpha])
-# group: Other color functions
-# --
-adjust-color(${1:$color}, ${2:[$r]}, ${3:[$g]}, ${4:[$b]}, ${5:[$hue]}, ${6:[$sat]}, ${7:[$light]}, ${8:[$alpha]})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/adjust-hue b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/adjust-hue
deleted file mode 100644
index ea12152..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/adjust-hue
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: adjust-hue($color, $degree)
-# group: HSL functions
-# --
-adjust-hue(${1:$color}, ${2:$degree})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/alpha b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/alpha
deleted file mode 100644
index 48d6349..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/alpha
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: alpha($color)
-# group: Opacity functions
-# --
-alpha(${1:$color})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/append b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/append
deleted file mode 100644
index 64d8256..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/append
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: append($list, $value, [$separator])
-# group: List functions
-# --
-append(${1:$list}, ${2:$value}, ${3:[$sep]})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/blue b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/blue
deleted file mode 100644
index 424b39b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/blue
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: blue($color)
-# group: RGB functions
-# --
-blue(${1:color})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/call b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/call
deleted file mode 100644
index 1acaea6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/call
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: call($name, ...)
-# group: Introspection functions
-# --
-call(${1:$name}, ${2:$args...})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/ceil b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/ceil
deleted file mode 100644
index c3bbab3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/ceil
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: ceil($number)
-# group: Number functions
-# --
-ceil(${1:$number})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/change-color b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/change-color
deleted file mode 100644
index 4ee4e09..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/change-color
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: change-color($color, [$r], [$g], [$b], [$hue], [$sat], [$light], [$alpha])
-# group: Other color functions
-# --
-change-color(${1:$color}, ${2:[$r]}, ${3:[$g]}, ${4:[$b]}, ${5:[$hue]}, ${6:[$sat]}, ${7:[$light]}, ${8:[$alpha]})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/comparable b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/comparable
deleted file mode 100644
index 8be68f3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/comparable
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: comparable($number1, $number2)
-# group: Introspection functions
-# --
-comparable(${1:$number1}, ${2:$number2})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/complement b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/complement
deleted file mode 100644
index 11f1892..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/complement
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: complement($color)
-# group: HSL functions
-# --
-complement(${1:$color})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/darken b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/darken
deleted file mode 100644
index b298470..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/darken
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: darken($color, $amount)
-# group: HSL functions
-# --
-darken(${1:$color}, ${2:$amount})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/desaturate b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/desaturate
deleted file mode 100644
index ca7bda5..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/desaturate
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: desaturate($color, $amount)
-# group: HSL functions
-# --
-desaturate(${1:$color}, ${2:$amount})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/each b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/each
deleted file mode 100644
index b54bd9f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/each
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: @each
-# --
-@each \$${1:var} in ${2:list, of, things} {
-    $0
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/else b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/else
deleted file mode 100644
index f823adb..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/else
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: @else
-# --
-@else {
-    $0
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/elseif b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/elseif
deleted file mode 100644
index 6c9acac..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/elseif
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: @elseif
-# --
-@else if ${1:condition} {
-    $0
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/fade-in b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/fade-in
deleted file mode 100644
index 0c7dc41..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/fade-in
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: fade-in($color, $amount)
-# group: Opacity functions
-# --
-fade-in(${1:$color}, ${2:$amount})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/fade-out b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/fade-out
deleted file mode 100644
index f9a9e8f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/fade-out
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: fade-out($color, $amount)
-# group: Opacity functions
-# --
-fade-out(${1:$color}, ${2:$amount})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/feature-exists b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/feature-exists
deleted file mode 100644
index bc7f752..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/feature-exists
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: feature-exists($feature)
-# group: Introspection functions
-# --
-feature-exists(${1:$feature})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/floor b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/floor
deleted file mode 100644
index 22acf32..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/floor
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: floor($number)
-# group: Number functions
-# --
-floor(${1:$number})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/for b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/for
deleted file mode 100644
index 63fd434..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/for
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: @for loop
-# --
-@for \$i from ${1:1} through ${2:10} {
-    $0
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/function-exists b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/function-exists
deleted file mode 100644
index 7916323..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/function-exists
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: function-exists($name)
-# group: Introspection functions
-# --
-function-exists(${1:$name})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/global-variable-exists b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/global-variable-exists
deleted file mode 100644
index b9f6ccc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/global-variable-exists
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: global-variable-exists($name)
-# group: Introspection functions
-# --
-global-variable-exists(${1:$name})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/grayscale b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/grayscale
deleted file mode 100644
index 5ca9e11..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/grayscale
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: grayscale($color)
-# group: HSL functions
-# --
-grayscale(${1:$color})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/green b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/green
deleted file mode 100644
index 0ed926e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/green
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: green($color)
-# group: RGB functions
-# --
-green(${1:color})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/hsl b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/hsl
deleted file mode 100644
index 6f844fa..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/hsl
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: hsl($hue, $saturation, $lightness)
-# group: HSL functions
-# --
-hsl(${1:$hue}, ${2:$saturation}, ${3:$lightness})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/hsla b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/hsla
deleted file mode 100644
index b7b6cfa..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/hsla
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: hsl($hue, $saturation, $lightness, $alpha)
-# group: HSL functions
-# --
-hsla(${1:$hue}, ${2:$saturation}, ${3:$lightness}, ${4:alpha})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/hue b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/hue
deleted file mode 100644
index 32502e3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/hue
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: hue($color)
-# group: HSL functions
-# --
-hue(${1:$color})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/ie-hex-str b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/ie-hex-str
deleted file mode 100644
index 51ba7a8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/ie-hex-str
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: ie-hex-str($color)
-# group: Other color functions
-# --
-ie-hex-str(${1:$color})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/index b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/index
deleted file mode 100644
index 3eb78d8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/index
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: index($list, $value)
-# group: List functions
-# --
-index(${1:$list}, ${2:$value})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/inspect b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/inspect
deleted file mode 100644
index aa4bc42..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/inspect
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: inspect($value)
-# group: Introspection functions
-# --
-inspect(${1:$value})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/invert b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/invert
deleted file mode 100644
index e71b78e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/invert
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: invert($color)
-# group: HSL functions
-# --
-invert(${1:$color})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/join b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/join
deleted file mode 100644
index 698e6fd..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/join
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: join($list1, $list2, [$separator])
-# group: List functions
-# --
-join(${1:$list1}, ${2:$list2}, ${3:[$sep]})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/keywords b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/keywords
deleted file mode 100644
index cfdd889..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/keywords
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: keywords($args)
-# group: Map functions
-# --
-keywords(${1:$args})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/length b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/length
deleted file mode 100644
index 2910f0e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/length
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: length($list)
-# group: List functions
-# --
-length(${1:$list})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/lighten b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/lighten
deleted file mode 100644
index 69385ba..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/lighten
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: lighten($color, $amount)
-# group: HSL functions
-# --
-lighten(${1:$color}, ${2:$amount})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/lightness b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/lightness
deleted file mode 100644
index 4ebd4a1..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/lightness
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: lightness($color)
-# group: HSL functions
-# --
-lightness(${1:$color})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/list-separator b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/list-separator
deleted file mode 100644
index b8ef5c9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/list-separator
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: list-separator($list)
-# group: List functions
-# --
-list-separator(${1:$list})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-get b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-get
deleted file mode 100644
index 77d0b96..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-get
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: map-get($map, $key)
-# group: Map functions
-# --
-map-get(${1:$map}, ${2:$key})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-has-key b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-has-key
deleted file mode 100644
index 4ff973e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-has-key
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: map-has-key($map, $key)
-# group: Map functions
-# --
-map-has-key(${1:$map}, ${2:$key})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-keys b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-keys
deleted file mode 100644
index 2b66fd9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-keys
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: map-keys($map)
-# group: Map functions
-# --
-map-keys(${1:$map})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-merge b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-merge
deleted file mode 100644
index 8842417..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-merge
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: map-merge($map1, $map2)
-# group: Map functions
-# --
-map-merge(${1:$map1}, ${2:$map2})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-remove b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-remove
deleted file mode 100644
index 95e9f30..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-remove
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: map-remove($map, $key, ...)
-# group: Map functions
-# --
-map-remove(${1:$map}, ${2:$key})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-values b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-values
deleted file mode 100644
index 7875e70..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/map-values
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: map-values($map)
-# group: Map functions
-# --
-map-values(${1:$map})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/max b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/max
deleted file mode 100644
index 67d013f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/max
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: max($n1, $n2, ...)
-# group: Number functions
-# --
-max(${1:$n1}, ${2:$n2})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/min b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/min
deleted file mode 100644
index beca119..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/min
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: min($n1, $n2, ...)
-# group: Number functions
-# --
-min(${1:$n1}, ${2:$n2})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/mix b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/mix
deleted file mode 100644
index 36dab32..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/mix
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: mix($color1, $color2, [$weight])
-# group: RGB functions
-# --
-mix(${1:$color1}, ${2:$color2}${3:, ${4:$weight}})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/mixin-exists b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/mixin-exists
deleted file mode 100644
index 12e70a6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/mixin-exists
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: mixin-exists($name)
-# group: Introspection functions
-# --
-mixin-exists(${1:$name})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/nth b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/nth
deleted file mode 100644
index 3dcee5d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/nth
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: nth($list, $n)
-# group: List functions
-# --
-nth(${1:$list}, ${2:$n})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/opacify b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/opacify
deleted file mode 100644
index cc4c397..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/opacify
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: opacify($color, $amount)
-# group: Opacity functions
-# --
-opacify(${1:$color}, ${2:$amount})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/opacity b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/opacity
deleted file mode 100644
index 52319f1..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/opacity
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: opacity($color)
-# group: Opacity functions
-# --
-opacity(${1:$color})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/percentage b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/percentage
deleted file mode 100644
index fc4fd56..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/percentage
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: percentage($number)
-# group: Number functions
-# --
-percentage(${1:$number})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/quote b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/quote
deleted file mode 100644
index 1b81e73..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/quote
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: quote($string)
-# group: String functions
-# --
-quote(${1:$string})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/random b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/random
deleted file mode 100644
index 70de049..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/random
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: random([$limit])
-# group: Number functions
-# --
-random(${1:[$limit]})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/red b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/red
deleted file mode 100644
index fefa406..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/red
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: red($color)
-# group: RGB functions
-# --
-red(${1:color})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/rgb b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/rgb
deleted file mode 100644
index c5fc5e8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/rgb
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: rgb($red, $green, $blue)
-# group: RGB functions
-# --
-rgb(${1:$red}, ${2:$green}, ${3:$blue})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/rgba b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/rgba
deleted file mode 100644
index 79675f9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/rgba
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: rgb($red, $green, $blue, $alpha)
-# group: RGB functions
-# --
-rgba(${1:$red}, ${2:$green}, ${3:$blue}, ${4:alpha})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/rgbao b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/rgbao
deleted file mode 100644
index e50f565..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/rgbao
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: rgba($color, $alpha)
-# key: rgba
-# uuid: rgba
-# group: Opacity functions
-# --
-rgba(${1:$color}, ${2:$alpha})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/round b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/round
deleted file mode 100644
index 34299c4..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/round
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: round($number)
-# group: Number functions
-# --
-round(${1:$number})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/saturate b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/saturate
deleted file mode 100644
index 73adcac..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/saturate
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: saturate($color, $amount)
-# group: HSL functions
-# --
-saturate(${1:$color}, ${2:$amount})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/saturation b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/saturation
deleted file mode 100644
index 9d8715c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/saturation
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: saturation($color)
-# group: HSL functions
-# --
-saturation(${1:$color})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/scale-color b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/scale-color
deleted file mode 100644
index d5768d9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/scale-color
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: scale-color($color, [$r], [$g], [$b], [$sat], [$light], [$alpha])
-# group: Other color functions
-# --
-scale-color(${1:$color}, ${2:[$r]}, ${3:[$g]}, ${4:[$b]}, ${5:[$sat]}, ${6:[$light]}, ${7:[$alpha]})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/set-nth b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/set-nth
deleted file mode 100644
index 25b4810..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/set-nth
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: set-nth($list, $n, $value)
-# group: List functions
-# --
-set-nth(${1:$list}, ${2:$n}, ${3:$value})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/str-index b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/str-index
deleted file mode 100644
index 567e1d9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/str-index
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: str-index($string, $substring)
-# group: String functions
-# --
-str-index(${1:$string}, ${2:$substring})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/str-insert b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/str-insert
deleted file mode 100644
index 29537a4..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/str-insert
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: str-insert($string, $insert, $index)
-# group: String functions
-# --
-str-insert(${1:$string}, ${2:$insert}, ${3:$index})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/str-length b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/str-length
deleted file mode 100644
index 16268f8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/str-length
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: str-length($string)
-# group: String functions
-# --
-str-length(${1:$string})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/str-slice b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/str-slice
deleted file mode 100644
index b9295b7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/str-slice
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: str-slice($string, $start-at, [$end-at])
-# group: String functions
-# --
-str-slice(${1:$string}, ${2:$start-at}${3:, ${4:$end-at}})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/to-lower-case b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/to-lower-case
deleted file mode 100644
index 6846d33..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/to-lower-case
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: to-lower-case($string)
-# group: String functions
-# --
-to-lower-case(${1:$string})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/to-upper-case b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/to-upper-case
deleted file mode 100644
index 6281ad1..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/to-upper-case
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: to-upper-case($string)
-# group: String functions
-# --
-to-upper-case(${1:$string})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/transparentize b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/transparentize
deleted file mode 100644
index 260087c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/transparentize
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: transparentize($color, $amount)
-# group: Opacity functions
-# --
-transparentize(${1:$color}, ${2:$amount})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/type-of b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/type-of
deleted file mode 100644
index c810628..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/type-of
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: type-of($value)
-# group: Introspection functions
-# --
-type-of(${1:$value})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/unique-id b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/unique-id
deleted file mode 100644
index 47e5b80..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/unique-id
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: unique-id()
-# group: Misc functions
-# --
-unique-id()
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/unit b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/unit
deleted file mode 100644
index 5c6aa08..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/unit
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: unit($number)
-# group: Introspection functions
-# --
-unit(${1:$number})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/unitless b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/unitless
deleted file mode 100644
index 318643d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/unitless
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: unitless($number)
-# group: Introspection functions
-# --
-unitless(${1:$number})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/unquote b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/unquote
deleted file mode 100644
index aeb5ba8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/unquote
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: unquote($string)
-# group: String functions
-# --
-unquote(${1:$string})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/variable-exists b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/variable-exists
deleted file mode 100644
index 1309b67..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/variable-exists
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: variable-exists($name)
-# group: Introspection functions
-# --
-variable-exists(${1:$name})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/zip b/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/zip
deleted file mode 100644
index e24c5e9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/scss-mode/zip
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: zip($list1, $list2, ...)
-# group: List functions
-# --
-zip(${1:$list1}, ${2:$list2})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/args b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/args
deleted file mode 100644
index 196973f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/args
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: args
-# key: args
-# uuid: args
-# --
-[ $# -lt ${1:2} ]
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/bang b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/bang
index 9c825e4..83c5382 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/bang
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/bang
@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: bang
-# key: #!
+# key: bang
 # uuid: #!
 # --
-#!${1:/usr/bin/env `(symbol-name sh-shell)`}
+#!/usr/bin/env `(symbol-name sh-shell)`
 $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/case b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/case
deleted file mode 100644
index 276cdae..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/case
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: case
-# key: case
-# uuid: case
-# --
-case ${1:var} in
-    ${2:match}) $0 ;;
-esac
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/elif b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/elif
deleted file mode 100644
index 127e26e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/elif
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: elif
-# key: elif
-# uuid: elif
-# --
-elif ${1:condition}; then
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/else b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/else
deleted file mode 100644
index 974a23d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/else
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: else
-# key: else
-# uuid: else
-# --
-else
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/f b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/f
deleted file mode 100644
index 749a932..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/f
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: short function
-# key: f
-# uuid: f
-# --
-${1:name}() {
-    $0
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/for b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/for
index f990ebf..5f6d615 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/for
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/for
@@ -3,6 +3,7 @@
 # key: for
 # uuid: for
 # --
-for ${1:var} in ${2:stuff}; do
+for ${1:var} in ${2:stuff}
+do
     $0
 done
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/function b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/function
deleted file mode 100644
index 2adefa2..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/function
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: function
-# --
-function ${1:name} {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/gt b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/gt
deleted file mode 100644
index 0a59165..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/gt
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: Greater than
-# key: >
-# uuid: >
-# --
-"$1" -gt "$2"
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/if b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/if
index b832a61..3a20e4f 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/if
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/if
@@ -1,6 +1,7 @@
 # -*- mode: snippet -*-
 # name: if
 # --
-if $1; then
+if $1
+then
    $0
 fi
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/if-one-line b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/if-one-line
deleted file mode 100644
index 9c038b0..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/if-one-line
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: if ...; then ...; fi
-# key: if;
-# uuid: if;
-# --
-${1:condition} && ${0:echo 1}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/ife b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/ife
index ba0c866..832ead8 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/ife
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/ife
@@ -3,7 +3,8 @@
 # key: ife
 # uuid: ife
 # --
-if ${1:condition}; then
+if ${1:condition}
+then
     ${2:# code}
 else
      $0
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/local b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/local
deleted file mode 100644
index cd789e7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/local
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: local var=value
-# --
-local ${1:var}=${0:value}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/lt b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/lt
deleted file mode 100644
index 22c70eb..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/lt
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: Less than
-# key: <
-# uuid: <
-# --
-"$1" -lt "$2"
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/var b/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/var
deleted file mode 100644
index 4f803e6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sh-mode/var
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: VAR=value
-# key: =
-# uuid: =
-# --
-${1:VAR}=${0:VALUE}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/cont b/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/cont
deleted file mode 100644
index 4453293..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/cont
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: cont
-# key: cont
-# uuid: cont
-# --
-# contributor: `user-full-name`
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/elisp b/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/elisp
deleted file mode 100644
index 724cf72..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/elisp
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: elisp
-# key: `
-# uuid: `
-# --
-\`$0\`
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/field b/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/field
deleted file mode 100644
index e0df7df..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/field
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name : ${ ...  } field
-# contributor : joaotavora
-# key : $f
-# key: field
-# uuid: field
-# --
-\${${1:${2:n}:}$3${4:\$(${5:lisp-fn})}\}$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/group b/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/group
deleted file mode 100644
index ab73672..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/group
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: group
-# key: group
-# uuid: group
-# --
-# group : ${1:group}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/mirror b/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/mirror
deleted file mode 100644
index c09dce9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/mirror
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name : ${n:$(...)} mirror
-# key : $m
-# contributor : joaotavora
-# key: mirror
-# uuid: mirror
-# --
-\${${2:n}:${4:\$(${5:reflection-fn})}\}$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/vars b/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/vars
deleted file mode 100644
index fae94fb..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/snippet-mode/vars
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- mode: snippet -*-
-# name: Snippet header
-# key:#
-# uuid: #
-# --
-# -*- mode: snippet -*-
-${1:# contributor: `(user-full-name)`
-}# name: $2
-# key: ${3:trigger-key}${4:
-# condition: t}
-# --
-$0
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/column b/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/column
deleted file mode 100644
index 849b43d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/column
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: , ColumnName ColumnType NOT NULL...
-# --
-    ,   ${1:Name}       ${2:Type}           ${3:NOT NULL}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/constraint b/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/constraint
deleted file mode 100644
index 312190c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/constraint
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: CONSTRAINT [..] PRIMARY KEY ...
-# --
-CONSTRAINT [${1:PK_Name}] PRIMARY KEY ${2:CLUSTERED} ([${3:ColumnName}]) 
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/constraint.1 b/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/constraint.1
deleted file mode 100644
index f54ea0a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/constraint.1
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: CONSTRAINT [..] FOREIGN KEY ...
-# --
-CONSTRAINT [${1:FK_Name}] FOREIGN KEY ${2:CLUSTERED} ([${3:ColumnName}]) 
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/create b/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/create
deleted file mode 100644
index 2d0ed21..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/create
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: create table ...
-# --
-CREATE TABLE [${1:dbo}].[${2:TableName}] 
-(
-        ${3:Id}     ${4:INT IDENTITY(1,1)}      ${5:NOT NULL}
-$0
-    CONSTRAINT [${6:PK_}] PRIMARY KEY ${7:CLUSTERED} ([$3]) 
-)
-GO
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/create.1 b/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/create.1
deleted file mode 100644
index fb8b1ae..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/create.1
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: create procedure ...
-# --
-CREATE PROCEDURE [${1:dbo}].[${2:Name}] 
-(
-        $3      $4      = ${5:NULL}     ${6:OUTPUT}
-)
-AS
-BEGIN
-$0
-END
-GO
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/references b/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/references
deleted file mode 100644
index ec3e58f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/sql-mode/references
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Alejandro Espinoza Esparza <aespinoza@structum.com.mx>
-# name: REFERENCES ...
-# --
-REFERENCES ${1:TableName}([${2:ColumnName}])
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/web-mode/video b/Emacs/.config/emacs/.config/yasnippet/snippets/web-mode/video
deleted file mode 100644
index 5f7193b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/web-mode/video
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: HTML5 video player
-# --
-<video width="${1:560}" height="${2:340}" controls>
-  <source src="${3:path/to/myvideo}.mp4" type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"'>
-  <source src="$3.ogv" type='video/ogg; codecs="theora, vorbis"'>
-  ${0:Your browser does not support my HTML5 video player}
-</video>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/web-mode/vue b/Emacs/.config/emacs/.config/yasnippet/snippets/web-mode/vue
deleted file mode 100644
index aa3d9a7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/web-mode/vue
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- mode: snippet -*-
-# name: Vue Single-File Component
-# uuid: vue
-# condition: (equal web-mode-engine "vue")
-# --
-<script>
-  export default {
-    name: '${0:`(file-name-base buffer-file-name)`}'$3
-  }
-</script>
-
-<template>
-  ${1:}
-</template>
-
-<style scoped>
-  $2
-</style>
diff --git a/Emacs/.config/emacs/.local/gamegrid-user-score/bubbles-default-2-10-10-scores b/Emacs/.config/emacs/.local/gamegrid-user-score/bubbles-default-2-10-10-scores
new file mode 100644
index 0000000..a8cbfbd
--- /dev/null
+++ b/Emacs/.config/emacs/.local/gamegrid-user-score/bubbles-default-2-10-10-scores
@@ -0,0 +1,5 @@
+03380	Fri Oct 14 14:33:15 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+03197	Fri Oct 14 14:23:23 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+02854	Fri Oct 14 14:32:54 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+02729	Fri Oct 14 14:33:36 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+02347	Fri Oct 14 14:23:06 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
diff --git a/Emacs/.config/emacs/.local/gamegrid-user-score/snake-scores b/Emacs/.config/emacs/.local/gamegrid-user-score/snake-scores
new file mode 100644
index 0000000..27ef654
--- /dev/null
+++ b/Emacs/.config/emacs/.local/gamegrid-user-score/snake-scores
@@ -0,0 +1,5 @@
+00017	Sat Apr 20 02:48:23 2024	Aryadev Chavali <aryadev@aryadevchavali.com>
+00011	Mon May  6 02:44:35 2024	Aryadev Chavali <aryadev@aryadevchavali.com>
+00010	Mon May  6 02:43:59 2024	Aryadev Chavali <aryadev@aryadevchavali.com>
+00002	Mon May  6 02:42:08 2024	Aryadev Chavali <aryadev@aryadevchavali.com>
+00001	Sat Apr 27 15:55:53 2024	Aryadev Chavali <aryadev@aryadevchavali.com>
diff --git a/Emacs/.config/emacs/.local/gamegrid-user-score/tetris-scores b/Emacs/.config/emacs/.local/gamegrid-user-score/tetris-scores
new file mode 100644
index 0000000..06cdbcb
--- /dev/null
+++ b/Emacs/.config/emacs/.local/gamegrid-user-score/tetris-scores
@@ -0,0 +1,31 @@
+00281	Thu Jul 13 03:07:51 2023	Aryadev Chavali <aryadev@aryadevchavali.com>
+00253	Fri Dec  2 14:00:06 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+00243	Wed Mar 15 09:25:03 2023	Aryadev Chavali <aryadev@aryadevchavali.com>
+00210	Thu Dec 29 14:43:23 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+00204	Wed Dec 28 14:50:42 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+00187	Thu Jan 12 01:30:09 2023	Aryadev Chavali <aryadev@aryadevchavali.com>
+00172	Mon Jan  9 12:59:13 2023	Aryadev Chavali <aryadev@aryadevchavali.com>
+00166	Mon May  6 02:40:23 2024	Aryadev Chavali <aryadev@aryadevchavali.com>
+00114	Fri Jul 21 11:58:31 2023	Aryadev Chavali <aryadev@aryadevchavali.com>
+00096	Sat Dec  3 16:21:40 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+00092	Sun Nov 13 23:34:52 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+00089	Thu Dec  1 23:27:02 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+00075	Tue Oct  4 16:03:38 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+00068	Wed Sep 28 19:42:19 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+00065	Fri Oct 14 14:21:16 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+00058	Thu Dec  1 23:27:55 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+00057	Thu Jan 12 01:15:49 2023	Aryadev Chavali <aryadev@aryadevchavali.com>
+00056	Tue Sep 20 18:13:37 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+00050	Fri May 26 16:33:56 2023	Aryadev Chavali <aryadev@aryadevchavali.com>
+00048	Sun May  5 19:34:16 2024	Aryadev Chavali <aryadev@aryadevchavali.com>
+00046	Wed Oct 12 11:27:19 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+00042	Tue Aug  1 19:58:49 2023	Aryadev Chavali <aryadev@aryadevchavali.com>
+00038	Tue Oct 11 16:47:44 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+00038	Fri Oct 14 13:05:44 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
+00037	Thu Aug 17 18:11:59 2023	Aryadev Chavali <aryadev@aryadevchavali.com>
+00027	Thu Jan 12 01:14:32 2023	Aryadev Chavali <aryadev@aryadevchavali.com>
+00024	Thu Jan 12 01:14:54 2023	Aryadev Chavali <aryadev@aryadevchavali.com>
+00012	Tue Jan 17 13:58:01 2023	Aryadev Chavali <aryadev@aryadevchavali.com>
+00006	Thu Jun 22 23:16:42 2023	Aryadev Chavali <aryadev@aryadevchavali.com>
+00006	Mon Jan  9 11:04:43 2023	Aryadev Chavali <aryadev@aryadevchavali.com>
+00000	Fri Dec  2 13:58:02 2022	Aryadev Chavali <aryadev@aryadevchavali.com>
diff --git a/Emacs/.config/emacs/app.org b/Emacs/.config/emacs/app.org
deleted file mode 100644
index c96d2e8..0000000
--- a/Emacs/.config/emacs/app.org
+++ /dev/null
@@ -1,832 +0,0 @@
-#+title: Applications for Emacs
-#+author: Aryadev Chavali
-#+description: Applications for my Emacs OS™
-#+date: 2023-09-29
-#+property: header-args:emacs-lisp :tangle app.el :comments link :results none
-#+options: toc:nil
-#+startup: noindent
-
-Applications are greater than packages; they provide a set of
-functionality to create an interface in Emacs.  Emacs comes with
-applications and others may be installed.
-
-* WIP Dashboard
-:PROPERTIES:
-:header-args:emacs-lisp: :tangle no
-:END:
-Dashboard creates a custom dashboard for Emacs that replaces the
-initial startup screen in default Emacs.  It has a lot of customising
-options.
-
-Unfortunately not that useful, many things are easier to invoke
-directly such as recent files or project changing.
-#+begin_src emacs-lisp
-(use-package dashboard
-  :straight t
-  :demand t
-  :general
-  (app-leader
-    "b" #'dashboard-refresh-buffer)
-  (:states '(normal motion emacs)
-   :keymaps 'dashboard-mode-map
-   "q" (proc (interactive) (kill-this-buffer)))
-  (nmmap
-    :keymaps 'dashboard-mode-map
-    "r" #'dashboard-jump-to-recent-files
-    "p" #'dashboard-jump-to-projects
-    "}" #'dashboard-next-section
-    "{" #'dashboard-previous-section)
-  :init
-  (setq initial-buffer-choice nil
-        dashboard-banner-logo-title "Oreomacs"
-        dashboard-center-content t
-        dashboard-set-init-info t
-        dashboard-startup-banner (no-littering-expand-etc-file-name "dashboard/logo.png")
-        dashboard-set-footer t
-        dashboard-set-navigator t
-        dashboard-items '((projects . 5)
-                          (recents . 5))
-        dashboard-footer-messages (list
-                                   "Collecting parentheses..."
-                                   "Linking 'coffee_machine.o'..."
-                                   "Uploading ip to hacker named 4chan..."
-                                   "Dividing by zero..."
-                                   "Solving 3-sat..."
-                                   "Obtaining your health record..."
-                                   (format "Recompiling Emacs for the %dth time..." (random 1000))
-                                   "Escaping the cycle of samsara..."))
-  :config
-  (dashboard-setup-startup-hook))
-#+end_src
-* EWW
-Emacs Web Wowser is the inbuilt text based web browser for Emacs.  It
-can render images and basic CSS styles but doesn't have a JavaScript
-engine, which makes sense as it's primarily a text interface.
-#+begin_src emacs-lisp
-(use-package eww
-  :defer t
-  :general
-  (app-leader
-    "w" #'eww)
-  (nmmap
-    :keymaps 'eww-mode-map
-    "w" #'evil-forward-word-begin
-    "Y" #'shr-probe-and-copy-url)
-  :straight nil
-  :config
-  (with-eval-after-load "evil-collection"
-    (evil-collection-eww-setup)))
-#+end_src
-* Calendar
-Calendar is a simple inbuilt application that helps with date
-functionalities.  I add functionality to copy dates from the calendar
-to the kill ring and bind it to "Y".
-#+begin_src emacs-lisp
-(use-package calendar
-  :straight nil
-  :defer t
-  :commands (+calendar/copy-date +calendar/toggle-calendar)
-  :display
-  ("\\*Calendar\\*"
-   (display-buffer-at-bottom)
-   (inhibit-duplicate-buffer . t)
-   (window-height . 0.17))
-  :general
-  (nmmap
-    :keymaps 'calendar-mode-map
-    "Y" #'+calendar/copy-date)
-  (app-leader
-    "d" #'+calendar/toggle-calendar)
-  :config
-  (defun +calendar/copy-date ()
-    "Copy date under cursor into kill ring."
-    (interactive)
-    (if (use-region-p)
-        (call-interactively #'kill-ring-save)
-      (let ((date (calendar-cursor-to-date)))
-        (when date
-          (setq date (encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date)))
-          (kill-new (format-time-string "%Y-%m-%d" date))))))
-  (+oreo/create-toggle-function
-   +calendar/toggle-calendar
-   "*Calendar*"
-   calendar
-   nil))
-#+end_src
-* Mail
-Mail is a funny thing; most people use it just for business or
-advertising and it's come out of use in terms of personal
-communication in the west for the most part (largely due to "social"
-media applications).  However, this isn't true for the open source and
-free software movement who heavily use mail for communication.
-
-Integrating mail into Emacs helps as I can send source code and
-integrate it into my workflow just a bit better.
-** Notmuch
-#+begin_src emacs-lisp
-(use-package notmuch
-  :defer t
-  :commands (notmuch +mail/flag-thread)
-  :general
-  (app-leader "m" #'notmuch)
-  (nmap
-    :keymaps 'notmuch-search-mode-map
-    "f" #'+mail/flag-thread)
-  :init
-  (defconst +mail/signature "---------------\nAryadev Chavali")
-  (defconst +mail/local-dir (no-littering-expand-var-file-name "mail/"))
-  (setq notmuch-show-logo nil
-        notmuch-search-oldest-first nil
-        notmuch-hello-sections '(notmuch-hello-insert-saved-searches
-                                 notmuch-hello-insert-alltags
-                                 notmuch-hello-insert-recent-searches)
-        notmuch-archive-tags '("-inbox" "-unread" "+archive")
-        mail-signature +mail/signature
-        mail-default-directory +mail/local-dir
-        mail-source-directory +mail/local-dir
-        message-signature +mail/signature
-        message-auto-save-directory +mail/local-dir
-        message-directory +mail/local-dir)
-
-  (defun +mail/sync-mail ()
-    "Sync mail via mbsync."
-    (interactive)
-    (start-process-shell-command "" nil "mbsync -a"))
-  (defun +mail/trash-junk ()
-    "Delete any mail in junk"
-    (interactive)
-    (start-process-shell-command "" nil "notmuch search --output=files --format=text0 tag:deleted tag:spam tag:trash tag:junk | xargs -r0 rm"))
-  :config
-  (defun +mail/flag-thread (&optional unflag beg end)
-    (interactive (cons current-prefix-arg (notmuch-interactive-region)))
-    (notmuch-search-tag
-     (notmuch-tag-change-list '("-inbox" "+flagged") unflag) beg end)
-    (when (eq beg end)
-      (notmuch-search-next-thread)))
-  (advice-add #'notmuch-poll-and-refresh-this-buffer :before
-              #'+mail/sync-mail)
-  (advice-add #'notmuch-poll-and-refresh-this-buffer :after
-              #'+mail/trash-junk)
-  (with-eval-after-load "evil-collection"
-    (evil-collection-notmuch-setup)))
-#+end_src
-** Smtpmail
-#+begin_src emacs-lisp
-(use-package smtpmail
-  :straight nil
-  :commands mail-send
-  :init
-  (setq-default
-   smtpmail-smtp-server "mail.aryadevchavali.com"
-   smtpmail-smtp-user "aryadev"
-   smtpmail-smtp-service 587
-   smtpmail-stream-type 'starttls
-   send-mail-function #'smtpmail-send-it
-   message-send-mail-function #'smtpmail-send-it))
-#+end_src
-* Dired
-Setup for dired.  Make dired-hide-details-mode the default mode when
-using dired-mode, as it removes the clutter.  Setup evil collection
-for dired (even though dired doesn't really conflict with evil, there
-are some corners I'd like to adjust).
-#+begin_src emacs-lisp
-(use-package dired
-  :straight nil
-  :commands (dired find-dired)
-  :hook
-  (dired-mode-hook              . auto-revert-mode)
-  (dired-mode-hook              . dired-hide-details-mode)
-  :init
-  (setq-default dired-listing-switches "-AFBlu --group-directories-first"
-                dired-omit-files "^\\."
-                dired-dwim-target t)
-  (with-eval-after-load "evil-collection"
-    (evil-collection-dired-setup))
-  :general
-  (nmmap
-    :keymaps 'dired-mode-map
-    "T" #'dired-create-empty-file
-    "H" #'dired-up-directory
-    "L" #'dired-find-file)
-  (dir-leader
-    "f" #'find-dired
-    "d" #'dired
-    "D" #'dired-other-frame
-    "i" #'image-dired
-    "p" `((proc (interactive)
-                (dired "~/Text/PDFs/"))
-          :which-key "Open PDFs"))
-  :config
-  (defun +dired/insert-all-subdirectories ()
-    "Insert all subdirectories currently viewable."
-    (interactive)
-    (dired-mark-directories nil)
-    (dolist #'dired-insert-subdir (dired-get-marked-files))
-    (dired-unmark-all-marks))
-
-  (nmmap
-    :keymaps 'dired-mode-map
-    "SPC"   nil
-    "SPC ," nil)
-
-  (nmmap
-    :keymaps 'image-dired-thumbnail-mode-map
-    "h" #'image-dired-backward-image
-    "l" #'image-dired-forward-image
-    "j" #'image-dired-next-line
-    "k" #'image-dired-previous-line
-    "H" #'image-dired-display-previous
-    "L" #'image-dired-display-next
-    "RET" #'image-dired-display-this
-    "m" #'image-dired-mark-thumb-original-file
-    "q" #'quit-window)
-
-  (local-leader
-    :keymaps 'dired-mode-map
-    "l" #'dired-maybe-insert-subdir
-    "m" #'dired-mark-files-regexp
-    "u" #'dired-undo))
-#+end_src
-
-** fd-dired
-Uses fd for finding file results in a directory: ~find-dired~ ->
-~fd-dired~.
-
-#+begin_src emacs-lisp
-(use-package fd-dired
-  :after dired
-  :straight t
-  :general
-  (dir-leader
-    "g" #'fd-dired))
-#+end_src
-* WIP Xwidget
-:PROPERTIES:
-:header-args:emacs-lisp: :tangle no
-:END:
-Xwidget is a package which allows for the insertion of arbitrary
-xwidgets into Emacs through buffers.  It must be compiled into Emacs
-so you might need to customise your install.  One of its premier uses
-is in navigating the web which it provides through the function
-~xwidget-webkit-browse-url~.  This renders a fully functional web
-browser within Emacs.
-
-Though I am not to keen on using Emacs to browse the web /via/ xwidget
-(EWW does a good job on its own), I am very interested in its
-capability to render pages with JavaScript, as it may come of use when
-doing web development.  I can see the results of work very quickly
-without switching windows all within Emacs.
-
-2023-10-20: Disabled as it didn't seem to work, and honestly wasn't
-that useful.
-** Xwidget Core
-#+begin_src emacs-lisp
-(use-package xwidget
-  :straight nil
-  :general
-  (app-leader
-    "u" #'xwidget-webkit-browse-url)
-  (nmmap
-    :keymaps 'xwidget-webkit-mode-map
-    "q"         #'quit-window
-    "h"         #'xwidget-webkit-scroll-backward
-    "j"         #'xwidget-webkit-scroll-up
-    "k"         #'xwidget-webkit-scroll-down
-    "l"         #'xwidget-webkit-scroll-forward
-    "+"         #'xwidget-webkit-zoom-in
-    "-"         #'xwidget-webkit-zoom-out
-    (kbd "C-f") #'xwidget-webkit-scroll-up
-    (kbd "C-b") #'xwidget-webkit-scroll-down
-    "H"         #'xwidget-webkit-back
-    "L"         #'xwidget-webkit-forward
-    "gu"        #'xwidget-webkit-browse-url
-    "gr"        #'xwidget-webkit-reload
-    "gg"        #'xwidget-webkit-scroll-top
-    "G"         #'xwidget-webkit-scroll-bottom))
-#+end_src
-** Xwidget Extensions
-Define a function ~+xwidget/render-file~ that reads a file name and
-presents it in an xwidget.  If the current file is an HTML file, ask
-if user wants to open current file.  Bind it to ~aU~ in the leader.
-
-Also define a function ~+xwidget/search-query~ that first asks the
-user what search engine they want to use ([[https://duckduckgo.com][Duck Duck Go]] and [[https://devdocs.io][DevDocs]]
-currently) then asks for a query, which it parses then presents in an
-xwidget window.  Bind to ~as~ in the leader.
-#+begin_src emacs-lisp
-(use-package xwidget
-  :straight nil
-  :commands (+xwidget/render-file +xwidget/search)
-  :general
-  (app-leader
-    "U" #'+xwidget/render-file
-    "s" #'+xwidget/search)
-  :config
-  (setenv "WEBKIT_FORCE_SANDBOX" "0")
-  (defun +xwidget/render-file (&optional FORCE)
-    "Find file (or use current file) and render in xwidget."
-    (interactive)
-    (cond
-     ((and (not FORCE) (or (string= (replace-regexp-in-string ".*.html"
-                                                              "html" (buffer-name)) "html")
-                           (eq major-mode 'web-mode)
-                           (eq major-mode 'html-mode))) ; If in html file
-      (if (y-or-n-p "Open current file?: ") ; Maybe they want to open a separate file
-          (xwidget-webkit-browse-url (format "file://%s" (buffer-file-name)))
-        (+xwidget/render-file t))) ; recurse and open file via prompt
-     (t
-      (xwidget-webkit-browse-url
-       (format "file://%s" (read-file-name "Enter file to open: "))))))
-
-  (defun +xwidget/search ()
-    "Run a search query on some search engine and display in
-xwidget."
-    (interactive)
-    (let* ((engine (completing-read "Engine: " '("duckduckgo.com" "devdocs.io") nil t))
-           (query-raw (read-string "Enter query: "))
-           (query
-            (cond
-             ((string= engine "duckduckgo.com") query-raw)
-             ((string= engine "devdocs.io") (concat "_ " query-raw)))))
-      (xwidget-webkit-browse-url (concat "https://" engine "/?q=" query)))))
-#+end_src
-* Eshell
-** Why Eshell?
-Eshell is an integrated shell environment for Emacs, written in Emacs
-Lisp.  I argue that it is the best shell/command interpreter to use in
-Emacs.
-
-Eshell is unlike the alternatives in Emacs as it's a /shell/ first,
-not a terminal emulator. It has the ability to spoof some aspects of a
-terminal emulator (through the shell parser), but it is NOT a terminal
-emulator.
-
-The killer benefits of eshell (which would appeal to Emacs users) are
-a direct result of eshell being written in Emacs lisp:
-- incredible integration with Emacs utilities (such as ~dired~,
-  ~find-file~, any read functions, etc)
-- very extensible, easy to write new commands which leverage Emacs
-  commands as well as external utilities
-- agnostic of platform: "eshell/cd" will call the underlying change
-  directory function for you, so commands will (usually) mean the same
-  thing regardless of platform
-  - this means as long as Emacs can run on an operating system, one
-    may run eshell
-
-However, my favourite feature of eshell is the set of evaluators that
-run on command input.  Some of the benefits listed above come as a
-result of this powerful feature. These evaluators are described below.
-
-Lisp evaluator: works on braced expressions, evaluating them as Lisp
-expressions (e.g. ~(message "Hello, World!\n")~).  Any returned
-objects are printed.  This makes eshell a LISP REPL!
-
-External evaluator: works within curly braces, evaluating them via
-some external shell process (like sh) (e.g. ~{echo "Hello,
-world!\n"}~).  This makes eshell a (kinda dumb) terminal emulator!
-
-The alias evaluator is the top level evaluator.  It is the main
-evaluator for each expression given to eshell.  When given an
-expression it tries to evaluate it by testing against these conditions:
-- it's an alias defined by the user or in the ~eshell/~ namespace of
-  functions (simplest evaluator)
-- it's some form of lisp expression (lisp evaluator)
-- it's an external command (bash evaluator)
-Essentially, you get the best of both Emacs and external shell
-programs *ALL WITHIN* Emacs for free.
-** Eshell functionality
-Bind some evil-like movements for easy shell usage, and a toggle
-function to pull up the eshell quickly.
-#+begin_src emacs-lisp
-(use-package eshell
-  :commands +shell/toggle-eshell
-  :general
-  (shell-leader
-    "t" #'+shell/toggle-eshell)
-  :init
-  (add-hook
-   'eshell-mode-hook
-   (proc
-    (interactive)
-    (general-def
-      :states '(normal insert)
-      :keymaps 'eshell-mode-map
-      "M-j" #'eshell-next-matching-input-from-input
-      "M-k" #'eshell-previous-matching-input-from-input)
-    (local-leader
-      :keymaps 'eshell-mode-map
-      "c" (proc (interactive) (eshell/clear)
-                (recenter))
-      "k" #'eshell-kill-process)))
-  :config
-  (+oreo/create-toggle-function
-   +shell/toggle-eshell
-   "*eshell*"
-   eshell
-   t))
-#+end_src
-** Eshell pretty symbols and display
-Pretty symbols and a display record.
-#+begin_src emacs-lisp
-(use-package eshell
-  :defer t
-  :pretty
-  (eshell-mode-hook
-   ("lambda"  . "λ")
-   ("numberp" . "ℤ")
-   ("t"       . "⊨")
-   ("nil"     . "Ø"))
-  :display
-  ("\\*e?shell\\*" ; for general shells as well
-   (display-buffer-at-bottom)
-   (window-height . 0.40)))
-#+end_src
-** Eshell variables and aliases
-Set some sane defaults, a banner and a prompt.  The prompt checks for
-a git repo in the current directory and provides some extra
-information in that case (in particular, branch name and if there any
-changes that haven't been committed).
-
-Also add ~eshell/goto~, which is actually a command accessible from
-within eshell (this is because ~eshell/*~ creates an accessible
-function within eshell with name ~*~).  ~eshell/goto~ makes it easier
-to change directories by using Emacs' find-file interface (which is
-much faster than ~cd ..; ls -l~).
-#+begin_src emacs-lisp
-(use-package eshell
-  :config
-  (defun +eshell/get-git-properties ()
-    (let ((git-branch (shell-command-to-string "git branch")))
-      (if (or (string= git-branch "")
-              (not (string= "*" (substring git-branch 0 1))))
-          ""
-        (format
-         "(%s<%s>)"
-         (nth 2 (split-string git-branch "\n\\|\\*\\| "))
-         (if (string= "" (shell-command-to-string "git status | grep 'up to date'"))
-             (propertize "×" 'font-lock-face '(:foreground "red"))
-           (propertize "✓" 'font-lock-face '(:foreground "green")))))))
-  (defun +eshell/prompt-function ()
-    (let ((git (+eshell/get-git-properties)))
-      (mapconcat
-       (lambda (item)
-         (if (listp item)
-             (propertize (car item)
-                         'read-only t
-                         'font-lock-face (cdr item)
-                         'front-sticky   '(font-lock-face read-only)
-                         'rear-nonsticky '(font-lock-face read-only))
-           item))
-       (list
-        '("[")
-        `(,(abbreviate-file-name (eshell/pwd)) :foreground "LimeGreen")
-        '("]")
-        (if (string= git "")
-            ""
-          (concat "-" git ""))
-        "\n"
-        `(,(format-time-string "[%H:%M:%S]") :foreground "purple")
-        "\n"
-        '("𝜆> " :foreground "DeepSkyBlue")))))
-
-  (setq eshell-cmpl-ignore-case t
-        eshell-cd-on-directory t
-        eshell-banner-message (concat (shell-command-to-string "fortune | cowsay") "\n")
-        eshell-highlight-prompt nil
-        eshell-prompt-function #'+eshell/prompt-function
-        eshell-prompt-regexp "^𝜆> ")
-
-  (defun eshell/goto (&rest args)
-    "Use `read-directory-name' to change directories."
-    (eshell/cd (list (read-directory-name "Enter directory to go to:")))))
-#+end_src
-** Eshell change directory quickly
-~eshell/goto~ is a better ~cd~ for eshell.  However it is really just
-a plaster over a bigger issue for my workflow; many times I want
-eshell to be present in the current directory of the buffer I am
-using.
-
-#+begin_src emacs-lisp
-(use-package eshell
-  :straight nil
-  :general
-  (shell-leader
-    "T" #'+eshell/current-buffer)
-  :config
-  (defun +eshell/current-buffer ()
-    (interactive)
-    (let  ((dir (if buffer-file-name
-                    (file-name-directory buffer-file-name)
-                  (if default-directory
-                      default-directory
-                    nil)))
-           (buf (eshell)))
-      (if dir
-          (with-current-buffer buf
-            (eshell/cd dir)
-            (eshell-send-input))
-        (message "Could not switch eshell: buffer is not real file")))))
-#+end_src
-* Elfeed
-Elfeed is the perfect RSS feed reader, integrated into Emacs
-perfectly.  I've got a set of feeds that I use for a large variety of
-stuff, mostly media and entertainment.  I've also bound "<leader> ar"
-to elfeed for loading the system.
-#+begin_src emacs-lisp
-(use-package elfeed
-  :general
-  (app-leader "r" #'elfeed)
-  (nmmap
-    :keymaps 'elfeed-search-mode-map
-    "gr"       #'elfeed-update
-    "s"        #'elfeed-search-live-filter
-    "<return>" #'elfeed-search-show-entry)
-  :init
-  (setq elfeed-db-directory (no-littering-expand-var-file-name "elfeed/"))
-  (setq +rss/feed-urls
-        '(("Arch Linux"
-           "https://www.archlinux.org/feeds/news/"
-           Linux)
-          ("LEMMiNO"
-           "https://www.youtube.com/feeds/videos.xml?channel_id=UCRcgy6GzDeccI7dkbbBna3Q"
-           YouTube Stories)
-          ("The Onion"
-           "https://www.theonion.com/rss"
-           Social)
-          ("Stack exchange"
-           "http://morss.aryadevchavali.com/stackexchange.com/feeds/questions"
-           Social)
-          ("Dark Sominium"
-           "https://www.youtube.com/feeds/videos.xml?channel_id=UC_e39rWdkQqo5-LbiLiU10g"
-           YouTube Stories)
-          ("Dark Sominium Music"
-           "https://www.youtube.com/feeds/videos.xml?channel_id=UCkLiZ_zLynyNd5fd62hg1Kw"
-           YouTube Music)
-          ("Nexpo"
-           "https://www.youtube.com/feeds/videos.xml?channel_id=UCpFFItkfZz1qz5PpHpqzYBw"
-           YouTube)
-          ("Techquickie"
-           "https://www.youtube.com/feeds/videos.xml?channel_id=UC0vBXGSyV14uvJ4hECDOl0Q"
-           YouTube)
-          ("3B1B"
-           "https://www.youtube.com/feeds/videos.xml?channel_id=UCYO_jab_esuFRV4b17AJtAw"
-           YouTube)
-          ("Fredrik Knusden"
-           "https://www.youtube.com/feeds/videos.xml?channel_id=UCbWcXB0PoqOsAvAdfzWMf0w"
-           YouTube Stories)
-          ("Barely Sociable"
-           "https://www.youtube.com/feeds/videos.xml?channel_id=UC9PIn6-XuRKZ5HmYeu46AIw"
-           YouTube Stories)
-          ("Atrocity Guide"
-           "https://www.youtube.com/feeds/videos.xml?channel_id=UCn8OYopT9e8tng-CGEWzfmw"
-           YouTube Stories)
-          ("Hacker News"
-           "http://morss.aryadevchavali.com/news.ycombinator.com/rss"
-           Social)
-          ("Hacker Factor"
-           "https://www.hackerfactor.com/blog/index.php?/feeds/index.rss2"
-           Social)
-          ("BBC Top News"
-           "http://morss.aryadevchavali.com/feeds.bbci.co.uk/news/rss.xml"
-           News)
-          ("BBC Tech News"
-           "http://morss.aryadevchavali.com/feeds.bbci.co.uk/news/technology/rss.xml"
-           News)))
-  :config
-  (with-eval-after-load "evil-collection"
-    (evil-collection-elfeed-setup))
-  (setq elfeed-feeds (cl-map 'list #'(lambda (item)
-                                       (append (list (nth 1 item)) (cdr (cdr item))))
-                             +rss/feed-urls)))
-#+end_src
-* Magit
-Magit is *the* git porcelain for Emacs, which perfectly encapsulates
-the git cli.  In this case I just need to setup the bindings for it.
-As magit will definitely load after evil (as it must be run by a
-binding, and evil will load after init), I can use evil-collection
-freely.  Also, define an auto insert for commit messages so that I
-don't need to write everything myself.
-
-#+begin_src emacs-lisp
-(use-package magit
-  :defer t
-  :display
-  ("magit:.*"
-   (display-buffer-same-window)
-   (inhibit-duplicate-buffer . t))
-  ("magit-diff:.*"
-   (display-buffer-below-selected))
-  ("magit-log:.*"
-   (display-buffer-same-window))
-  :general
-  (leader
-    "g" '(magit-dispatch :which-key "Magit")
-    "vf" '(magit-file-dispatch :which-key "Magit file")
-    "vb" '(magit-blame :which-key "Magit blame"))
-  (code-leader
-    "b" #'magit-blame)
-  :auto-insert
-  (("COMMIT_EDITMSG" . "Commit skeleton")
-   ""
-   "(" (read-string "Enter feature/module: ") ")"
-   (read-string "Enter simple description: ") "\n\n")
-  :init
-  (setq vc-follow-symlinks t
-        magit-blame-echo-style 'lines
-        magit-copy-revision-abbreviated t)
-  :config
-  (with-eval-after-load "evil"
-    (evil-set-initial-state 'magit-status-mode 'motion))
-  (with-eval-after-load "evil-collection"
-    (evil-collection-magit-setup)))
-#+end_src
-* IBuffer
-#+begin_src emacs-lisp
-(use-package ibuffer
-  :general
-  (buffer-leader
-    "i" #'ibuffer)
-  :config
-  (with-eval-after-load "evil-collection"
-    (evil-collection-ibuffer-setup)))
-#+end_src
-* Processes
-Emacs has two systems for process management:
-+ proced: a general 'top' like interface which allows general
-  management of linux processes
-+ list-processes: a specific Emacs based system that lists processes
-  spawned by Emacs (similar to a top for Emacs specifically)
-
-** Proced
-Core proced config, just a few bindings and evil collection setup.
-#+begin_src emacs-lisp
-(use-package proced
-  :straight nil
-  :general
-  (app-leader
-    "p" #'proced)
-  (nmap
-    :keymaps 'proced-mode-map
-    "za" #'proced-toggle-auto-update)
-  :display
-  ("\\*Proced\\*"
-   (display-buffer-at-bottom)
-   (window-height . 0.25))
-  :init
-  (setq proced-auto-update-interval 0.5)
-  :config
-  (with-eval-after-load "evil-collection"
-    (evil-collection-proced-setup)))
-#+end_src
-
-Along with that I setup the package ~proced-narrow~ which allows
-further filtering of the process list.
-#+begin_src emacs-lisp
-(use-package proced-narrow
-  :straight t
-  :after proced
-  :general
-  (nmap
-    :keymaps 'proced-mode-map
-    "%" #'proced-narrow))
-#+end_src
-* Calculator
-Surprise, surprise Emacs comes with a calculator.
-
-Greater surprise, this thing is over powered.  It can perform the
-following (and more):
-- Matrix calculations
-- Generalised calculus operations
-- Equation solvers for n-degree multi-variable polynomials
-- Embedded mode (check below)!
-
-~calc-mode~ is a calculator system within Emacs that provides a
-diverse array of mathematical operations.  It uses reverse polish
-notation to do calculations (though there is a standard infix
-algebraic notation mode).
-
-Embedded mode allows computation with the current buffer as the echo
-area.  This basically means I can compute stuff within a buffer
-without invoking calc directly: $1 + 2\rightarrow_{\text{calc-embed}} 3$.
-
-#+begin_src emacs-lisp
-(use-package calc
-  :straight nil
-  :display
-  ("*Calculator*"
-   (display-buffer-at-bottom)
-   (window-height . 0.18))
-  :general
-  (app-leader
-    "c" #'calc-dispatch)
-  (mode-leader
-    "c" #'calc-embedded)
-  :init
-  (setq calc-algebraic-mode t)
-  :config
-  (with-eval-after-load "evil-collection"
-    (evil-collection-calc-setup)))
-#+end_src
-** WIP Calctex
-:PROPERTIES:
-:header-args:emacs-lisp: :tangle no
-:END:
-~calc-mode~ also has a 3rd party package called ~calctex~. It renders
-mathematical expressions within calc as if they were rendered in TeX.
-You can also copy the expressions in their TeX forms, which is pretty
-useful when writing a paper.  I've set a very specific lock on this
-repository as it's got quite a messy work-tree and this commit seems to
-work for me given the various TeX utilities installed via Arch.
-
-#+begin_src emacs-lisp
-(use-package calctex
-  :after calc
-  :straight (calctex :type git :host github :repo "johnbcoughlin/calctex")
-  :hook (calc-mode-hook . calctex-mode))
-#+end_src
-* Ledger
-#+begin_src emacs-lisp
-(use-package ledger-mode
-  :defer t)
-
-(use-package evil-ledger
-  :after ledger-mode)
-#+end_src
-* WIP Zone
-:PROPERTIES:
-:header-args:emacs-lisp: :tangle no
-:END:
-Of course Emacs has a cool screensaver software.
-
-#+begin_src emacs-lisp
-(use-package zone-matrix
-  :straight t
-  :after dashboard
-  :init
-  (setq zone-programs
-        [zone-pgm-jitter
-         zone-pgm-putz-with-case
-         zone-pgm-dissolve
-         zone-pgm-whack-chars
-         zone-pgm-drip
-         zone-pgm-rat-race
-         zone-pgm-random-life
-         zone-matrix
-         ])
-  :config
-  (zone-when-idle 15))
-#+end_src
-* (Wo)man
-Man pages are the user manuals for most software on Linux.  Really
-useful when writing code for Un*x systems, though they can be very
-verbose.
-
-2023-08-17: `Man-notify-method' is the reason the `:display' record
-doesn't work here.  I think it's to do with how Man pages are rendered
-or something, but very annoying as it's a break from standards!
-#+begin_src emacs-lisp
-(use-package man
-  :demand t
-  :straight nil
-  :init
-  (setq Man-notify-method 'pushy)
-  :display
-  ("^\\*Man.*"
-   (display-buffer-reuse-mode-window display-buffer-same-window))
-  :general
-  (file-leader
-    "m" #'man) ;; kinda like "find man page"
-  (nmmap
-    :keymaps 'Man-mode-map
-    "RET" #'man-follow))
-#+end_src
-* gif-screencast
-Little application that uses =gifsicle= to make essentially videos of
-Emacs.  Useful for demonstrating features.
-#+begin_src emacs-lisp
-(use-package gif-screencast
-  :straight t
-  :general
-  (app-leader
-    "x" #'gif-screencast-start-or-stop)
-  :init
-  (setq gif-screencast-output-directory (expand-file-name "~/Media/emacs/")))
-#+end_src
-* Image-mode
-Image mode, for viewing images.  Supports tons of formats, easy to use
-and integrates slickly into image-dired.  Of course,
-#+begin_src emacs-lisp
-(use-package image-mode
-  :straight nil
-  :general
-  (nmmap
-    :keymaps 'image-mode-map
-    "+" #'image-increase-size
-    "-" #'image-decrease-size
-    "p" #'image-animate
-    "P" #'image-animate-set-speed
-    "h" #'image-backward-hscroll
-    "j" #'image-next-line
-    "k" #'image-previous-line
-    "l" #'image-forward-hscroll))
-#+end_src
diff --git a/Emacs/.config/emacs/config.org b/Emacs/.config/emacs/config.org
index b90c650..b20960b 100644
--- a/Emacs/.config/emacs/config.org
+++ b/Emacs/.config/emacs/config.org
@@ -11,14 +11,13 @@
 * Introduction
 Welcome to my Emacs configuration.  This thing is quite big, but a lot
 of it has been "write and forget" i.e. I've only needed to configure
-it once.  Sections tagged =WIP= are currently unused, usually with
+it once.  Sections tagged =WAIT= are currently unused, usually with
 some reasoning given.
 
 Some sections border on blog posts justifying why I think they're good
 applications or giving some greater reasoning about my specific
 configuration of a package.  If you don't really want that, you may
-tangle this file, [[file:core.org][the core file]] and
-[[file:app.org][the app file]] and just read their source code.
+tangle this file and just read the source code.
 * Basics
 Firstly, set full name and mail address.  This is used in encryption
 and mailing.
@@ -35,19 +34,19 @@ Let's set all yes or no questions to single letter responses.
 Set the encoding to UTF-8-Unix by default.
 #+begin_src emacs-lisp
 (use-package emacs
-  :straight nil
+  :demand t
   :init
   (setq-default buffer-file-coding-system 'utf-8-unix
                 save-buffer-coding-system 'utf-8-unix))
 #+end_src
-** File saves and custom file
+
 Setup automatic saving for files (in case of system failure) and
 auto-revert-mode (which refreshes the buffer on changes to the
 underlying file).  Along with that, set the custom-file (which holds
 temporary customisation)  in the etc folder.
 #+begin_src emacs-lisp
 (use-package emacs
-  :straight nil
+  :demand t
   :init
   (setq backup-directory-alist `(("." . ,(no-littering-expand-var-file-name "saves/")))
         global-auto-revert-non-file-buffers t
@@ -59,9 +58,15 @@ temporary customisation)  in the etc folder.
 Functions that don't require a packages to work other than Emacs,
 which means I can define them early.  These are used much later in the
 config.
-** Toggle buffer
+** WAIT Toggle buffer
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
 Like VSCode's toggling feature for just the terminal but now for
 any buffer of choice, as long as I can generate it via a command.
+
+2024-04-23: Don't need this anymore due to
+~switch-to-buffer-obey-display-actions~.
 #+begin_src emacs-lisp
 (with-eval-after-load "window"
   (defmacro +oreo/create-toggle-function (func-name buf-name
@@ -104,7 +109,7 @@ Define a macro which creates hooks into the ~after-save-hook~.  On
 certain ~conditions~ being met, ~to-run~ is evaluated.
 #+begin_src emacs-lisp
 (use-package simple
-  :straight nil
+  :defer t
   :config
   (defmacro +oreo/create-auto-save (conditions &rest to-run)
     "Create a hook for after saves, where (on CONDITIONS being met)
@@ -153,8 +158,8 @@ In [[file:early-init.el][early-init.el]] I set the number of
 native-workers to 4, which isn't necessarily optimal when
 loading/compiling the rest of this file depending on the machine I
 use:
-- On my laptop (=spiderboy=) I'd prefer to have it use 2-3 threads so I
-  can actually use the rest of the laptop while waiting for
+- On my laptop (=spiderboy=) I'd prefer to have it use 2-3 threads so
+  I can actually use the rest of the laptop while waiting for
   compilation
 - On my desktop (=oldboy=) I'd prefer to use 4-6 threads as I can
   afford more, so I can get a faster load up.
@@ -173,7 +178,7 @@ any buffers in ~+oreo/keep-buffer~ and kills the rest.
 (defconst +oreo/keep-buffers
   (list "config.org" "*scratch*"
         "*dashboard*" "*Messages*"
-        "*Warnings*")
+        "*Warnings*" "*eshell*")
   "List of buffer names to preserve.")
 
 (defun +oreo/clean-buffer-list ()
@@ -199,7 +204,6 @@ scheme ([[file:elisp/personal-theme.el][this file]])
 #+begin_src emacs-lisp
 (use-package custom
   :demand t
-  :straight nil
   :init
   (setq custom-theme-directory (concat user-emacs-directory "elisp/"))
   :config
@@ -218,7 +222,6 @@ dark easily, so here's a command to switch between them.
 #+begin_src emacs-lisp
 (use-package custom
   :defer t
-  :straight nil
   :commands +oreo/switch-theme
   :init
   (defvar +oreo/theme 'dark)
@@ -227,63 +230,65 @@ dark easily, so here's a command to switch between them.
     (interactive)
     (cond
      ((eq +oreo/theme 'dark)
+      (mapc #'disable-theme custom-enabled-themes)
       (load-theme 'personal-light t)
       (setq +oreo/theme 'light))
      ((eq +oreo/theme 'light)
+      (mapc #'disable-theme custom-enabled-themes)
       (load-theme 'personal-primary t)
-      (setq +oreo/theme 'dark)))))
-
+      (setq +oreo/theme 'dark))))
+  )
 #+end_src
 ** Font size
 Set font size to 140 if on my desktop (oldboy) or 175 if on my laptop
 (spiderboy).
 #+begin_src emacs-lisp
 (use-package faces
-  :straight nil
+  :defer t
   :config
   (+oreo/sys-name-cond
-   ("spiderboy" (set-face-attribute 'default nil :height 175))
+   ("spiderboy" (set-face-attribute 'default nil :height 145))
    ("oldboy" (set-face-attribute 'default nil :height 140))))
 #+end_src
 ** Startup screen
-The default startup screen is quite bad in all honesty, great for
-first time users who have no idea what is going on but terrible for
-regular users.
+The default startup screen is quite bad in all honesty.  While for a
+first time user it can be very helpful in running the tutorial and
+finding out more about Emacs, for someone who's already configured it
+there isn't much point.
 
 The scratch buffer is an interaction buffer made when Emacs is first
 started, as a way to quickly prototype Emacs Lisp code.  When startup
 screen is disabled, this buffer is the first thing presented on boot
 for Emacs.  So we can use it to store some useful information.
-
-As I use [[*Org mode][org-mode]] to compile my Emacs, it is available
-essentially at startup, so I use it for the scratch buffer.  That way,
-I can use all the abilities of org-mode (particularly writing a system
-of code using =#+RESULTS=) in an ephemeral buffer at startup!
 #+begin_src emacs-lisp
 (use-package emacs
-  :straight nil
+  :defer t
   :init
   (setq
    inhibit-startup-screen t
-   initial-major-mode 'org-mode
+   initial-major-mode 'fundamental-mode
    initial-scratch-message ""
    ring-bell-function 'ignore)
-  (add-hook 'after-init-hook (proc
-                              (with-current-buffer "*scratch*"
-                                (goto-char (point-max))
-                                (insert (format "#+title: Scratch buffer
-,#+author: %s
-,#+description: Emacs v%s
-
-Booted in %s
-" user-full-name emacs-version (emacs-init-time)))))))
-
+  :config
+  (add-hook
+   'emacs-startup-hook
+   (proc
+    (with-current-buffer "*scratch*"
+      (goto-char (point-max))
+      (insert
+       (format
+        "Emacs v%s - %s\n"
+        emacs-version (emacs-init-time)))))))
 #+end_src
 ** Blinking cursor
-Turn off blinking-cursor-mode as [[*Hl-line][hl-line]] is better.
+Turn on blinking cursor (helps with seeing if Emacs is hanging or not).
+
+2021-03-15: Turn off blinking-cursor-mode as [[*Hl-line][hl-line]] is better.
 #+begin_src emacs-lisp
 (use-package frame
-  :straight nil
+  :defer t
+  :init
+  (setq blink-cursor-delay 0.2)
   :config
   (blink-cursor-mode 0))
 #+end_src
@@ -292,8 +297,7 @@ Turning off borders in my window manager was a good idea, so turn off
 the borders for Emacs.
 #+begin_src emacs-lisp
 (use-package fringe
-  :after dashboard
-  :straight nil
+  :defer t
   :config
   (fringe-mode 0))
 #+end_src
@@ -304,130 +308,855 @@ little.  I customised the Emacs modeline to give me a bit of info,
 
 Currently I use the default mode line with some customisation;
 simplicity is above all.
-*** Emacs Mode-line
-#+begin_src emacs-lisp
-(defun +mode-line/generate-padding ()
-  (let ((wid (frame-width))
-        (str ""))
-    (dotimes (n (floor (/ wid 7)))
-      (setq str (concat str " ")))
-    str))
 
+#+begin_src emacs-lisp
 (setq-default
  mode-line-format
- (list
-  "%l:%c    " ;; Line and column
-  "%p[" ;; Where in file + Evil state
-  '(:eval (upcase
-           (substring
-            (format "%s" (if (bound-and-true-p evil-state)
-                             evil-state
-                           ""))
-            0 1)))
-  "]    "
-  "%+%b("
-  '(:eval (format "%s" major-mode))
-  ")    "
-  "%I    "
-  '(:eval (+mode-line/generate-padding))
-  '(vc-mode vc-mode)
-  mode-line-misc-info
-  mode-line-end-spaces))
-#+end_src
-*** WIP Telephone-line
+ '("%l:%c    "                          ;; Line and column
+   "%p["                                ;; %into file
+   (:eval (with-eval-after-load "evil" ;; Evil state
+            (upcase
+             (substring
+              (format "%s" (if (bound-and-true-p evil-state)
+                               evil-state
+                             " "))
+              0 1))))
+   "]    "
+   "%+"
+   "%b"
+   "("                              ;; Buffer name
+   (:eval (format "%s" major-mode))
+   ")    "
+   "%I    "                             ;; file size
+   (:eval (if (project-current)
+              (project-name (project-current))))
+   (vc-mode vc-mode)                   ;; git branch
+   "    "
+   (:eval
+    (with-eval-after-load "eglot"
+      (if eglot--managed-mode
+          (eglot--mode-line-format))))
+   mode-line-misc-info
+   mode-line-end-spaces))
+#+end_src
+** Mouse
+Who uses a mouse? 🤮
+#+begin_src emacs-lisp
+(setq-default use-file-dialog nil)
+#+end_src
+* Core packages
+For my core packages, whose configuration doesn't change much anyway,
+** General
+General provides a great solution for binding keys.  It has evil and
+use-package support so it fits nicely into configuration.  In this
+case, I define a "definer" for the "LEADER" keys.  Leader is bound to
+~SPC~ and it's functionally equivalent to the doom/spacemacs leader.
+Local leader is bound to ~SPC ,~ and it's similar to doom/spacemacs
+leader but doesn't try to fully assimilate the local-leader map,
+instead just picking stuff I think is useful.  This forces me to learn
+only as many bindings as I find necessary; no more, no less.
+
+I also define prefix leaders for differing applications.  These are
+quite self explanatory by their name and provide a nice way to
+visualise all bindings under a specific heading just by searching the
+code.
+#+begin_src emacs-lisp
+(use-package general
+  :straight t
+  :demand t
+  :config
+  ;; General which key definitions for leaders
+  (general-def
+    :states '(normal motion)
+    "SPC"   'nil
+    "\\"    '(nil :which-key "Local leader")
+    "SPC a" '(nil :which-key "Applications")
+    "SPC b" '(nil :which-key "Buffers")
+    "SPC c" '(nil :which-key "Code")
+    "SPC d" '(nil :which-key "Directories")
+    "SPC f" '(nil :which-key "Files")
+    "SPC i" '(nil :which-key "Insert")
+    "SPC m" '(nil :which-key "Modes")
+    "SPC r" '(nil :which-key "Tabs")
+    "SPC s" '(nil :which-key "Search")
+    "SPC t" '(nil :which-key "Shell")
+    "SPC q" '(nil :which-key "Quit/Literate"))
+
+  (general-create-definer leader
+    :states '(normal motion)
+    :keymaps 'override
+    :prefix "SPC")
+
+  (general-create-definer local-leader
+    :states '(normal motion)
+    :prefix "\\")
+
+  (general-create-definer code-leader
+    :states '(normal motion)
+    :keymaps 'override
+    :prefix "SPC c")
+
+  (general-create-definer file-leader
+    :states '(normal motion)
+    :keymaps 'override
+    :prefix "SPC f")
+
+  (general-create-definer shell-leader
+    :states '(normal motion)
+    :keymaps 'override
+    :prefix "SPC t")
+
+  (general-create-definer tab-leader
+    :states '(normal motion)
+    :keymaps 'override
+    :prefix "SPC r")
+
+  (general-create-definer mode-leader
+    :states '(normal motion)
+    :keymaps 'override
+    :prefix "SPC m")
+
+  (general-create-definer app-leader
+    :states '(normal motion)
+    :keymaps 'override
+    :prefix "SPC a")
+
+  (general-create-definer search-leader
+    :states '(normal motion)
+    :keymaps 'override
+    :prefix "SPC s")
+
+  (general-create-definer buffer-leader
+    :states '(normal motion)
+    :keymaps 'override
+    :prefix "SPC b")
+
+  (general-create-definer quit-leader
+    :states '(normal motion)
+    :keymaps 'override
+    :prefix "SPC q")
+
+  (general-create-definer insert-leader
+    :states '(normal motion)
+    :keymaps 'override
+    :prefix "SPC i")
+
+  (general-create-definer dir-leader
+    :states '(normal motion)
+    :keymaps 'override
+    :prefix "SPC d")
+
+  (general-create-definer general-nmmap
+    :states '(normal motion))
+
+  (defalias 'nmmap #'general-nmmap)
+
+  (general-evil-setup t))
+#+end_src
+*** Some binds for Emacs
+Some bindings that I couldn't fit elsewhere easily.
+#+begin_src emacs-lisp
+(use-package emacs
+  :after general
+  :general
+  ("C-x d" #'delete-frame)
+
+  (nmmap
+    "M-;" #'eval-expression
+    "g="  #'align-regexp
+    "C--" #'text-scale-decrease
+    "C-=" #'text-scale-increase
+    "C-+" #'text-scale-adjust)
+
+  (leader
+    "SPC" '(execute-extended-command :which-key "M-x")
+    "p"   `(,project-prefix-map :which-key "Project")
+    "'"   '(browse-url-emacs :which-key "Download URL to Emacs")
+    ":"   `(,(proc (interactive) (switch-to-buffer "*scratch*"))
+            :which-key "Switch to *scratch*")
+    "!"   '(async-shell-command :which-key "Async shell command")
+    "h"   '(help-command :which-key "Help"))
+
+  (mode-leader
+    "T" #'+oreo/switch-theme)
+
+  (code-leader
+    "F" `(,(proc (interactive) (find-file "~/Code/"))
+          :which-key "Open ~/Code/"))
+
+  (file-leader
+    "f" #'find-file
+    "F" #'find-file-other-window
+    "t" #'find-file-other-tab
+    "s" #'save-buffer)
+
+  (buffer-leader
+    "b" #'switch-to-buffer
+    "d" #'kill-current-buffer
+    "K" #'kill-buffer
+    "j" #'next-buffer
+    "k" #'previous-buffer
+    "D" '(+oreo/clean-buffer-list :which-key "Kill most buffers"))
+
+  (quit-leader
+    "q" #'save-buffers-kill-terminal
+    "c" #'+literate/compile-config
+    "C" #'+literate/clean-config
+    "l" #'+literate/load-config)
+
+  (search-leader "i" #'imenu))
+#+end_src
+** Evil
+My editor journey started off with Vim rather than Emacs, so my brain
+has imprinted on its style.  Thankfully Emacs is super extensible so
+there exists a package (more of a supreme system) for porting Vim's
+modal editing style to Emacs, called Evil (Emacs Vi Layer).
+
+However there are a lot of packages in Vim that provide greater
+functionality, for example 'vim-surround'.  Emacs, by default, has
+these capabilities but there are further packages which integrate them
+into Evil.
+*** Evil core
+Setup the evil package, with some opinionated keybindings:
+- Switch ~evil-upcase~ and ~evil-downcase~ because I use ~evil-upcase~
+  more
+- Switch ~evil-goto-mark~ and ~evil-goto-mark-line~ as I'd rather have
+  the global one closer to the home row
+- Use 'T' character as an action for transposing objects
+#+begin_src emacs-lisp
+(use-package evil
+  :demand t
+  :straight t
+  :general
+  (leader
+    "w"  '(evil-window-map :which-key "Window")
+    "wT" #'window-swap-states
+    "wd" #'evil-window-delete)
+
+  (nmmap
+    "K"   #'man
+    "TAB" #'evil-jump-item
+    "r"   #'evil-replace-state
+    "zC"  #'hs-hide-level
+    "zO"  #'hs-show-all
+    "'"   #'evil-goto-mark
+    "`"   #'evil-goto-mark-line
+    "C-w" #'evil-window-map
+    "gu"  #'evil-upcase
+    "gU"  #'evil-downcase
+    "T"   nil)
+
+  (nmmap
+    :infix "T"
+    "w" #'transpose-words
+    "c" #'transpose-chars
+    "s" #'transpose-sentences
+    "p" #'transpose-paragraphs
+    "e" #'transpose-sexps
+    "l" #'transpose-lines)
+  :init
+  (setq evil-want-keybinding nil
+        evil-split-window-below t
+        evil-vsplit-window-right t
+        evil-want-abbrev-expand-on-insert-exit t
+        evil-undo-system #'undo-tree)
+  :config
+  (evil-mode))
+#+end_src
+*** Evil surround
+Evil surround is a port for vim-surround.
+#+begin_src emacs-lisp
+(use-package evil-surround
+  :after evil
+  :straight t
+  :config
+  (global-evil-surround-mode))
+#+end_src
+*** Evil commentary
+Allows generalised commenting of objects easily.
+#+begin_src emacs-lisp
+(use-package evil-commentary
+  :after evil
+  :straight t
+  :config
+  (evil-commentary-mode))
+#+end_src
+*** Evil multi cursor
+Setup for multi cursors in Evil mode.  Don't let evil-mc setup it's own
+keymap because it uses 'gr' as its prefix, which I don't like.
+#+begin_src emacs-lisp
+(use-package evil-mc
+  :after evil
+  :straight t
+  :init
+  (defvar evil-mc-key-map (make-sparse-keymap))
+  :general
+  (nmap
+    :infix "gz"
+    "q" #'evil-mc-undo-all-cursors
+    "d" #'evil-mc-make-and-goto-next-match
+    "j" #'evil-mc-make-cursor-move-next-line
+    "k" #'evil-mc-make-cursor-move-prev-line
+    "j" #'evil-mc-make-cursor-move-next-line
+    "m" #'evil-mc-make-all-cursors
+    "z" #'evil-mc-make-cursor-here
+    "r" #'evil-mc-resume-cursors
+    "s" #'evil-mc-pause-cursors
+    "u" #'evil-mc-undo-last-added-cursor)
+  :config
+  (global-evil-mc-mode))
+  ;; (evil-mc-define-vars)
+  ;; (evil-mc-initialize-vars)
+  ;; (add-hook 'evil-mc-before-cursors-created #'evil-mc-pause-incompatible-modes)
+  ;; (add-hook 'evil-mc-before-cursors-created #'evil-mc-initialize-active-state)
+  ;; (add-hook 'evil-mc-after-cursors-deleted  #'evil-mc-teardown-active-state)
+  ;; (add-hook 'evil-mc-after-cursors-deleted  #'evil-mc-resume-incompatible-modes)
+  ;; (advice-add #'evil-mc-initialize-hooks :override #'ignore)
+  ;; (advice-add #'evil-mc-teardown-hooks :override #'evil-mc-initialize-vars)
+  ;; (advice-add #'evil-mc-initialize-active-state :before #'turn-on-evil-mc-mode)
+  ;; (advice-add #'evil-mc-teardown-active-state :after #'turn-off-evil-mc-mode)
+  ;; (add-hook 'evil-insert-state-entry-hook #'evil-mc-resume-cursors)
+#+end_src
+
+*** Evil collection
+Provides a community based set of keybindings for most modes in
+Emacs.  I don't necessarily like all my modes having these bindings
+though, as I may disagree with some.  So I use it in a mode to mode basis.
+#+begin_src emacs-lisp
+(use-package evil-collection
+  :straight t
+  :after evil)
+#+end_src
+*** Evil number
+Increment/decrement a number at point like Vim does, but use bindings
+that don't conflict with Emacs default.
+#+begin_src emacs-lisp
+(use-package evil-numbers
+  :straight t
+  :defer t
+  :general
+  (nmmap
+    "+" #'evil-numbers/inc-at-pt
+    "-" #'evil-numbers/dec-at-pt))
+#+end_src
+** Completion
+Emacs is a text based interface.  Completion is its bread and butter
+in providing good user experience.  By default Emacs provides
+'completions-list' which produces a buffer of options which can be
+searched and selected.  We can take this further though!
+
+Ido and Icomplete are packages distributed with Emacs to provide
+greater completion interfaces.  They utilise the minibuffer to create
+a more interactive experience, allowing incremental searches and
+option selection.
+
+Ivy and Helm provide more modern interfaces, though Helm is quite
+heavy.  Ivy, on the other hand, provides an interface similar to Ido
+with less clutter and better customisation options.
+*** Ivy
+Ivy is a completion framework for Emacs, and my preferred one.  It has
+a great set of features with little to no pain with setting up.
+**** Ivy Core
+Setup for ivy, in preparation for counsel.  Turn on ivy-mode just
+after init.
+
+Setup vim-like bindings for the minibuffer ("M-(j|k)" for down|up the
+selection list).
+#+begin_src emacs-lisp
+(use-package ivy
+  :demand t
+  :straight t
+  :general
+  (general-def
+    :keymaps 'ivy-minibuffer-map
+    "C-j"    #'ivy-yank-symbol
+    "M-j"    #'ivy-next-line-or-history
+    "M-k"    #'ivy-previous-line-or-history
+    "C-SPC"  #'ivy-occur)
+  (general-def
+    :keymaps  'ivy-switch-buffer-map
+    "M-j"     #'ivy-next-line-or-history
+    "M-k"     #'ivy-previous-line-or-history)
+  (nmap
+    :keymaps '(ivy-occur-mode-map ivy-occur-grep-mode-map)
+    "RET"    #'ivy-occur-press-and-switch
+    "J"      #'ivy-occur-press
+    "gr"     #'ivy-occur-revert-buffer
+    "q"      #'quit-window
+    "D"      #'ivy-occur-delete-candidate
+    "W"      #'ivy-wgrep-change-to-wgrep-mode
+    "{"      #'compilation-previous-file
+    "}"      #'compilation-next-file)
+  :init
+  (with-eval-after-load "evil"
+    (evil-set-initial-state 'ivy-occur-mode 'normal)
+    (evil-set-initial-state 'ivy-occur-grep-mode 'normal))
+  (setq ivy-height 10
+        ivy-wrap t
+        ivy-fixed-height-minibuffer t
+        ivy-use-virtual-buffers nil
+        ivy-virtual-abbreviate 'full
+        ivy-on-del-error-function #'ignore
+        ivy-use-selectable-prompt t)
+  :config
+  (ivy-mode 1)
+  (require 'counsel nil t))
+#+end_src
+**** Counsel
+Setup for counsel.  Load after ivy and helpful.
+#+begin_src emacs-lisp
+(use-package counsel
+  :straight t
+  :defer t
+  :general
+  (search-leader
+    "s" #'counsel-grep-or-swiper
+    "R" #'counsel-rg)
+  (file-leader
+    "r" #'counsel-recentf)
+  (insert-leader
+    "c" #'counsel-unicode-char)
+  (general-def
+    [remap describe-bindings]        #'counsel-descbinds
+    [remap load-theme]               #'counsel-load-theme)
+  :config
+  (setq ivy-initial-inputs-alist '((org-insert-link . "^"))
+        counsel-describe-function-function #'helpful-callable
+        counsel-describe-variable-function #'helpful-variable
+        counsel-grep-swiper-limit 1500000
+        ivy-re-builders-alist '((swiper . ivy--regex-plus)
+                                (counsel-grep-or-swiper . ivy--regex-plus)
+                                (counsel-rg . ivy--regex-plus)
+                                (t . ivy--regex-ignore-order)))
+  (counsel-mode 1))
+#+end_src
+**** WAIT Ivy posframe
 :PROPERTIES:
 :header-args:emacs-lisp: :tangle no
 :END:
-Telephone-line is a mode-line package for Emacs which prioritises
-extensibility.  It also looks much nicer than the default mode line
-with colouring and a ton of presentations to choose from.
+This makes ivy minibuffer windows use child frames.
+Very nice eyecandy, but can get kinda annoying.
 #+begin_src emacs-lisp
-(use-package telephone-line
+(use-package ivy-posframe
+  :hook (ivy-mode-hook . ivy-posframe-mode)
+  :straight t
   :init
-  (defface +telephone/position-face '((t (:foreground "red" :background "grey10"))) "")
-  (defface +telephone/mode-face '((t (:foreground "white" :background "dark green"))) "")
-  (defface +telephone/file-info-face '((t (:foreground "white" :background "Dark Blue"))) "")
-  :custom
-  (telephone-line-faces
-   '((evil      . telephone-line-modal-face)
-     (modal     . telephone-line-modal-face)
-     (ryo       . telephone-line-ryo-modal-face)
-     (accent    . (telephone-line-accent-active . telephone-line-accent-inactive))
-     (nil         . (mode-line                    . mode-line-inactive))
-     (position  . (+telephone/position-face     . mode-line-inactive))
-     (mode      . (+telephone/mode-face         . mode-line-inactive))
-     (file-info . (+telephone/file-info-face    . mode-line-inactive))))
-  (telephone-line-primary-left-separator    'telephone-line-halfcos-left)
-  (telephone-line-secondary-left-separator  'telephone-line-halfcos-hollow-left)
-  (telephone-line-primary-right-separator   'telephone-line-identity-right)
-  (telephone-line-secondary-right-separator 'telephone-line-identity-hollow-right)
-  (telephone-line-height 24)
-  (telephone-line-evil-use-short-tag nil)
-  :config
-  (telephone-line-defsegment +telephone/buffer-or-filename ()
-                             (cond
-                              ((buffer-file-name)
-                               (if (and (fboundp 'projectile-project-name)
-                                        (fboundp 'projectile-project-p)
-                                        (projectile-project-p))
-                                   (list ""
-                                         (funcall (telephone-line-projectile-segment) face)
-                                         (propertize
-                                          (concat "/"
-                                                  (file-relative-name (file-truename (buffer-file-name))
-                                                                      (projectile-project-root)))
-                                          'help-echo (buffer-file-name)))
-                                 (buffer-file-name)))
-                              (t (buffer-name))))
-
-  (telephone-line-defsegment +telephone/get-position ()
-                             `(,(concat "%lL:%cC"
-                                        (if (not mark-active)
-                                            ""
-                                          (format " | %dc" (- (+ 1 (region-end)) (region-beginning)))))))
+  (setq ivy-posframe-parameters
+        '((left-fringe      . 0)
+          (right-fringe     . 0)
+          (background-color . "grey7")))
 
-  (setq-default
-   telephone-line-lhs '((mode telephone-line-major-mode-segment)
-                        (file-info telephone-line-input-info-segment)
-                        (position +telephone/get-position)
-                        (accent   +telephone/buffer-or-filename
-                                  telephone-line-process-segment))
-   telephone-line-rhs '((accent telephone-line-flycheck-segment telephone-line-misc-info-segment
-                                telephone-line-projectile-segment)
-                        (file-info telephone-line-filesize-segment)
-                        (evil  telephone-line-evil-tag-segment)))
-  (telephone-line-mode))
+  (setq ivy-posframe-display-functions-alist
+        '((t . ivy-posframe-display-at-window-center))))
 #+end_src
-** Mouse
-Eww who uses a mouse?
+**** WAIT Counsel etags
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
+Counsel etags allows me to search generated tag files for tags.  I
+already have a function defined to generate the tags, so it's just
+searching them which I find to be a bit of a hassle, and where this
+package comes in.
+
+This has been replaced by [[*xref][xref]] which is inbuilt.
 #+begin_src emacs-lisp
-(setq use-file-dialog nil)
+(use-package counsel-etags
+  :after counsel
+  :general
+  (search-leader
+    "t" #'counsel-etags-find-tag))
 #+end_src
-* Core packages (loading)
-For my core packages, whose configuration doesn't change much anyway,
-I have a [[file:core.org][separate file]].  Here I'll load it up for
-usage later on.
+*** WAIT Ido
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
+Ido is a very old completion package that still works great to this
+day.  Though it is limited in its scope (and may thus be called a
+completion add-on rather than a full on framework), it is still a very
+powerful package.  With the use of ido-completing-read+, it may be used
+similarly to a fully fledged completion framework.
+
+#+begin_src emacs-lisp
+(use-package ido
+  :demand t
+  :general
+  (general-def
+    :keymaps '(ido-buffer-completion-map
+               ido-file-completion-map
+               ido-file-dir-completion-map
+               ido-common-completion-map)
+    (kbd "M-j")   #'ido-next-match
+    (kbd "M-k")   #'ido-prev-match
+    (kbd "C-x o") #'evil-window-up)
+  :init
+  (setq ido-decorations
+        (list "{" "}" " \n" " ..." "[" "]" " [No match]" " [Matched]"
+              " [Not readable]" " [Too big]" " [Confirm]")
+        completion-styles '(flex partial-completion intials emacs22))
+  (setq-default ido-enable-flex-matching t
+                ido-enable-dot-prefix t
+                ido-enable-regexp nil)
+  (with-eval-after-load "magit"
+    (setq magit-completing-read-function 'magit-ido-completing-read))
+  :config
+  (ido-mode)
+  (ido-everywhere))
+#+end_src
+**** Ido ubiquitous
+Ido completing-read+ is a package that extends the ido package to work
+with more text based functions.
 #+begin_src emacs-lisp
-(load-file (concat user-emacs-directory "core.el"))
+(use-package ido-completing-read+
+  :after ido
+  :config
+  (ido-ubiquitous-mode +1))
 #+end_src
-* Small packages
-** ISearch
-ISearch is the default incremental search application in Emacs.  I use
-~evil-search-forward~ so I don't interact with isearch that much, but
-I may need it occasionally.
+*** Amx
+Amx is a fork of Smex that works to enhance the
+execute-extended-command interface.  It also provides support for ido
+or ivy (though I'm likely to use ido here) and allows you to switch
+between them.
+
+It provides a lot of niceties such as presenting the key bind when
+looking for a command.
+
+#+begin_src emacs-lisp
+(use-package amx
+  :straight t
+  :defer t
+  :init
+  (setq amx-backend 'ivy)
+  :config
+  (amx-mode))
+#+end_src
+*** Orderless
+Orderless sorting method for completion, probably one of the best
+things ever.
 #+begin_src emacs-lisp
-(use-package isearch
-  :straight nil
+(use-package orderless
+  :straight t
+  :after (ivy ido)
+  :config
+  (setf (alist-get t ivy-re-builders-alist) 'orderless-ivy-re-builder))
+#+end_src
+*** Completions-list
+In case I ever use the completions list, some basic commands to look
+around.
+#+begin_src emacs-lisp
+(use-package simple
+  :defer t
+  :general
+  (nmmap
+    :keymaps 'completion-list-mode-map
+    "l"   #'next-completion
+    "h"   #'previous-completion
+    "ESC" #'delete-completion-window
+    "q"   #'quit-window
+    "RET" #'choose-completion)
+  :config
+  (with-eval-after-load "evil"
+    (setq evil-emacs-state-modes (cl-remove-if
+                                  #'(lambda (x) (eq 'completions-list-mode x))
+                                  evil-emacs-state-modes))
+    (add-to-list 'evil-normal-state-modes 'completions-list-mode)))
+#+end_src
+*** Company
+Company is the auto complete system I use.  I don't like having heavy
+setups for company as it only makes it slower to use.  In this case,
+just setup some evil binds for company.
+#+begin_src emacs-lisp
+(use-package company
+  :defer t
+  :straight t
+  :hook
+  (prog-mode-hook   . company-mode)
+  (eshell-mode-hook . company-mode)
   :general
-  (:keymaps 'isearch-mode-map
-   "M-s" #'isearch-repeat-forward))
+  (imap
+    "C-SPC" #'company-complete
+    "M-j" #'company-select-next
+    "M-k" #'company-select-previous))
+#+end_src
+** Pretty symbols
+Prettify symbols mode allows for users to declare 'symbols' that
+replace text within certain modes.  Though this may seem like useless
+eye candy, it has aided my comprehension and speed of recognition
+(recognising symbols is easier than words).
+
+Essentially a use-package keyword which makes declaring pretty symbols
+for language modes incredibly easy.  Checkout my [[C/C++][C/C++]] configuration
+for an example.
+#+begin_src emacs-lisp
+(use-package prog-mode
+  :demand t
+  :init
+  (setq prettify-symbols-unprettify-at-point t)
+  :config
+  (with-eval-after-load "use-package-core"
+    (add-to-list 'use-package-keywords ':pretty)
+    (defun use-package-normalize/:pretty (_name-symbol _keyword args)
+      args)
+
+    (defun use-package-handler/:pretty (name _keyword args rest state)
+      (use-package-concat
+       (use-package-process-keywords name rest state)
+       (mapcar
+        #'(lambda (arg)
+            (let ((mode (car arg))
+                  (rest (cdr arg)))
+              `(add-hook
+                ',mode
+                #'(lambda nil
+                    (setq prettify-symbols-alist ',rest)
+                    (prettify-symbols-mode)))))
+        args)))))
+#+end_src
+
+Here's a collection of keywords and possible associated symbols for
+any prog language of choice.  Mostly for reference and copying.
+#+begin_example
+("null"   . "Ø")
+("list"   . "ℓ")
+("string" . "𝕊")
+("true"   . "⊤")
+("false"  . "⊥")
+("char"   . "ℂ")
+("int"    . "ℤ")
+("float"  . "ℝ")
+("!"      . "¬")
+("&&"     . "∧")
+("||"      . "∨")
+("for"    . "∀")
+("return" . "⟼")
+("print"  . "ℙ")
+("lambda" . "λ")
+#+end_example
+** Window management
+Emacs' default window management is quite bad, eating other windows on
+a whim and not particularly caring for the current window setup.
+Thankfully you can change this via the ~display-buffer-alist~ which
+matches buffer names with how the window for the buffer should be
+displayed.  I add a use-package keyword to make ~display-buffer-alist~
+records within a use-package call.
+
+I have no idea whether it's optimal AT ALL, but it works for me.
+
+2024-04-23: Found this option ~switch-to-buffer-obey-display-actions~
+which makes manual buffer switches obey the same constraints via
+~display-buffer-alist~ as creating the buffer automatically.
+#+begin_src emacs-lisp
+(use-package window
+  :demand t
+  :general
+  :init
+  (setq switch-to-buffer-obey-display-actions t)
+  (with-eval-after-load "use-package-core"
+    (add-to-list 'use-package-keywords ':display)
+    (defun use-package-normalize/:display (_name-symbol _keyword args)
+      args)
+
+    (defun use-package-handler/:display (name _keyword args rest state)
+      (use-package-concat
+       (use-package-process-keywords name rest state)
+       (mapcar
+        #'(lambda (arg)
+            `(add-to-list 'display-buffer-alist
+                          ',arg))
+        args)))))
+#+end_src
+*** Some display records
+Using the ~:display~ keyword, setup up some ~display-buffer-alist~
+records.  This is mostly for packages that aren't really configured
+(like [[info:woman][woman]]) or packages that were configured before
+(like [[*Ivy][Ivy]]).
+#+begin_src emacs-lisp
+(use-package window
+  :defer t
+  :display
+  ("\\*Process List\\*"
+   (display-buffer-at-bottom)
+   (window-height . 0.25))
+
+  ("\\*\\(Ido \\)?Completions\\*"
+   (display-buffer-in-side-window)
+   (window-height . 0.25)
+   (side . bottom))
+
+  ("\\*ivy-occur.*"
+   (display-buffer-at-bottom)
+   (window-height . 0.25))
+
+  ("\\*Async Shell Command\\*"
+   (display-buffer-at-bottom)
+   (window-height . 0.25)))
+#+end_src
+** Tabs
+Tabs in vscode are just like buffers in Emacs but way slower and
+harder to use.  Tabs in Emacs are essentially window layouts, similar
+to instances in Tmux.  With this setup I can use tabs quite
+effectively.
+
+#+begin_src emacs-lisp
+(use-package tab-bar
+  :defer t
+  :init
+  (setq tab-bar-show 1)
+  :config
+  (tab-bar-mode)
+  :general
+  (tab-leader
+    "t" #'tab-switch
+    "j" #'tab-next
+    "k" #'tab-previous
+    "h" #'tab-move-to
+    "l" #'tab-move
+    "n" #'tab-new
+    "c" #'tab-close
+    "d" #'tab-close
+    "f" #'tab-detach
+    "w" #'tab-window-detach
+    "r" #'tab-rename)
+  (mode-leader
+    "t" #'toggle-tab-bar-mode-from-frame))
+#+end_src
+** Auto typing
+Snippets are a pretty nice way of automatically inserting code.  Emacs
+provides a ton of packages by default to do this, but there are great
+packages to install as well.
+
+Abbrevs and skeletons make up a popular solution within Emacs default.
+Abbrevs are for simple expressions wherein the only input is the key,
+and the output is some Elisp function.  They provide a lot of inbuilt
+functionality and are quite useful.  Skeletons, on the other hand, are
+for higher level insertions
+
+The popular external solution is Yasnippet.  Yasnippet is a great
+package for snippets, which I use heavily in programming and org-mode.
+I setup here the global mode for yasnippet and a collection of
+snippets for ease of use.
+*** Abbrevs
+Just define a few abbrevs for various date-time operations.  Also
+define a macro that will assume a function for the expansion, helping
+with abstracting a few things away.
+#+begin_src emacs-lisp
+(use-package abbrev
+  :defer t
+  :hook
+  (prog-mode-hook . abbrev-mode)
+  (text-mode-hook . abbrev-mode)
+  :init
+  (defmacro +abbrev/define-abbrevs (abbrev-table &rest abbrevs)
+    `(progn
+       ,@(mapcar #'(lambda (abbrev)
+                `(define-abbrev
+                   ,abbrev-table
+                   ,(car abbrev)
+                   ""
+                   (proc (insert ,(cadr abbrev)))))
+            abbrevs)))
+  (setq save-abbrevs nil)
+  :config
+  (+abbrev/define-abbrevs
+   global-abbrev-table
+   ("sdate"
+    (format-time-string "%Y-%m-%d" (current-time)))
+   ("stime"
+    (format-time-string "%H:%M:%S" (current-time)))
+   ("sday"
+    (format-time-string "%A" (current-time)))
+   ("smon"
+    (format-time-string "%B" (current-time)))))
+#+end_src
+*** WAIT Skeletons
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
+Defines a macro for generating a skeleton + abbrev for a given mode.
+Doesn't sanitise inputs because I assume callers are /rational/ actors
+who would *only* use this for their top level Emacs config.
+
+Honestly didn't find much use for this currently, so disabled.
+#+begin_src emacs-lisp
+(use-package skeleton
+  :after abbrev
+  :config
+  (defmacro +autotyping/gen-skeleton-abbrev (mode abbrev &rest skeleton)
+    (let* ((table          (intern (concat (symbol-name mode) "-abbrev-table")))
+           (skeleton-name  (intern (concat "+skeleton/" (symbol-name mode) "/" abbrev))))
+      `(progn
+         (define-skeleton
+           ,skeleton-name
+           ""
+           ,@skeleton)
+         (define-abbrev ,table
+           ,abbrev
+           ""
+           ',skeleton-name)))))
+#+end_src
+*** Auto insert
+Allows inserting text immediately upon creating a new buffer with a
+given name.  Supports skeletons for inserting text.  To make it easier
+for later systems to define their own auto inserts, I define a
+~use-package~ keyword ~auto-insert~ which allows one to define an
+entry for ~auto-insert-alist~.
+#+begin_src emacs-lisp
+(use-package autoinsert
+  :demand t
+  :hook (emacs-startup-hook . auto-insert-mode)
+  :config
+  (with-eval-after-load "use-package-core"
+    (add-to-list 'use-package-keywords ':auto-insert)
+    (defun use-package-normalize/:auto-insert (_name-symbol _keyword args)
+      args)
+    (defun use-package-handler/:auto-insert (name _keyword args rest state)
+      (use-package-concat
+       (use-package-process-keywords name rest state)
+       (mapcar
+        #'(lambda (arg)
+            `(add-to-list
+              'auto-insert-alist
+              ',arg))
+        args)))))
+#+end_src
+*** Yasnippet
+Look at the snippets [[file:../.config/yasnippet/snippets/][folder]]
+for all snippets I've got.
+#+begin_src emacs-lisp
+(use-package yasnippet
+  :straight t
+  :defer t
+  :hook
+  (prog-mode-hook . yas-minor-mode)
+  (text-mode-hook . yas-minor-mode)
+  :general
+  (insert-leader
+    "i" #'yas-insert-snippet)
+  :config
+  (yas-load-directory (no-littering-expand-etc-file-name "yasnippet/snippets")))
 #+end_src
+*** WAIT Hydra
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
+Hydra is a great package by =abo-abo= (yes the same guy who made ivy
+and swiper) and I hope to use it later on in the config.  There are
+two use-package declarations here: one for ~hydra~ itself, and the
+other for ~use-package-hydra~ which provides the keyword ~:hydra~ in
+use-package declarations.
+#+begin_src emacs-lisp
+(use-package hydra
+  :straight t)
+
+(use-package use-package-hydra
+  :straight t)
+#+end_src
+* Small packages
 ** Info
 Info is GNU's attempt at better man pages.  Most Emacs packages have
 info pages so I'd like nice navigation options.
 #+begin_src emacs-lisp
 (use-package info
-  :straight nil
+  :defer t
   :general
   (nmmap
     :keymaps 'Info-mode-map
@@ -439,13 +1168,13 @@ info pages so I'd like nice navigation options.
     "RET" #'Info-follow-nearest-node))
 #+end_src
 ** Display line numbers
-I don't really like line numbers, I find them similar to [[*Fringes][fringes]] as
-useless space, but at least it provides some information.  Sometimes
-it can help with doing repeated commands so a toggle option is
-necessary.
+I don't really like line numbers, I find them similar to
+[[*Fringes][fringes]] as useless space, but at least it provides some
+information.  Sometimes it can help with doing repeated commands so a
+toggle option is necessary.
 #+begin_src emacs-lisp
 (use-package display-line-numbers
-  :straight nil
+  :defer t
   :commands display-line-numbers-mode
   :general
   (mode-leader
@@ -453,7 +1182,7 @@ necessary.
   :init
   (setq-default display-line-numbers-type 'relative))
 #+end_src
-** WIP esup
+** WAIT esup
 :PROPERTIES:
 :header-args:emacs-lisp: :tangle no
 :END:
@@ -471,44 +1200,15 @@ current instance to test it immediately.
 really need this in my config at all times.  Enable when needed.
 #+begin_src emacs-lisp
 (use-package esup
+  :straight t
   :defer t)
 #+end_src
-** xref
-Find definitions, references and general objects using tags without
-external packages.  Provided by default in Emacs and just requires a
-way of generating a =TAGS= file for your project.  Helps with minimal
-setups for programming without heavier packages like [[*Eglot][Eglot]].
-
-[[*Projectile][Projectile]] provides a nice way to generate tags.
-#+begin_src emacs-lisp
-(use-package xref
-  :straight nil
-  :display
-  ("\\*xref\\*"
-   (display-buffer-at-bottom)
-   (inhibit-duplicate-buffer . t)
-   (window-height . 0.25))
-  :general
-  (code-leader
-    "t" '(nil :which-key "Tags"))
-  (code-leader
-    :infix "t"
-    "t" #'xref-find-apropos
-    "d" #'xref-find-definitions
-    "r" #'xref-find-references)
-  (nmmap
-    :keymaps 'xref--xref-buffer-mode-map
-    "RET" #'xref-goto-xref
-    "J" #'xref-next-line
-    "K" #'xref-prev-line
-    "g" #'xref-revert-buffer
-    "q" #'quit-window))
-#+end_src
 ** Hl-line
-Highlights the current line, much better than a blinking cursor.
+Highlights the current line.
 #+begin_src emacs-lisp
 (use-package hl-line
   :straight t
+  :defer t
   :hook (text-mode-hook . hl-line-mode)
   :hook (prog-mode-hook . hl-line-mode))
 #+end_src
@@ -516,54 +1216,25 @@ Highlights the current line, much better than a blinking cursor.
 Recentf provides a method of keeping track of recently opened files.
 #+begin_src emacs-lisp
 (use-package recentf
-  :straight nil
+  :defer t
   :hook (emacs-startup-hook . recentf-mode))
 #+end_src
-** Projectile
-Projectile is a project management package which integrates with Emacs
-very well.  It essentially provides alternative Emacs commands scoped
-to the current 'project', based on differing signs that a directory is
-a 'project'.
-#+begin_src emacs-lisp
-(use-package projectile
-  :after evil
-  :hook (emacs-startup-hook . projectile-mode)
-  :general
-  (general-def
-    :keymaps 'projectile-command-map
-    "t" #'projectile-test-project
-    "r" #'projectile-run-project
-    "q" #'projectile-replace-regexp)
-  (leader "p" '(projectile-command-map :which-key "Projectile"))
-  (nmap
-    "<f5>" #'projectile-compile-project
-    "<f6>" #'projectile-configure-project
-    "<f7>" #'projectile-test-project)
-  :init
-  (setq projectile-tags-command "ctags -Re -f \"%s\" %s \"%s\""
-        projectile-enable-caching t))
-#+end_src
-*** Counsel projectile
-Counsel integration for projectile commands, very nice.
-#+begin_src emacs-lisp
-(use-package counsel-projectile
-  :after (projectile counsel)
-  :config
-  (counsel-projectile-mode +1))
-#+end_src
 ** Avy
 Setup avy with leader.  As I use ~avy-goto-char-timer~ a lot, use the
 ~C-s~ bind which replaces isearch.  Switch isearch to M-s in case I
 need to use it.
 #+begin_src emacs-lisp
 (use-package avy
-  :after evil
+  :straight t
+  :defer t
   :general
   (nmmap
+    :keymaps 'override
     "C-s" #'avy-goto-char-timer
-    "M-s" #'isearch-forward)
-  (search-leader
-    "l" #'avy-goto-line))
+    "M-s" #'isearch-forward
+    "gp"  #'avy-move-region
+    "gl"  #'avy-goto-line
+    "gw"  #'avy-goto-word-1))
 #+end_src
 ** Ace window
 Though evil provides a great many features in terms of window
@@ -572,20 +1243,33 @@ management of windows (closing, switching, etc).
 
 #+begin_src emacs-lisp
 (use-package ace-window
-  :after evil
+  :straight t
+  :defer t
   :custom
   (aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l))
   :general
   (nmmap
     [remap evil-window-next] #'ace-window))
 #+end_src
+** Ace link
+Avy-style link following!
+#+begin_src emacs-lisp
+(use-package ace-link
+  :straight t
+  :defer t
+  :general
+  (nmmap
+    :keymaps 'override
+    "gL" #'ace-link))
+#+end_src
 ** Helpful
 Helpful provides a modernised interface for some common help
 commands.  I replace ~describe-function~, ~describe-variable~ and
 ~describe-key~ by their helpful counterparts.
 #+begin_src emacs-lisp
 (use-package helpful
-  :after ivy
+  :straight t
+  :defer t
   :commands (helpful-callable helpful-variable)
   :general
   (general-def
@@ -605,19 +1289,11 @@ Which key uses the minibuffer when performing a keybind to provide
 possible options for the next key.
 #+begin_src emacs-lisp
 (use-package which-key
+  :straight t
+  :defer t
   :config
   (which-key-mode))
 #+end_src
-** Keychord
-Keychord is only really here for this one chord I wish to define: "jk"
-for exiting insert state.
-#+begin_src emacs-lisp
-(use-package key-chord
-  :after evil
-  :config
-  (key-chord-define evil-insert-state-map "jk" #'evil-normal-state)
-  (key-chord-mode))
-#+end_src
 ** (Rip)grep
 Grep is a great piece of software, a necessary tool in any Linux
 user's inventory.  By default Emacs has a family of functions to use
@@ -631,7 +1307,7 @@ Ripgrep is a Rust program that attempts to perform better than grep,
 and it actually does.  This is because of a set of optimisations, such
 as checking the =.gitignore= to exclude certain files from being
 searched.  The ripgrep package provides utilities to ripgrep projects
-and files for strings.  Though [[file:core.org::*Ivy][ivy]] comes with
+and files for strings.  Though [[*Ivy][ivy]] comes with
 ~counsel-rg~, it uses Ivy's completion framework rather than the
 ~compilation~ style buffers, which sometimes proves very useful.
 
@@ -642,27 +1318,51 @@ I have no use for standard 'grep'; ~counsel-swiper~ does the same
 thing faster and within Emacs lisp.  ~rgrep~ is useful though.
 #+begin_src emacs-lisp
 (use-package grep
-  :straight nil
+  :defer t
   :display
   ("^\\*grep.*"
    (display-buffer-at-bottom display-buffer-reuse-window)
-   (window-height . 0.25)
+   (window-height . 0.35)
    (reusable-frames . t))
   :general
   (search-leader
-    "d" #'rgrep))
+    "d" #'rgrep)
+  (nmmap
+    :keymaps 'grep-mode-map
+    "0" #'evil-beginning-of-line
+    "q" #'quit-window
+    "i" #'wgrep-change-to-wgrep-mode
+    "c" #'recompile)
+  (nmmap
+    :keymaps 'wgrep-mode-map
+    "q"  #'evil-record-macro
+    "ZZ" #'wgrep-finish-edit
+    "ZQ" #'wgrep-abort-changes)
+  :config
+  ;; Without this wgrep doesn't work properly
+  (evil-set-initial-state 'grep-mode 'normal))
 #+end_src
 *** rg
 #+begin_src emacs-lisp
 (use-package rg
-  :after grep
+  :straight t
+  :defer t
+  :display
+  ("^\\*\\*ripgrep\\*\\*"
+   (display-buffer-at-bottom display-buffer-reuse-window)
+   (window-height . 0.35)
+   (reusable-frames . t))
   :general
   (search-leader
-    "R" #'rg)
-  (:keymaps 'rg-mode-map
-   "]]" #'rg-next-file
-   "[[" #'rg-prev-file
-   "q"  #'quit-window)
+    "r" #'rg)
+  (nmmap
+    :keymaps 'rg-mode-map
+    "c"  #'rg-recompile
+    "C"  #'rg-rerun-toggle-case
+    "]]" #'rg-next-file
+    "[[" #'rg-prev-file
+    "q"  #'quit-window
+    "i"  #'wgrep-change-to-wgrep-mode)
   :init
   (setq rg-group-result t
         rg-hide-command t
@@ -670,7 +1370,9 @@ thing faster and within Emacs lisp.  ~rgrep~ is useful though.
         rg-show-header t
         rg-custom-type-aliases nil
         rg-default-alias-fallback "all"
-        rg-buffer-name "*ripgrep*"))
+        rg-buffer-name "*ripgrep*")
+  :config
+  (evil-set-initial-state 'rg-mode 'normal))
 #+end_src
 ** Olivetti
 Olivetti provides a focus mode for Emacs, which makes it look a bit
@@ -680,15 +1382,19 @@ when turned off will reinsert them - provides a nice way to quickly
 focus on a buffer.
 #+begin_src emacs-lisp
 (use-package olivetti
+  :straight t
+  :defer t
   :commands (+olivetti-mode)
   :general
   (mode-leader
     "o" #'+olivetti-mode)
   :init
-  (setq-default olivetti-body-width 0.7)
-  (setq olivetti-style nil)
-  (add-hook 'olivetti-mode-on-hook  (proc (interactive) (text-scale-increase 1)))
-  (add-hook 'olivetti-mode-off-hook (proc (interactive) (text-scale-decrease 1)))
+  (setq-default olivetti-body-width 0.6)
+  (setq olivetti-style 'fancy)
+  (add-hook 'olivetti-mode-on-hook
+            (proc (interactive) (text-scale-increase 1)))
+  (add-hook 'olivetti-mode-off-hook
+            (proc (interactive) (text-scale-decrease 1)))
   :config
   (defun +olivetti-mode ()
     (interactive)
@@ -700,6 +1406,53 @@ focus on a buffer.
       (jump-to-register 1)
       (olivetti-mode 0))))
 #+end_src
+*** Presentation mode
+A simple presentation system using org-mode and olivetti.
+#+begin_src emacs-lisp
+(use-package olivetti
+  :defer t
+  :config
+  (defun +presentation/prev-slide ()
+    (interactive)
+    (when presentation-mode
+      (widen)
+      (outline-previous-visible-heading 1)
+      (end-of-line)
+      (if (org-fold-folded-p)
+          (org-cycle))
+      (org-narrow-to-subtree)))
+  (defun +presentation/next-slide ()
+    (interactive)
+    (when presentation-mode
+      (widen)
+      (outline-next-visible-heading 1)
+      (end-of-line)
+      (if (org-fold-folded-p)
+          (org-cycle))
+      (org-narrow-to-subtree)))
+  (defvar presentation-mode-map (make-sparse-keymap))
+  (define-minor-mode presentation-mode
+    "When in org-mode, use each heading like a slide!"
+    :lighter nil
+    :keymap presentation-mode-map
+    (cond
+     (presentation-mode
+      (olivetti-mode t)
+      (outline-show-heading)
+      (org-narrow-to-subtree))
+     (t
+      (olivetti-mode -1)
+      (widen))))
+  :general
+  (leader
+    :states 'normal
+    :keymaps 'presentation-mode-map
+    "j" #'+presentation/next-slide
+    "k" #'+presentation/prev-slide)
+  (local-leader
+    :keymaps 'org-mode-map
+    "P" #'presentation-mode))
+#+end_src
 ** All the Icons
 Nice set of icons with a great user interface to manage them.
 #+begin_src emacs-lisp
@@ -716,7 +1469,6 @@ Custom minor mode to toggle the mode line.  Check it out at
 [[file:elisp/hide-mode-line.el][elisp/hide-mode-line.el]].
 #+begin_src emacs-lisp
 (use-package hide-mode-line
-  :straight nil
   :load-path "elisp/"
   :defer t
   :general
@@ -729,7 +1481,7 @@ Saves current place in a buffer permanently, so on revisiting the file
 at last.
 #+begin_src emacs-lisp
 (use-package saveplace
-  :straight nil
+  :defer t
   :config
   (save-place-mode))
 #+end_src
@@ -741,19 +1493,19 @@ text.  That's what this is mainly for.
 
 #+begin_src emacs-lisp
 (use-package rot13
-  :straight nil
+  :defer t
   :general
   (mode-leader
     "r" #'toggle-rot13-mode))
 #+end_src
 ** Licensing
 Loads [[file:elisp/license.el][license.el]] for inserting licenses.
-Licenses are important for distribution and attribution to be defined clearly.
+Licenses are important for distribution and attribution to be defined
+clearly.
 #+begin_src emacs-lisp
 (use-package license
-  :straight nil
+  :defer t
   :load-path "elisp/"
-  :demand t
   :general
   (insert-leader
     "l" #'+license/insert-copyright-notice
@@ -765,7 +1517,7 @@ some details.  Useful to know on a long Emacs instance what could be
 eating up memory.
 #+begin_src emacs-lisp
 (use-package memory-report
-  :straight nil
+  :defer t
   :general
   (leader
     "qm" #'memory-report))
@@ -773,19 +1525,934 @@ eating up memory.
 ** Save minibuffer history
 #+begin_src emacs-lisp
 (use-package savehist
-  :straight nil
+  :defer t
   :config
   (savehist-mode t))
 #+end_src
-* Applications (loading)
+** Drag Stuff
+#+begin_src emacs-lisp
+(use-package drag-stuff
+  :straight t
+  :defer t
+  :general
+  (nmmap
+    "C-M-h" #'drag-stuff-left
+    "C-M-j" #'drag-stuff-down
+    "C-M-k" #'drag-stuff-up
+    "C-M-l" #'drag-stuff-right))
+#+end_src
+** Searching git directories efficiently
+Using [[file:elisp/search.el][search.el]] I can search a set of
+directories particularly efficiently.
+#+begin_src emacs-lisp
+(use-package search
+  :defer t
+  :load-path "elisp/"
+  :general
+  (file-leader
+    "P" #'+search/find-file
+    "S" #'+search/search-all))
+#+end_src
+** Bookmarks
+I maintain a bookmarks file at =~/Text/bookmarks.org=.  I would like
+the ability to construct new bookmarks and open bookmarks.  They may
+be either articles I want to read, useful information documents or
+just straight up youtube videos.  This
+[[file:elisp/bookmark.el][library]] does the appropriate dispatching
+and work for me.
+
+#+begin_src emacs-lisp
+(use-package org-bookmark
+  :load-path "elisp/"
+  :general
+  (file-leader
+    "b" #'+bookmark/open-bookmark))
+#+end_src
+* Applications
 Emacs is basically an operating system whose primary datatype is text.
 Applications are interfaces/environments which serve a variety of
-purposes, but provide a lot of capability.  I have a
-[[file:app.org][separate file]] for such configuration (2023-09-29:
-mainly because it was so goddamn huge).
+purposes, but provide a lot of capability.
+** WAIT Dashboard
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
+Dashboard creates a custom dashboard for Emacs that replaces the
+initial startup screen in default Emacs.  It has a lot of customising
+options.
+
+Unfortunately not that useful, many things are easier to invoke
+directly such as recent files or project changing.
+#+begin_src emacs-lisp
+(use-package dashboard
+  :straight t
+  :demand t
+  :general
+  (app-leader
+    "b" #'dashboard-refresh-buffer)
+  (:states '(normal motion emacs)
+   :keymaps 'dashboard-mode-map
+   "q" (proc (interactive) (kill-this-buffer)))
+  (nmmap
+    :keymaps 'dashboard-mode-map
+    "r" #'dashboard-jump-to-recent-files
+    "p" #'dashboard-jump-to-projects
+    "}" #'dashboard-next-section
+    "{" #'dashboard-previous-section)
+  :init
+  (setq initial-buffer-choice nil
+        dashboard-banner-logo-title "Oreomacs"
+        dashboard-center-content t
+        dashboard-set-init-info t
+        dashboard-startup-banner (no-littering-expand-etc-file-name "dashboard/logo.png")
+        dashboard-set-footer t
+        dashboard-set-navigator t
+        dashboard-items '((projects . 5)
+                          (recents . 5))
+        dashboard-footer-messages (list
+                                   "Collecting parentheses..."
+                                   "Linking 'coffee_machine.o'..."
+                                   "Uploading ip to hacker named 4chan..."
+                                   "Dividing by zero..."
+                                   "Solving 3-sat..."
+                                   "Obtaining your health record..."
+                                   (format "Recompiling Emacs for the %dth time..." (random 1000))
+                                   "Escaping the cycle of samsara..."))
+  :config
+  (dashboard-setup-startup-hook))
+#+end_src
+** EWW
+Emacs Web Wowser is the inbuilt text based web browser for Emacs.  It
+can render images and basic CSS styles but doesn't have a JavaScript
+engine, which makes sense as it's primarily a text interface.
+#+begin_src emacs-lisp
+(use-package eww
+  :defer t
+  :general
+  (app-leader
+    "w" #'eww)
+  (nmmap
+    :keymaps 'eww-mode-map
+    "w" #'evil-forward-word-begin
+    "Y" #'shr-probe-and-copy-url)
+  :config
+  (with-eval-after-load "evil-collection"
+    (evil-collection-eww-setup)))
+#+end_src
+** Calendar
+Calendar is a simple inbuilt application that helps with date
+functionalities.  I add functionality to copy dates from the calendar
+to the kill ring and bind it to "Y".
+#+begin_src emacs-lisp
+(use-package calendar
+  :defer t
+  :commands (+calendar/copy-date +calendar/toggle-calendar)
+  :display
+  ("\\*Calendar\\*"
+   (display-buffer-at-bottom)
+   (inhibit-duplicate-buffer . t)
+   (window-height . 0.17))
+  :general
+  (nmmap
+    :keymaps 'calendar-mode-map
+    "Y" #'+calendar/copy-date)
+  (app-leader
+    "d" #'calendar)
+  :config
+  (defun +calendar/copy-date ()
+    "Copy date under cursor into kill ring."
+    (interactive)
+    (if (use-region-p)
+        (call-interactively #'kill-ring-save)
+      (let ((date (calendar-cursor-to-date)))
+        (when date
+          (setq date (encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date)))
+          (kill-new (format-time-string "%Y-%m-%d" date)))))))
+#+end_src
+** Mail
+Mail is a funny thing; most people use it just for business or
+advertising and it's come out of use in terms of personal
+communication in the west for the most part (largely due to "social"
+media applications).  However, this isn't true for the open source and
+free software movement who heavily use mail for communication.
+
+Integrating mail into Emacs helps as I can send source code and
+integrate it into my workflow just a bit better.
+*** Notmuch
+#+begin_src emacs-lisp
+(use-package notmuch
+  :straight t
+  :defer t
+  :commands (notmuch +mail/flag-thread)
+  :general
+  (app-leader "m" #'notmuch)
+  (nmap
+    :keymaps 'notmuch-search-mode-map
+    "f" #'+mail/flag-thread)
+  :init
+  (defconst +mail/signature "---------------\nAryadev Chavali")
+  (defconst +mail/local-dir (no-littering-expand-var-file-name "mail/"))
+  (setq notmuch-show-logo nil
+        notmuch-search-oldest-first nil
+        notmuch-hello-sections '(notmuch-hello-insert-saved-searches
+                                 notmuch-hello-insert-alltags
+                                 notmuch-hello-insert-recent-searches)
+        notmuch-archive-tags '("-inbox" "-unread" "+archive")
+        mail-signature +mail/signature
+        mail-default-directory +mail/local-dir
+        mail-source-directory +mail/local-dir
+        message-signature +mail/signature
+        message-auto-save-directory +mail/local-dir
+        message-directory +mail/local-dir)
+
+  (defun +mail/sync-mail ()
+    "Sync mail via mbsync."
+    (interactive)
+    (start-process-shell-command "" nil "mbsync -a"))
+  (defun +mail/trash-junk ()
+    "Delete any mail in junk"
+    (interactive)
+    (start-process-shell-command "" nil "notmuch search --output=files --format=text0 tag:deleted tag:spam tag:trash tag:junk | xargs -r0 rm"))
+  :config
+  (defun +mail/flag-thread (&optional unflag beg end)
+    (interactive (cons current-prefix-arg (notmuch-interactive-region)))
+    (notmuch-search-tag
+     (notmuch-tag-change-list '("-inbox" "+flagged") unflag) beg end)
+    (when (eq beg end)
+      (notmuch-search-next-thread)))
+
+  (advice-add #'notmuch-poll-and-refresh-this-buffer :after
+              #'+mail/trash-junk)
+  (with-eval-after-load "evil-collection"
+    (evil-collection-notmuch-setup)))
+#+end_src
+*** Smtpmail
+#+begin_src emacs-lisp
+(use-package smtpmail
+  :defer t
+  :commands mail-send
+  :init
+  (setq-default
+   smtpmail-smtp-server "mail.aryadevchavali.com"
+   smtpmail-smtp-user "aryadev"
+   smtpmail-smtp-service 587
+   smtpmail-stream-type 'starttls
+   send-mail-function #'smtpmail-send-it
+   message-send-mail-function #'smtpmail-send-it))
+#+end_src
+** Dired
+Setup for dired.  Make dired-hide-details-mode the default mode when
+using dired-mode, as it removes the clutter.  Setup evil collection
+for dired (even though dired doesn't really conflict with evil, there
+are some corners I'd like to adjust).
+#+begin_src emacs-lisp
+(use-package dired
+  :demand t
+  :commands (dired find-dired)
+  :hook
+  (dired-mode-hook              . auto-revert-mode)
+  (dired-mode-hook              . dired-hide-details-mode)
+  :init
+  (setq-default dired-listing-switches "-AFBlu --group-directories-first"
+                dired-omit-files "^\\."
+                dired-dwim-target t
+                image-dired-external-viewer "nsxiv")
+  (with-eval-after-load "evil-collection"
+    (evil-collection-dired-setup))
+  :general
+  (nmmap
+    :keymaps 'dired-mode-map
+    "SPC"   nil
+    "SPC ," nil
+    "T"     #'dired-create-empty-file
+    "H"     #'dired-up-directory
+    "L"     #'dired-find-file)
+  (dir-leader
+    "f" #'find-dired
+    "d" #'dired
+    "D" #'dired-other-window
+    "i" #'image-dired
+    "p" `(,(proc (interactive)
+                 (dired "~/Text/PDFs/"))
+          :which-key "Open PDFs"))
+  (local-leader
+    :keymaps 'dired-mode-map
+    "i" #'dired-maybe-insert-subdir
+    "I" #'+dired/insert-all-subdirectories
+    "k" #'dired-prev-subdir
+    "j" #'dired-next-subdir
+    "K" #'dired-kill-subdir
+    "m" #'dired-mark-files-regexp
+    "u" #'dired-undo)
+  (nmmap
+    :keymaps 'image-dired-thumbnail-mode-map
+    "h" #'image-dired-backward-image
+    "l" #'image-dired-forward-image
+    "j" #'image-dired-next-line
+    "k" #'image-dired-previous-line
+    "H" #'image-dired-display-previous
+    "L" #'image-dired-display-next
+    "RET" #'image-dired-display-this
+    "m" #'image-dired-mark-thumb-original-file
+    "q" #'quit-window)
+  :config
+  (add-to-list 'dired-guess-shell-alist-user '("\\.pdf\\'" "zathura"))
+  (defun +dired/insert-all-subdirectories ()
+    "Insert all subdirectories currently viewable."
+    (interactive)
+    (dired-mark-directories nil)
+    (mapc #'dired-insert-subdir (dired-get-marked-files))
+    (dired-unmark-all-marks)))
+#+end_src
+*** fd-dired
+Uses fd for finding file results in a directory: ~find-dired~ ->
+~fd-dired~.
+
+#+begin_src emacs-lisp
+(use-package fd-dired
+  :straight t
+  :after dired
+  :general
+  (dir-leader
+    "g" #'fd-dired))
+#+end_src
+*** wdired
+Similar to [[*(Rip)grep][wgrep]] =wdired= provides
+the ability to use Emacs motions and editing on file names.  This
+makes stuff like mass renaming and other file management tasks way
+easier than even using the mark based system.
+#+begin_src emacs-lisp
+(use-package wdired
+  :straight t
+  :after dired
+  :general
+  (nmmap
+    :keymaps 'dired-mode-map
+    "W" #'wdired-change-to-wdired-mode)
+  (nmmap
+    :keymaps 'wdired-mode-map
+    "ZZ" #'wdired-finish-edit
+    "ZQ" #'wdired-abort-changes))
+#+end_src
+** WAIT Xwidget
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
+Xwidget is a package which allows for the insertion of arbitrary
+xwidgets into Emacs through buffers.  It must be compiled into Emacs
+so you might need to customise your install.  One of its premier uses
+is in navigating the web which it provides through the function
+~xwidget-webkit-browse-url~.  This renders a fully functional web
+browser within Emacs.
+
+Though I am not to keen on using Emacs to browse the web /via/ xwidget
+(EWW does a good job on its own), I am very interested in its
+capability to render pages with JavaScript, as it may come of use when
+doing web development.  I can see the results of work very quickly
+without switching windows all within Emacs.
+
+2023-10-20: Disabled as it didn't seem to work, and honestly wasn't
+that useful.
+*** Xwidget Core
+#+begin_src emacs-lisp
+(use-package xwidget
+  :general
+  (app-leader
+    "u" #'xwidget-webkit-browse-url)
+  (nmmap
+    :keymaps 'xwidget-webkit-mode-map
+    "q"         #'quit-window
+    "h"         #'xwidget-webkit-scroll-backward
+    "j"         #'xwidget-webkit-scroll-up
+    "k"         #'xwidget-webkit-scroll-down
+    "l"         #'xwidget-webkit-scroll-forward
+    "+"         #'xwidget-webkit-zoom-in
+    "-"         #'xwidget-webkit-zoom-out
+    (kbd "C-f") #'xwidget-webkit-scroll-up
+    (kbd "C-b") #'xwidget-webkit-scroll-down
+    "H"         #'xwidget-webkit-back
+    "L"         #'xwidget-webkit-forward
+    "gu"        #'xwidget-webkit-browse-url
+    "gr"        #'xwidget-webkit-reload
+    "gg"        #'xwidget-webkit-scroll-top
+    "G"         #'xwidget-webkit-scroll-bottom))
+#+end_src
+*** Xwidget Extensions
+Define a function ~+xwidget/render-file~ that reads a file name and
+presents it in an xwidget.  If the current file is an HTML file, ask
+if user wants to open current file.  Bind it to ~aU~ in the leader.
+
+Also define a function ~+xwidget/search-query~ that first asks the
+user what search engine they want to use
+([[https://duckduckgo.com][Duck Duck Go]] and
+[[https://devdocs.io][DevDocs]] currently) then asks for a query,
+which it parses then presents in an xwidget window.  Bind to ~as~ in
+the leader.
+#+begin_src emacs-lisp
+(use-package xwidget
+  :commands (+xwidget/render-file +xwidget/search)
+  :general
+  (app-leader
+    "U" #'+xwidget/render-file
+    "s" #'+xwidget/search)
+  :config
+  (setenv "WEBKIT_FORCE_SANDBOX" "0")
+  (defun +xwidget/render-file (&optional FORCE)
+    "Find file (or use current file) and render in xwidget."
+    (interactive)
+    (cond
+     ((and (not FORCE) (or (string= (replace-regexp-in-string ".*.html"
+                                                              "html" (buffer-name)) "html")
+                           (eq major-mode 'web-mode)
+                           (eq major-mode 'html-mode))) ; If in html file
+      (if (y-or-n-p "Open current file?: ") ; Maybe they want to open a separate file
+          (xwidget-webkit-browse-url (format "file://%s" (buffer-file-name)))
+        (+xwidget/render-file t))) ; recurse and open file via prompt
+     (t
+      (xwidget-webkit-browse-url
+       (format "file://%s" (read-file-name "Enter file to open: "))))))
+
+  (defun +xwidget/search ()
+    "Run a search query on some search engine and display in
+xwidget."
+    (interactive)
+    (let* ((engine (completing-read "Engine: " '("duckduckgo.com" "devdocs.io") nil t))
+           (query-raw (read-string "Enter query: "))
+           (query
+            (cond
+             ((string= engine "duckduckgo.com") query-raw)
+             ((string= engine "devdocs.io") (concat "_ " query-raw)))))
+      (xwidget-webkit-browse-url (concat "https://" engine "/?q=" query)))))
+#+end_src
+** Eshell
+*** Why Eshell?
+Eshell is an integrated shell environment for Emacs, written in Emacs
+Lisp.  I argue that it is the best shell/command interpreter to use in
+Emacs.
+
+Eshell is unlike the alternatives in Emacs as it's a /shell/ first,
+not a terminal emulator. It has the ability to spoof some aspects of a
+terminal emulator (through the shell parser), but it is NOT a terminal
+emulator.
+
+The killer benefits of eshell (which would appeal to Emacs users) are
+a direct result of eshell being written in Emacs lisp:
+- incredible integration with Emacs utilities (such as ~dired~,
+  ~find-file~, any read functions, etc)
+- very extensible, easy to write new commands which leverage Emacs
+  commands as well as external utilities
+- agnostic of platform: "eshell/cd" will call the underlying change
+  directory function for you, so commands will (usually) mean the same
+  thing regardless of platform
+  - this means as long as Emacs can run on an operating system, one
+    may run eshell
+
+However, my favourite feature of eshell is the set of evaluators that
+run on command input.  Some of the benefits listed above come as a
+result of this powerful feature. These evaluators are described below.
+
+Lisp evaluator: works on braced expressions, evaluating them as Lisp
+expressions (e.g. ~(message "Hello, World!\n")~).  Any returned
+objects are printed.  This makes eshell a LISP REPL!
+
+External evaluator: works within curly braces, evaluating them via
+some external shell process (like sh) (e.g. ~{echo "Hello,
+world!\n"}~).  This makes eshell a (kinda dumb) terminal emulator!
+
+The alias evaluator is the top level evaluator.  It is the main
+evaluator for each expression given to eshell.  When given an
+expression it tries to evaluate it by testing against these conditions:
+- it's an alias defined by the user or in the ~eshell/~ namespace of
+  functions (simplest evaluator)
+- it's some form of lisp expression (lisp evaluator)
+- it's an external command (bash evaluator)
+Essentially, you get the best of both Emacs and external shell
+programs *ALL WITHIN* Emacs for free.
+*** Eshell functionality
+Bind some evil-like movements for easy shell usage, and a toggle
+function to pull up the eshell quickly.
+#+begin_src emacs-lisp
+(use-package eshell
+  :defer t
+  :general
+  (shell-leader
+    "t" #'eshell)
+  :init
+  (add-hook
+   'eshell-mode-hook
+   (proc
+    (interactive)
+    (general-def
+      :states '(normal insert)
+      :keymaps 'eshell-mode-map
+      "M-j" #'eshell-next-matching-input-from-input
+      "M-k" #'eshell-previous-matching-input-from-input)
+    (local-leader
+      :keymaps 'eshell-mode-map
+      "c" (proc (interactive) (eshell/clear)
+                (recenter))
+      "k" #'eshell-kill-process))))
+#+end_src
+*** Eshell pretty symbols and display
+Pretty symbols and a display record.
+#+begin_src emacs-lisp
+(use-package eshell
+  :defer t
+  :pretty
+  (eshell-mode-hook
+   ("lambda"  . "λ")
+   ("numberp" . "ℤ")
+   ("t"       . "⊨")
+   ("nil"     . "Ø"))
+  :display
+  ("\\*e?shell\\*" ; for general shells as well
+   (display-buffer-at-bottom)
+   (window-height . 0.33)))
+#+end_src
+*** Eshell variables and aliases
+Set some sane defaults, a banner and a prompt.  The prompt checks for
+a git repo in the current directory and provides some extra
+information in that case (in particular, branch name and if there any
+changes that haven't been committed).
+
+#+begin_src emacs-lisp
+(use-package eshell
+  :defer t
+  :config
+  (defun +eshell/--git-get-remote-status ()
+    (let* ((branch-status (split-string
+                           (shell-command-to-string "git status | grep 'Your branch is'")))
+           (status (nth 3 branch-status))
+           (diff (cl-position "by" branch-status :test #'string=)))
+      (if (null diff)
+          (propertize "=" 'font-lock-face '(:foreground "green"))
+        (let ((n (nth (+ 1 diff) branch-status)))
+          (concat
+           (cond
+            ((string= status "ahead")
+             (propertize "→ " 'font-lock-face '(:foreground "dodger blue")))
+            ((string= status "behind")
+             (propertize "← " 'font-lock-face '(:foreground "orange red"))))
+           n)))))
+
+  (defun +eshell/--git-get-change-status ()
+    (let ((changed-files (- (length (split-string (shell-command-to-string "git status -s" ) "\n")) 1)))
+      (if (= changed-files 0)
+          (propertize "✓" 'font-lock-face '(:foreground "green"))
+        (propertize (number-to-string changed-files) 'font-lock-face '(:foreground "red")))))
+
+  (defun +eshell/get-git-properties ()
+    (let ((git-branch (shell-command-to-string "git branch")))
+      (if (or (string= git-branch "")
+             (not (string= "*" (substring git-branch 0 1))))
+          ""
+        (format
+         "(%s<%s>[%s])"
+         (nth 2 (split-string git-branch "\n\\|\\*\\| "))
+         (+eshell/--git-get-change-status)
+         (+eshell/--git-get-remote-status)))))
+
+  (defun +eshell/prompt-function ()
+    (let ((git (+eshell/get-git-properties)))
+      (mapconcat
+       (lambda (item)
+         (if (listp item)
+             (propertize (car item)
+                         'read-only t
+                         'font-lock-face (cdr item)
+                         'front-sticky   '(font-lock-face read-only)
+                         'rear-nonsticky '(font-lock-face read-only))
+           item))
+       (list
+        '("[")
+        `(,(abbreviate-file-name (eshell/pwd)) :foreground "LimeGreen")
+        '("]")
+        (if (string= git "")
+            ""
+          (concat "-" git ""))
+        "\n"
+        `(,(format-time-string "[%H:%M:%S]") :foreground "purple")
+        "\n"
+        '("𝜆> " :foreground "DeepSkyBlue")))))
+
+  (defun +eshell/banner-message ()
+    (concat (shell-command-to-string "~/.local/scripts/cowfortune")
+            "\n"))
+
+  (setq eshell-cmpl-ignore-case t
+        eshell-cd-on-directory t
+        eshell-banner-message '(+eshell/banner-message)
+        eshell-highlight-prompt nil
+        eshell-prompt-function #'+eshell/prompt-function
+        eshell-prompt-regexp "^𝜆> "))
+#+end_src
+*** Eshell change directory quickly
+Add ~eshell/goto~, which is actually a command accessible from within
+eshell (this is because ~eshell/*~ creates an accessible function
+within eshell with name ~*~).  ~eshell/goto~ makes it easier to change
+directories by using Emacs' find-file interface (which is much faster
+than ~cd ..; ls -l~).
+
+~eshell/goto~ is a better ~cd~ for eshell.  However it is really just
+a plaster over a bigger issue for my workflow; many times I want
+eshell to be present in the current directory of the buffer I am
+using.  So here's also a command for opening eshell with the current
+directory.
+#+begin_src emacs-lisp
+(use-package eshell
+  :defer t
+  :general
+  (leader
+    "T" #'+eshell/current-buffer)
+  :config
+  (defun eshell/goto (&rest args)
+    "Use `read-directory-name' to change directories."
+    (eshell/cd (list (read-directory-name "Directory?: "))))
+
+  (defun eshell/project-root (&rest args)
+    "Change to directory `project-root'"
+    (if (project-current)
+        (eshell/cd (list (project-root (project-current))))
+      (eshell/echo (format "[%s]: No project in current directory"
+                           (propertize "Error" 'font-lock-face '(:foreground "red"))))))
+
+  (defun +eshell/current-buffer ()
+    (interactive)
+    (let  ((dir (if buffer-file-name
+                    (file-name-directory buffer-file-name)
+                  default-directory))
+           (buf (eshell)))
+      (if dir
+          (with-current-buffer buf
+            (eshell/cd dir)
+            (eshell-send-input))
+        (message "Could not switch eshell: buffer is not real file")))))
+#+end_src
+** WAIT Elfeed
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
+Elfeed is the perfect RSS feed reader, integrated into Emacs
+perfectly.  I've got a set of feeds that I use for a large variety of
+stuff, mostly media and entertainment.  I've also bound "<leader> ar"
+to elfeed for loading the system.
+#+begin_src emacs-lisp
+(use-package elfeed
+  :general
+  (app-leader "r" #'elfeed)
+  (nmmap
+    :keymaps 'elfeed-search-mode-map
+    "gr"       #'elfeed-update
+    "s"        #'elfeed-search-live-filter
+    "<return>" #'elfeed-search-show-entry)
+  :init
+  (setq elfeed-db-directory (no-littering-expand-var-file-name "elfeed/"))
 
+  (setq +rss/feed-urls
+        '(("Arch Linux"
+           "https://www.archlinux.org/feeds/news/"
+           News Technology)
+          ("The Onion"
+           "https://www.theonion.com/rss"
+           Social)
+          ("Protesilaos Stavrou"
+           "https://www.youtube.com/@protesilaos"
+           YouTube Technology)
+          ("Tsoding Daily"
+           "https://www.youtube.com/feeds/videos.xml?channel_id=UCrqM0Ym_NbK1fqeQG2VIohg"
+           YouTube Technology)
+          ("Tsoding"
+           "https://www.youtube.com/feeds/videos.xml?channel_id=UCrqM0Ym_NbK1fqeQG2VIohg"
+           YouTube Technology)
+          ("Nexpo"
+           "https://www.youtube.com/feeds/videos.xml?channel_id=UCpFFItkfZz1qz5PpHpqzYBw"
+           YouTube Stories)
+          ("3B1B"
+           "https://www.youtube.com/feeds/videos.xml?channel_id=UCYO_jab_esuFRV4b17AJtAw"
+           YouTube)
+          ("Fredrik Knusden"
+           "https://www.youtube.com/feeds/videos.xml?channel_id=UCbWcXB0PoqOsAvAdfzWMf0w"
+           YouTube Stories)
+          ("Barely Sociable"
+           "https://www.youtube.com/feeds/videos.xml?channel_id=UC9PIn6-XuRKZ5HmYeu46AIw"
+           YouTube Stories)
+          ("Atrocity Guide"
+           "https://www.youtube.com/feeds/videos.xml?channel_id=UCn8OYopT9e8tng-CGEWzfmw"
+           YouTube Stories)
+          ("Hacker News"
+           "https://news.ycombinator.com/rss"
+           Social News Technology)
+          ("Hacker Factor"
+           "https://www.hackerfactor.com/blog/index.php?/feeds/index.rss2"
+           Social)))
+  :config
+  (with-eval-after-load "evil-collection"
+    (evil-collection-elfeed-setup))
+
+  (setq elfeed-feeds (cl-map 'list #'(lambda (item)
+                                       (append (list (nth 1 item)) (cdr (cdr item))))
+                             +rss/feed-urls))
+
+  (advice-add  'elfeed-search-show-entry :after #'+elfeed/dispatch-entry)
+
+  (defun +elfeed/dispatch-entry (entry)
+    "Process each type of entry differently.
+  e.g., you may want to open HN entries in eww."
+    (let ((url (elfeed-entry-link entry)))
+      (pcase url
+        ((pred (string-match-p "https\\:\\/\\/www.youtube.com\\/watch"))
+         (mpv-play-url url))
+        (_ (eww url))))))
+#+end_src
+** Magit
+Magit is *the* git porcelain for Emacs, which perfectly encapsulates
+the git cli.  In this case I just need to setup the bindings for it.
+As magit will definitely load after evil (as it must be run by a
+binding, and evil will load after init), I can use evil-collection
+freely.  Also, define an auto insert for commit messages so that I
+don't need to write everything myself.
+
+#+begin_src emacs-lisp
+(use-package magit
+  :straight t
+  :defer t
+  :display
+  ("magit:.*"
+   (display-buffer-same-window)
+   (inhibit-duplicate-buffer . t))
+  ("magit-diff:.*"
+   (display-buffer-below-selected))
+  ("magit-log:.*"
+   (display-buffer-same-window))
+  :general
+  (leader
+    "g" '(magit-dispatch :which-key "Magit"))
+  (code-leader
+    "b" #'magit-blame)
+  :auto-insert
+  (("COMMIT_EDITMSG" . "Commit skeleton")
+   ""
+   "(" (read-string "Enter feature/module: ") ")"
+   (read-string "Enter simple description: ") "\n\n")
+  :init
+  (setq vc-follow-symlinks t
+        magit-blame-echo-style 'lines
+        magit-copy-revision-abbreviated t)
+  :config
+  (with-eval-after-load "evil"
+    (evil-set-initial-state 'magit-status-mode 'motion))
+  (with-eval-after-load "evil-collection"
+    (evil-collection-magit-setup)))
+#+end_src
+** IBuffer
+IBuffer is the dired of buffers: providing the ability to mark
+buffers, mass rename/delete and just observe stuff.
+#+begin_src emacs-lisp
+(use-package ibuffer
+  :defer t
+  :general
+  (buffer-leader
+    "i" #'ibuffer)
+  :config
+  (with-eval-after-load "evil-collection"
+    (evil-collection-ibuffer-setup)))
+#+end_src
+** Proced
+Emacs has two systems for process management:
++ proced: a general 'top' like interface which allows general
+  management of linux processes
++ list-processes: a specific Emacs based system that lists processes
+  spawned by Emacs (similar to a top for Emacs specifically)
+
+Core proced config, just a few bindings and evil collection setup.
+#+begin_src emacs-lisp
+(use-package proced
+  :defer t
+  :general
+  (app-leader
+    "p" #'proced)
+  (nmap
+    :keymaps 'proced-mode-map
+    "za" #'proced-toggle-auto-update)
+  :display
+  ("\\*Proced\\*"
+   (display-buffer-at-bottom)
+   (window-height . 0.25))
+  :init
+  (setq proced-auto-update-interval 0.5)
+  :config
+  (with-eval-after-load "evil-collection"
+    (evil-collection-proced-setup)))
+#+end_src
+** Calculator
+Surprise, surprise Emacs comes with a calculator.
+
+Greater surprise, this thing is over powered.  It can perform the
+following (and more):
+- Matrix calculations
+- Generalised calculus operations
+- Equation solvers for n-degree multi-variable polynomials
+- Embedded mode (check below)!
+
+~calc-mode~ is a calculator system within Emacs that provides a
+diverse array of mathematical operations.  It uses reverse polish
+notation to do calculations (though there is a standard infix
+algebraic notation mode).
+
+Embedded mode allows computation with the current buffer as the echo
+area.  This basically means I can compute stuff within a buffer
+without invoking calc directly: $1 + 2\rightarrow_{\text{calc-embed}} 3$.
+
+#+begin_src emacs-lisp
+(use-package calc
+  :defer t
+  :display
+  ("*Calculator*"
+   (display-buffer-at-bottom)
+   (window-height . 0.18))
+  :general
+  (app-leader
+    "c" #'calc-dispatch)
+  (mode-leader
+    "c" #'calc-embedded)
+  :init
+  (setq calc-algebraic-mode t)
+  :config
+  (with-eval-after-load "evil-collection"
+    (evil-collection-calc-setup)))
+#+end_src
+*** WAIT Calctex
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
+~calc-mode~ also has a 3rd party package called ~calctex~. It renders
+mathematical expressions within calc as if they were rendered in TeX.
+You can also copy the expressions in their TeX forms, which is pretty
+useful when writing a paper.  I've set a very specific lock on this
+repository as it's got quite a messy work-tree and this commit seems to
+work for me given the various TeX utilities installed via Arch.
+
+#+begin_src emacs-lisp
+(use-package calctex
+  :after calc
+  :straight (calctex :type git :host github :repo "johnbcoughlin/calctex")
+  :hook (calc-mode-hook . calctex-mode))
+#+end_src
+** WAIT Ledger
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
+#+begin_src emacs-lisp
+(use-package ledger-mode
+  :defer t)
+
+(use-package evil-ledger
+  :after ledger-mode)
+#+end_src
+** Zone
+Of course Emacs has a cool screensaver software.
+
+#+begin_src emacs-lisp
+(use-package zone-matrix
+  :straight t
+  :defer t
+  :commands (zone)
+  :general
+  (leader
+    "z" #'zone)
+  :init
+  (setq zone-programs
+        [zone-pgm-drip
+         zone-pgm-drip-fretfully
+         zone-pgm-martini-swan-dive
+         zone-pgm-stress
+         zone-pgm-random-life]))
+#+end_src
+** (Wo)man
+Man pages are the user manuals for most software on Linux.  Really
+useful when writing code for Un*x systems, though they can be very
+verbose.
+
+2023-08-17: `Man-notify-method' is the reason the `:display' record
+doesn't work here.  I think it's to do with how Man pages are rendered
+or something, but very annoying as it's a break from standards!
+#+begin_src emacs-lisp
+(use-package man
+  :defer t
+  :init
+  (setq Man-notify-method 'pushy)
+  :display
+  ("^\\*Man.*"
+   (display-buffer-reuse-mode-window display-buffer-same-window))
+  :general
+  (file-leader
+    "m" #'man) ;; kinda like "find man page"
+  (nmmap
+    :keymaps 'Man-mode-map
+    "RET" #'man-follow))
+#+end_src
+** WAIT gif-screencast
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
+Little application that uses =gifsicle= to make essentially videos of
+Emacs.  Useful for demonstrating features.
+#+begin_src emacs-lisp
+(use-package gif-screencast
+  :straight t
+  :general
+  (app-leader
+    "x" #'gif-screencast-start-or-stop)
+  :init
+  (setq gif-screencast-output-directory (expand-file-name "~/Media/emacs/")))
+#+end_src
+** Image-mode
+Image mode, for viewing images.  Supports tons of formats, easy to use
+and integrates slickly into image-dired.  Of course,
+#+begin_src emacs-lisp
+(use-package image-mode
+  :defer t
+  :general
+  (nmmap
+    :keymaps 'image-mode-map
+    "+" #'image-increase-size
+    "-" #'image-decrease-size
+    "p" #'image-animate
+    "P" #'image-animate-set-speed
+    "h" #'image-backward-hscroll
+    "j" #'image-next-line
+    "k" #'image-previous-line
+    "l" #'image-forward-hscroll))
+#+end_src
+** WAIT ERC
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
+#+begin_src emacs-lisp
+(use-package erc
+  :defer t
+  :init
+  (setq erc-server "irc.libera.chat"
+        erc-nick "oreodave"
+        erc-buffer-display "current"))
+#+end_src
+** WAIT MPV
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
+Basically a porcelain over mpv via the IPC interface.
 #+begin_src emacs-lisp
-(load-file (concat user-emacs-directory "app.el"))
+(use-package mpv
+  :defer t
+  :straight t
+  :config
+  (with-eval-after-load "org"
+    (defun org-mpv-complete-link (&optional arg)
+      (replace-regexp-in-string
+       "file:" "mpv:"
+       (org-link-complete-file arg)
+       t t))
+    (org-link-set-parameters "mpv"
+                             :follow #'mpv-play :complete #'org-mpv-complete-link)))
 #+end_src
 * Text modes
 Standard packages and configurations for text-mode and its derived
@@ -797,6 +2464,8 @@ software, but I also need it in commit messages and so on.  So
 flyspell-mode should be hooked to text-mode.
 #+begin_src emacs-lisp
 (use-package flyspell
+  :straight t
+  :defer t
   :hook (text-mode-hook . flyspell-mode)
   :general
   (nmmap
@@ -814,23 +2483,26 @@ version control system in and of itself!  The only extra necessary
 would be describing changes...
 #+begin_src emacs-lisp
 (use-package undo-tree
+  :demand t
   :straight t
-  :hook (after-init-hook . global-undo-tree-mode)
+  :general
+  (leader
+    "u" #'undo-tree-visualize)
   :init
   (setq undo-tree-auto-save-history t
         undo-tree-history-directory-alist backup-directory-alist)
-  :general
-  (leader
-    "u" #'undo-tree-visualize))
+  :config
+  (global-undo-tree-mode))
 #+end_src
 ** Whitespace
 Deleting whitespace, highlighting when going beyond the 80th character
 limit, all good stuff.  I don't want to highlight whitespace for
 general mode categories (Lisp shouldn't really have an 80 character
 limit), so set it for specific modes need the help.
+
 #+begin_src emacs-lisp
 (use-package whitespace
-  :straight nil
+  :defer t
   :general
   (nmmap
     "M--"   #'whitespace-cleanup)
@@ -845,7 +2517,9 @@ limit), so set it for specific modes need the help.
   (org-mode-hook     . whitespace-mode)
   (text-mode-hook    . whitespace-mode)
   :init
-  (setq whitespace-style '(face lines-tail spaces tabs tab-mark trailing newline)
+  (setq whitespace-style '(face empty lines-tail
+                                spaces tabs tab-mark
+                                trailing newline)
         whitespace-line-column 80))
 #+end_src
 ** Set auto-fill-mode for all text-modes
@@ -865,10 +2539,11 @@ Smartparens is a smarter electric-parens, it's much more aware of
 context and easier to use.
 #+begin_src emacs-lisp
 (use-package smartparens
+  :straight t
+  :defer t
   :hook
   (prog-mode-hook . smartparens-mode)
   (text-mode-hook . smartparens-mode)
-  :after evil
   :config
   (setq sp-highlight-pair-overlay nil
         sp-highlight-wrap-overlay t
@@ -889,16 +2564,19 @@ keymaps.  Same with dictionary searching.
 #+begin_src emacs-lisp
 (use-package le-thesaurus
   :straight t
+  :defer t
   :display
   ("\\*Dictionary\\*"
    (display-buffer-reuse-window display-buffer-same-window)
    (reusable-frames . t))
+  :init
+  (setq dictionary-server "dict.org")
   :general
-  (local-leader
-    :keymaps 'override
-    "[" #'le-thesaurus-get-synonyms
-    "]" #'le-thesaurus-get-antonyms
-    "#" #'dictionary-search))
+  (search-leader
+    :infix "w"
+    "s" #'le-thesaurus-get-synonyms
+    "a" #'le-thesaurus-get-antonyms
+    "d" #'dictionary-search))
 #+end_src
 * Programming packages
 Packages that help with programming in general, providing IDE like
@@ -913,16 +2591,57 @@ Eldoc box makes the help buffer a hovering box instead of printing it
 in the minibuffer.  A lot cleaner.
 #+begin_src emacs-lisp
 (use-package eldoc
-  :straight nil
+  :defer t
   :hook (prog-mode-hook . eldoc-mode)
   :init
-  (global-eldoc-mode 1))
+  (global-eldoc-mode 1)
+  :general
+  (leader
+    "h>" #'eldoc-doc-buffer))
 
 (use-package eldoc-box
+  :straight t
+  :defer t
   :hook (eldoc-mode-hook . eldoc-box-hover-mode)
   :init
   (setq eldoc-box-position-function #'eldoc-box--default-upper-corner-position-function
-        eldoc-box-clear-with-C-g t))
+        eldoc-box-clear-with-C-g t)
+  :general
+  (leader
+    "h." #'eldoc-box-help-at-point))
+#+end_src
+** Flycheck
+Flycheck is the checking system for Emacs.  I don't necessarily like
+having all my code checked all the time, so I haven't added a hook to
+prog-mode as it would be better for me to decide when I want checking
+and when I don't.
+
+I've added it to C/C++ mode because I use them regularly and flycheck
+has very little overhead to work there.
+#+begin_src emacs-lisp
+(use-package flycheck
+  :straight t
+  :defer t
+  :commands (flycheck-mode flycheck-list-errors)
+  :hook
+  (c-mode-hook   . flycheck-mode)
+  (c++-mode-hook . flycheck-mode)
+  :general
+  (mode-leader
+    "f" #'flycheck-mode)
+  (code-leader
+    "x" #'flycheck-list-errors
+    "J" #'flycheck-next-error
+    "K" #'flycheck-previous-error)
+  :display
+  ("\\*Flycheck.*"
+   (display-buffer-at-bottom)
+   (window-height . 0.25))
+  :init
+  (setq-default flycheck-check-syntax-automatically '(save new-line mode-enabled))
+  :config
+  (with-eval-after-load "evil-collection"
+    (evil-collection-flycheck-setup)))
 #+end_src
 ** Eglot
 Eglot is package to communicate with LSP servers for better
@@ -939,7 +2658,6 @@ by default I've disabled it, using =M-x eglot= to startup the LSP
 server when I need it.
 #+begin_src emacs-lisp
 (use-package eglot
-  :after project
   :defer t
   :general
   (code-leader
@@ -948,38 +2666,31 @@ server when I need it.
     "a" #'eglot-code-actions
     "r" #'eglot-rename
     "R" #'eglot-reconnect)
-  ;; :init
-  ;; (setq eglot-stay-out-of '(flymake))
+  :init
+  (setq eglot-stay-out-of '(flymake))
   :config
   (add-to-list 'eglot-server-programs '((c++-mode c-mode) "clangd")))
 #+end_src
-** Flycheck
-Flycheck is the checking system for Emacs.  I don't necessarily like
-having all my code checked all the time, so I haven't added a hook to
-prog-mode as it would be better for me to decide when I want checking
-and when I don't.
+*** Flycheck-Eglot
+By default Eglot uses the integrated flymake package for error
+reporting.  I don't mind flymake, and I think an integrated solution
+which doesn't rely on external packages is always a great idea.
+However, I just personally prefer flycheck and it's become part of my
+mental model when programming.  So here's a package which will
+integrate flycheck into Eglot's error reporting.
+
+(Funny but also kind of depressing is this issue in Eglot where
+someone requested this integration, which caused a bit of a flame war.
+People are stupid.
+[[https://github.com/joaotavora/eglot/issues/42][no opinion on
+flymake]])
 #+begin_src emacs-lisp
-(use-package flycheck
-  :commands (flycheck-mode flycheck-list-errors)
-  :hook
-  (c-mode-hook   . flycheck-mode)
-  (c++-mode-hook . flycheck-mode)
-  :general
-  (mode-leader
-    "f" #'flycheck-mode)
-  (code-leader
-    "x" #'flycheck-list-errors
-    "J" #'flycheck-next-error
-    "K" #'flycheck-previous-error)
-  :display
-  ("\\*Flycheck.*"
-   (display-buffer-at-bottom)
-   (window-height . 0.25))
-  :config
-  (with-eval-after-load "evil-collection"
-    (evil-collection-flycheck-setup)))
+(use-package flycheck-eglot
+  :straight t
+  :after (flycheck eglot)
+  :hook (eglot-managed-mode-hook . flycheck-eglot-mode))
 #+end_src
-** Tabs and spaces
+** Indentation
 By default, turn off tabs and set the tab width to two.
 #+begin_src emacs-lisp
 (setq-default indent-tabs-mode nil
@@ -988,7 +2699,7 @@ By default, turn off tabs and set the tab width to two.
 
 However, if necessary later, define a function that may activate tabs locally.
 #+begin_src emacs-lisp
-(defun +oreo/activate-tabs ()
+(defun +oreo/use-tabs ()
   (interactive)
   (setq-local indent-tabs-mode t))
 #+end_src
@@ -1000,6 +2711,7 @@ I hook it to prog-mode.
 
 #+begin_src emacs-lisp
 (use-package hl-todo
+  :straight t
   :after prog-mode
   :hook (prog-mode-hook . hl-todo-mode)
   :init
@@ -1014,7 +2726,7 @@ Turn on ~hs-minor-mode~ for all prog-mode.  This provides folds for
 free.
 #+begin_src emacs-lisp
 (use-package hideshow
-  :straight nil
+  :defer t
   :hook (prog-mode-hook . hs-minor-mode))
 #+end_src
 ** Aggressive indenting
@@ -1040,7 +2752,7 @@ description I give won't do it justice.
 Colourising the compilation buffer so ANSI colour codes get computed.
 #+begin_src emacs-lisp
 (use-package compile
-  :straight nil
+  :defer t
   :general
   (code-leader
     "j" #'next-error
@@ -1049,7 +2761,10 @@ Colourising the compilation buffer so ANSI colour codes get computed.
     "C" #'recompile)
   (nmmap
     :keymaps 'compilation-mode-map
-    "g" #'recompile)
+    "c" #'recompile)
+  (general-def
+    :keymaps 'compilation-mode-map
+    "g" nil) ;; by default this is recompile
   :display
   ("\\*compilation\\*"
    (display-buffer-reuse-window display-buffer-at-bottom)
@@ -1063,51 +2778,109 @@ Colourising the compilation buffer so ANSI colour codes get computed.
       (ansi-color-apply-on-region (point-min) (point-max))))
   (add-hook 'compilation-filter-hook #'+compile/colourise))
 #+end_src
-** Makefile
-Defines an auto-insert for Makefiles.  Assumes C but it's very easy to
-change it for C++.
+** xref
+Find definitions, references and general objects using tags without
+external packages.  Provided by default in Emacs and just requires a
+way of generating a =TAGS= file for your project.  Helps with minimal
+setups for programming without heavier packages like [[*Eglot][Eglot]].
 #+begin_src emacs-lisp
-(use-package emacs
-  :auto-insert
-  (("[mM]akefile\\'" . "Makefile skeleton")
-   ""
-   "CC=gcc
-CFLAGS=-Wall -Wextra -Werror -Wswitch-enum -ggdb -fsanitize=address -std=c11
-LIBS=
-ARGS=
-OUT=main.out
-
-SRC=src
-DIST=build
-
-CODE=$(addprefix $(SRC)/, main.c)
-OBJECTS=$(CODE:$(SRC)/%.c=$(DIST)/%.o)
-DEPS=$(OBJECTS:%.o=%.d)
-
-.PHONY: all
-all: $(OUT)
-
-$(OUT): $(DIST)/$(OUT)
-
-$(DIST)/$(OUT): $(OBJECTS)
-	mkdir -p $(DIST)
-	$(CC) $(CFLAGS) $^ -o $@ $(LIBS)
-
--include $(DEPS)
-
-$(DIST)/%.o: $(SRC)/%.c
-	mkdir -p $(DIST)
-	$(CC) $(CFLAGS) -MMD -c $< -o $@ $(LIBS)
+(use-package xref
+  :defer t
+  :display
+  ("\\*xref\\*"
+   (display-buffer-at-bottom)
+   (inhibit-duplicate-buffer . t)
+   (window-height . 0.25))
+  :general
+  (code-leader
+    "t" '(nil :which-key "Tags"))
+  (code-leader
+    :infix "t"
+    "t" #'xref-find-apropos
+    "d" #'xref-find-definitions
+    "r" #'xref-find-references)
+  (nmmap
+    :keymaps 'xref--xref-buffer-mode-map
+    "RET" #'xref-goto-xref
+    "J" #'xref-next-line
+    "K" #'xref-prev-line
+    "g" #'xref-revert-buffer
+    "q" #'quit-window))
+#+end_src
+** Project.el
+An inbuilt solution for creating and managing projects that doesn't
+require a dependency.  Where possible we should try to use Emacs
+defaults (admittedly this is a philosophy I've only recently adopted)
+so when setting up a new computer it takes a bit less time.
 
-.PHONY: run
-run: $(DIST)/$(OUT)
-	./$^ $(ARGS)
+Here I write a TAGS command, mimicking projectile's one, so I can
+quickly generate them in C/C++ projects.
 
-.PHONY:
-clean:
-	rm -rfv $(DIST)/*
-"
-   _))
+#+begin_src emacs-lisp
+(use-package project
+  :defer t
+  :general
+  (general-def
+    :keymaps 'project-prefix-map
+    "R" #'+project/generate-tags)
+  :config
+  (defun +project/generate-tags ()
+    (interactive)
+    (let ((project (project-current)))
+      (if (not project)
+          (message "+project/generate-tags: Not in project.")
+        (let ((tags-file (concat (project-root project) "TAGS"))
+              (files (format "%s" (project-files project))))
+          (set-process-sentinel
+           (start-process-shell-command
+            "PROJECT-GENERATE-TAGS"
+            "*gen-tags*"
+            (format "ctags -Re -f %s %s"
+                    tags-file
+                    (substring files 1 (- (length files) 1))))
+           (lambda (p event)
+             (when (string= event "finished\n")
+               (message "Finished generating tags!")))))))))
+#+end_src
+** WAIT Projectile
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
+Projectile is a project management package which integrates with Emacs
+very well.  It essentially provides alternative Emacs commands scoped
+to the current 'project', based on differing signs that a directory is
+a 'project'.
+#+begin_src emacs-lisp
+(use-package projectile
+  :hook (emacs-startup-hook . projectile-mode)
+  :general
+  (general-def
+    :keymaps 'projectile-command-map
+    "t" #'projectile-test-project
+    "r" #'projectile-run-project
+    "q" #'projectile-replace-regexp)
+  (leader
+    "p" '(projectile-command-map :which-key "Projectile"))
+  :init
+  (setq projectile-tags-command "ctags -Re -f \"%s\" %s \"%s\""
+        projectile-enable-caching t))
+#+end_src
+*** Counsel projectile
+Counsel integration for projectile commands, very nice.
+#+begin_src emacs-lisp
+(use-package counsel-projectile
+  :after (projectile counsel)
+  :config
+  (counsel-projectile-mode +1))
+#+end_src
+** devdocs
+#+begin_src emacs-lisp
+(use-package devdocs
+  :straight t
+  :defer t
+  :general
+  (nmmap
+    "K" #'devdocs-lookup))
 #+end_src
 * Org mode
 2023-03-30: finally decided to give org mode its own section.
@@ -1116,7 +2889,7 @@ Org is, at its most basic, a markup language.  Files use the ".org"
 extension and use =org-mode= to write text, with the ability to export
 to a few formats, all within Emacs.  Some other features include:
 + A complete spreadsheet system, with formulas (including
-  [[file:app.org::*Calculator][calc-mode]] integration)
+  [[*Calculator][calc-mode]] integration)
 + Evaluation of code blocks, even using the results of them in exports
   (to, say, a $\LaTeX$ or HTML document)
   + This includes exporting code blocks to a code file.  All the
@@ -1130,17 +2903,16 @@ to a few formats, all within Emacs.  Some other features include:
   demand
 ** Org Essentials
 Org has a ton of settings to tweak, which change your experience quite
-a bit.  My setup should be as portable as possible and (/sometimes/) I
-need to access org mode files in other editors, so org files should be
-as close to clear text as possible.  This is the guiding philosophy
-that essentially makes most of my options pretty immediate.
+a bit.  Here are mine, but this took a lot of just reading other
+people's configurations and testing.  I don't do a good job of
+explaining how this works in all honesty, but it works well for me so
+I'm not very bothered.
 
-Some arbitrary notes:
 + By default =~/Text= is my directory for text files.  I actually have
   a repository that manages this directory for agenda files and other
   documents
-+ Indentation in file should not be allowed, i.e. text indentation,
-  as that forces other editors to read it a certain way as well.  It
++ Indentation in file should not be allowed, i.e. text indentation, as
+  that forces other editors to read it a certain way as well.  It's
   obtrusive hence it's off.
 + Org startup indented is on by default as most documents do benefit
   from the indentation, but I do turn it off for some files via
@@ -1152,25 +2924,29 @@ Some arbitrary notes:
   preview, I'll do it myself, so turn it off.
 + Org manages windowing itself, to some extent, so I set those options
   to be as unobtrusive as possible
++ Load languages I use in =src= blocks in org-mode (Emacs-lisp for
+  this configuration, C and Python)
 
 #+begin_src emacs-lisp
 (use-package org
-  :defer t
   :straight t
+  :defer t
   :init
-  (setq
-   org-directory "~/Text"
-   org-adapt-indentation nil
-   org-indent-mode nil
-   org-startup-indented t
-   org-startup-folded 'content
-   org-startup-with-latex-preview nil
-   org-imenu-depth 10
-   org-src-window-setup 'current-window
-   org-indirect-buffer-display 'current-window
-   org-link-frame-setup '((vm . vm-visit-folder-other-frame)
-                          (vm-imap . vm-visit-imap-folder-other-frame)
-                          (file . find-file))))
+  (setq org-directory "~/Text"
+        org-adapt-indentation nil
+        org-indent-mode nil
+        org-startup-indented t
+        org-startup-folded 'content
+        org-startup-with-latex-preview nil
+        org-imenu-depth 10
+        org-src-window-setup 'current-window
+        org-indirect-buffer-display 'current-window
+        org-link-frame-setup '((vm . vm-visit-folder-other-frame)
+                               (vm-imap . vm-visit-imap-folder-other-frame)
+                               (file . find-file))
+        org-babel-load-languages '((emacs-lisp . t)
+                                   (lisp . t)
+                                   (shell . t))))
 #+end_src
 ** Org Latex
 Org mode has deep integration with latex, can export to PDF and even
@@ -1179,11 +2955,13 @@ pdf-process, code listing options via minted and the format options
 for latex fragments.
 #+begin_src emacs-lisp
 (use-package org
+  :straight t
   :defer t
   :init
-  (setq org-format-latex-options '(:foreground default :background default :scale 2
-                                   :html-foreground "Black" :html-background "Transparent"
-                                   :html-scale 1.0 :matchers ("begin" "$1" "$" "$$" "\\(" "\\["))
+  (setq org-format-latex-options
+        '(:foreground default :background default :scale 2
+          :html-foreground "Black" :html-background "Transparent"
+          :html-scale 1.0 :matchers ("begin" "$1" "$" "$$" "\\(" "\\["))
         org-latex-src-block-backend 'minted
         org-latex-minted-langs '((emacs-lisp "common-lisp")
                                  (ledger "text")
@@ -1193,15 +2971,18 @@ for latex fragments.
                                  (caml "ocaml"))
         org-latex-packages-alist '(("" "minted"))
         org-latex-pdf-process
-        '("latexmk -f -bibtex -pdf -shell-escape -%latex -interaction=nonstopmode -output-directory=%o %f")
-        org-latex-minted-options '(("style" "colorful")
-                                   ("linenos")
-                                   ("frame" "single")
-                                   ("mathescape")
-                                   ("fontfamily" "courier")
-                                   ("samepage" "false")
-                                   ("breaklines" "true")
-                                   ("breakanywhere" "true"))))
+        (list (concat "latexmk -f -bibtex -pdf "
+                      "-shell-escape -%latex -interaction=nonstopmode "
+                      "-output-directory=%o %f"))
+        org-latex-minted-options
+        '(("style" "colorful")
+          ("linenos")
+          ("frame" "single")
+          ("mathescape")
+          ("fontfamily" "courier")
+          ("samepage" "false")
+          ("breaklines" "true")
+          ("breakanywhere" "true"))))
 #+end_src
 ** Org Core Variables
 Tons of variables for org-mode, including a ton of latex ones.  Can't
@@ -1210,6 +2991,7 @@ copy pasted the majority of this, tweaking it till it felt good.  Doom
 Emacs was very helpful here.
 #+begin_src emacs-lisp
 (use-package org
+  :straight t
   :defer t
   :init
   (setq org-edit-src-content-indentation 0
@@ -1230,15 +3012,14 @@ Emacs was very helpful here.
         org-todo-keywords
         '((sequence "TODO" "WIP" "DONE")
           (sequence "PROJ" "WAIT" "COMPLETE"))
-        org-use-sub-superscripts '{}
-        org-babel-load-languages '((emacs-lisp . t)
-                                   (lisp . t)
-                                   (shell . t))))
+        org-use-sub-superscripts '{}))
 #+end_src
 ** Org Core Functionality
 Hooks, prettify-symbols and records for auto insertion.
 #+begin_src emacs-lisp
 (use-package org
+  :straight t
+  :defer t
   :hook
   (org-mode-hook . prettify-symbols-mode)
   :display
@@ -1248,48 +3029,28 @@ Hooks, prettify-symbols and records for auto insertion.
   (org-mode-hook
    ("#+begin_src" . "≫")
    ("#+end_src"   . "≪"))
-  :init
-  (with-eval-after-load "autoinsert"
-    (define-auto-insert '("\\.org\\'" . "Org skeleton")
-      '("Enter title: "
-        "#+title: " str | (buffer-file-name) "\n"
-        "#+author: " (read-string "Enter author: ") | user-full-name "\n"
-        "#+description: " (read-string "Enter description: ") | "Description" "\n"
-        "#+date: " (format-time-string "%Y-%m-%d" (current-time)) "\n"
-        "* " _))))
+  :auto-insert
+  (("\\.org\\'" . "Org skeleton")
+   "Enter title: "
+   "#+title: " str | (buffer-file-name) "\n"
+   "#+author: " (read-string "Enter author: ") | user-full-name "\n"
+   "#+description: " (read-string "Enter description: ") | "Description" "\n"
+   "#+date: " (format-time-string "%Y-%m-%d" (current-time)) "\n"
+   "* " _))
 #+end_src
 ** Org Core Bindings
 Some bindings for org mode.
 #+begin_src emacs-lisp
 (use-package org
-  :after counsel
-  :config
-  (defun +org/swiper-goto ()
-    (interactive)
-    (swiper "^\\* "))
-  (defun +org/search-headings ()
-    "Searches directory (of buffer) for org headings via counsel-rg"
-    (interactive)
-    (counsel-rg "^\\* " (file-name-directory (buffer-file-name))))
-  (defun +org/search-config-headings ()
-    "Searches USER-EMACS-DIRECTORY for org headings via counsel-rg"
-    (interactive)
-    (counsel-rg "^\\* "
-                (cl-subseq user-emacs-directory 0 (- (length user-emacs-directory) 1))))
+  :straight t
+  :defer t
   :general
   (file-leader
     "l" #'org-store-link
     "i" #'org-insert-last-stored-link)
   (code-leader
+    :keymaps 'emacs-lisp-mode-map
     "D" #'org-babel-detangle)
-  (search-leader
-    "c" #'+org/search-config-headings)
-  (search-leader
-    :keymaps 'org-mode-map
-    "I" #'+org/search-headings)
-  (nmmap
-    :keymaps 'org-mode-map
-    [remap imenu] #'+org/swiper-goto)
   (local-leader
     :keymaps 'org-mode-map
     "l" '(nil :which-key "Links")
@@ -1320,14 +3081,52 @@ Some bindings for org mode.
     "t" #'org-table-toggle-coordinate-overlays
     "s" #'org-table-sum
     "e" #'org-table-calc-current-TBLFM
-    "E" #'org-table-eval-formula)
-  (local-leader
-    :keymaps 'org-mode-map
-    :infix "c"
-    "i" #'org-clock-clock-in
-    "o" #'org-clock-clock-out
-    "c" #'org-clock-in-last
-    "d" #'org-clock-display))
+    "E" #'org-table-eval-formula))
+#+end_src
+** Searching org files
+The default ~imenu~ support for Org-mode is god-awful.  ~Imenu~ for
+org-mode should show me a list of headings and provide a
+completing-read interface to search them.
+
+[[*Counsel][Counsel]] has me covered for this as I can just provide it
+a regex as an initial prompt to narrow the candidates down to just the
+headings then let the user go from there.  I use ~swiper~ when
+considering just the local file (a la ~imenu~) and ~counsel-rg~ to
+search multiple org-files.
+
+The cherry on top is ~+org/search-config-headings~ which searches the
+org files in ~user-emacs-directory~ and provides the headings for
+them.  This allows me to search my configuration pretty quickly.
+#+begin_src emacs-lisp
+(with-eval-after-load "counsel"
+  (use-package org
+    :straight t
+    :defer t
+    :config
+    (defun +org/swiper-goto ()
+      (interactive)
+      (counsel-grep-or-swiper "^\\* "))
+
+    (defun +org/search-headings ()
+      "Searches directory (of buffer) for org headings via counsel-rg"
+      (interactive)
+      (counsel-rg "^\\* " (file-name-directory (buffer-file-name))))
+
+    (defun +org/search-config-headings ()
+      "Searches config.org for org headings via +org/swiper-goto"
+      (interactive)
+      (with-current-buffer (find-file (concat user-emacs-directory "config.org"))
+        (+org/swiper-goto)))
+
+    :general
+    (file-leader
+      "p" #'+org/search-config-headings)
+    (search-leader
+      :keymaps 'org-mode-map
+      "I" #'+org/search-headings)
+    (nmmap
+      :keymaps 'org-mode-map
+      [remap imenu] #'+org/swiper-goto)))
 #+end_src
 ** Org Agenda
 Org agenda provides a nice viewing for schedules.  With org mode it's
@@ -1335,7 +3134,6 @@ a very tidy way to manage your time.
 #+begin_src emacs-lisp
 (use-package org-agenda
   :after org
-  :straight nil
   :init
   (defconst +org/agenda-root "~/Text"
     "Root directory for all agenda files")
@@ -1372,16 +3170,22 @@ a very tidy way to manage your time.
     "r" #'org-agenda-redo))
 #+end_src
 ** Org capture
+2024-04-24: I actually need to clean this up, in particular explain
+what org-capture does.
 #+begin_src emacs-lisp
 (use-package org-capture
-  :straight nil
+  :after org
   :init
   (setq
    org-capture-templates
-   '(("t" "A todo" entry
+   '(("t" "Todo" entry
       (file "")
       "* TODO %?
 %T
+%a")
+     ("b" "Bookmark" entry
+      (file "bookmarks.org")
+      "* TODO %? :bookmark:
 %a"))
    org-default-notes-file (concat org-directory "/todo.org"))
   :general
@@ -1395,7 +3199,6 @@ system to see how much time you spend on specific tasks or overall.
 #+begin_src emacs-lisp
 (use-package org-clock
   :after org
-  :straight nil
   :init
   (defvar +org/clock-out-toggle-report nil
     "Non-nil means update the first clock report in the file every
@@ -1410,6 +3213,7 @@ time a clock out occurs.")
   (local-leader
     :keymaps 'org-mode-map
     :infix "c"
+    "d" #'org-clock-display
     "c" #'org-clock-in
     "o" #'org-clock-out
     "r" #'org-clock-report
@@ -1417,7 +3221,7 @@ time a clock out occurs.")
               (setq-local +org/clock-out-toggle-report
                           (not +org/clock-out-toggle-report)))))
 #+end_src
-** Org on save
+** Org compile to PDF on save
 If ~+org/compile-to-pdf-on-save-p~ is non-nil, then compile to
 \(\LaTeX\) and run an async process to compile it to a PDF.  Doesn't
 make Emacs hang (like ~org-latex-export-to-pdf~) and doesn't randomly
@@ -1443,7 +3247,10 @@ crash (like the async handler for org-export).  Works really well with
    (start-process-shell-command "" "*pdflatex*" (concat "pdflatex -shell-escape "
                                                         (org-latex-export-to-latex)))))
 #+end_src
-** Org ref
+** WAIT Org ref
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
 For bibliographic stuff in $\LaTeX$ export.
 #+begin_src emacs-lisp
 (use-package org-ref
@@ -1473,8 +3280,11 @@ learnt the basics of org).
 
 #+begin_src emacs-lisp
 (use-package org-msg
-  :hook (message-mode-hook . org-msg-mode)
-  :hook (notmuch-message-mode-hook . org-msg-mode)
+  :straight t
+  :defer t
+  :hook
+  (message-mode-hook . org-msg-mode)
+  (notmuch-message-mode-hook . org-msg-mode)
   :config
   (setq org-msg-options "html-postamble:nil H:5 num:nil ^:{} toc:nil author:nil email:nil \\n:t tex:dvipng"
         org-msg-greeting-name-limit 3)
@@ -1490,19 +3300,26 @@ learnt the basics of org).
 Evil org for some nice bindings.
 #+begin_src emacs-lisp
 (use-package evil-org
-  :hook (org-mode-hook . evil-org-mode))
+  :straight t
+  :defer t
+  :hook (org-mode-hook . evil-org-mode)
+  :general
+  (nmmap
+    :keymaps 'org-mode-map
+    "TAB" #'org-cycle))
 #+end_src
 ** Org reveal
 Org reveal allows one to export org files as HTML presentations via
 reveal.js.  Pretty nifty and it's easy to use.
 #+begin_src emacs-lisp
 (use-package ox-reveal
+  :straight t
   :defer t
   :init
   (setq org-reveal-root "https://cdn.jsdelivr.net/npm/reveal.js"
         org-reveal-theme "sky"))
 #+end_src
-** WIP Org fragtog
+** WAIT Org fragtog
 :PROPERTIES:
 :header-args:emacs-lisp: :tangle no
 :END:
@@ -1526,20 +3343,88 @@ Org superstar adds unicode symbols for headers, much better than the
 default asterisks.
 #+begin_src emacs-lisp
 (use-package org-superstar
+  :straight t
+  :defer t
   :hook (org-mode-hook . org-superstar-mode))
 #+end_src
 * Languages
-Configuration for specific languages or file formats.
+For a variety of (programming) languages Emacs comes with default
+modes but this configures them as well as pulls any modes Emacs
+doesn't come with.
+** Makefile
+Defines an auto-insert for Makefiles.  Assumes C but it's very easy to
+change it for C++.
+#+begin_src emacs-lisp
+(use-package make-mode
+  :defer t
+  :auto-insert
+  (("[mM]akefile\\'" . "Makefile skeleton")
+   ""
+   "CC=gcc
+GFLAGS=-Wall -Wextra -Werror -Wswitch-enum -std=c11
+DFLAGS=-ggdb -fsanitize=address -fsanitize=undefined
+RFLAGS=-O3
+ifdef RELEASE
+CFLAGS=$(GFLAGS) $(RFLAGS)
+else
+CFLAGS=$(GFLAGS) $(DFLAGS)
+endif
+LIBS=
+
+ARGS=
+OUT=main.out
+
+SRC=src
+DIST=build
+CODE=$(addprefix $(SRC)/, ) # add source files here
+OBJECTS=$(CODE:$(SRC)/%.c=$(DIST)/%.o)
+DEPDIR:=$(DIST)/dependencies
+DEPFLAGS=-MT $@ -MMD -MP -MF
+DEPS:=$(CODE:$(SRC)/%.c=$(DEPDIR):%.d) $(DEPDIR)/main.d
+
+.PHONY: all
+all: $(OUT)
+
+$(OUT): $(DIST)/$(OUT)
+
+$(DIST)/$(OUT): $(OBJECTS) $(DIST)/main.o | $(DIST)
+  $(CC) $(CFLAGS) $^ -o $@ $(LIBS)
+
+$(DIST)/%.o: $(SRC)/%.c | $(DIST) $(DEPDIR)
+  $(CC) $(CFLAGS) $(DEPFLAGS) $(DEPDIR)/$*.d -c $< -o $@ $(LIBS)
+
+.PHONY: run
+run: $(DIST)/$(OUT)
+  ./$^ $(ARGS)
+
+.PHONY:
+clean:
+  rm -rfv $(DIST)/*
+
+$(DIST):
+  mkdir -p $(DIST)
+
+$(DEPDIR):
+  mkdir -p $(DEPDIR)
+
+-include $(DEPS)
+"
+   _))
+#+end_src
 ** PDF
 I use PDFs mostly for reading reports or papers.  Though Emacs isn't
 my preferred application for viewing PDFs (I highly recommend
-[[https://pwmt.org/projects/zathura/][Zathura]]), similar to most things with Emacs, having a PDF viewer
-builtin can be a very useful asset.
+[[https://pwmt.org/projects/zathura/][Zathura]]), similar to most
+things with Emacs, having a PDF viewer builtin can be a very useful
+asset.
 
 For example if I were editing an org document which I was eventually
 compiling into a PDF, my workflow would be much smoother with a PDF
 viewer within Emacs that I can open on another pane.
-*** PDF tools
+*** WAIT PDF tools
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
 ~pdf-tools~ provides the necessary functionality for viewing PDFs.
 There is no proper PDF viewing without this package.
 ~evil-collection~ provides a setup for this mode, so use that.
@@ -1556,7 +3441,10 @@ There is no proper PDF viewing without this package.
   (with-eval-after-load "evil-collection"
     (evil-collection-pdf-setup)))
 #+end_src
-*** PDF grep
+*** WAIT PDF grep
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
 PDF grep is a Linux tool that allows for searches against the text
 inside of PDFs similar to standard grep.  This cannot be performed by
 standard grep due to how PDFs are encoded; they are not a clear text
@@ -1570,7 +3458,10 @@ format.
     :keymaps 'pdf-view-mode-map
     "M-g"    #'pdfgrep))
 #+end_src
-** SQL
+** WAIT SQL
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
 The default SQL package provides support for connecting to common
 database types (sqlite, mysql, etc) for auto completion and query
 execution.  I don't use SQL currently but whenever I need it it's
@@ -1578,11 +3469,10 @@ there.
 #+begin_src emacs-lisp
 (use-package sql
   :defer t
-  :straight nil
   :init
   (setq sql-display-sqli-buffer-function nil))
 #+end_src
-** WIP Ada
+** WAIT Ada
 :PROPERTIES:
 :header-args:emacs-lisp: :tangle no
 :END:
@@ -1592,7 +3482,6 @@ uses eglot and a language server to do the hard work.
 
 #+begin_src emacs-lisp
 (use-package ada-mode
-  :straight nil
   :load-path "elisp/"
   :defer t
   :config
@@ -1609,12 +3498,11 @@ the [[https://elpa.gnu.org/packages/nhexl-mode.html][page]] yourself.
 #+begin_src emacs-lisp
 (use-package nhexl-mode
   :straight t
-  :mode "\\.bin")
+  :defer t
+  :mode ("\\.bin" "\\.out"))
 #+end_src
 ** C/C++
-Setup for C and C++ modes via the cc-mode package.  C and C++ are
-great languages for general purpose programming.  My preferred choice
-when I want greater control over memory management.
+Setup for C and C++ modes, using Emacs' default package: cc-mode.
 *** cc-mode
 Tons of stuff, namely:
 + ~auto-fill-mode~ for 80 char limit
@@ -1739,8 +3627,8 @@ my dotfiles).
 
 #+begin_src emacs-lisp
 (use-package clang-format
-  :straight nil
   :load-path "/usr/share/clang/"
+  :defer t
   :after cc-mode
   :commands (+code/clang-format-region-or-buffer
              clang-format-mode)
@@ -1774,7 +3662,10 @@ it as an option in ~org-babel-load-languages~.
    'org-babel-load-languages
    '((C . t))))
 #+end_src
-** D
+** WAIT D
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
 D is a systems level programming language with C-style syntax.  I
 think it has some interesting ideas such as a toggleable garbage
 collector.  Here I just install the D-mode package, enable ~org-babel~
@@ -1793,14 +3684,23 @@ execution of d-mode blocks and alias ~D-mode~ with ~d-mode~.
 #+begin_src emacs-lisp
 (use-package rust-mode
   :straight t
+  :defer t
   :general
   (code-leader
-    :keymaps 'rust-mode-hook
+    :keymaps 'rust-mode-map
     "f" #'rust-format-buffer)
+  (local-leader
+    :keymaps 'rust-mode-map
+    "c" #'rust-run-clippy)
   :init
-  (setq rust-format-on-save t))
+  (setq rust-format-on-save t)
+  (with-eval-after-load "eglot"
+    (add-to-list 'eglot-server-programs '(rust-mode "rust-analyzer"))))
 #+end_src
-** Racket
+** WAIT Racket
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
 A scheme with lots of stuff inside it.  Using it for a language design
 book so it's useful to have some Emacs binds for it.
 #+begin_src emacs-lisp
@@ -1831,7 +3731,7 @@ book so it's useful to have some Emacs binds for it.
     "sr" #'racket-send-region
     "sd" #'racket-send-definition))
 #+end_src
-** WIP CSharp
+** WAIT CSharp
 :PROPERTIES:
 :header-args:emacs-lisp: :tangle no
 :END:
@@ -1855,13 +3755,15 @@ omnisharp.
    ("for"       . "∀")
    ("return"    . "⟼")))
 #+end_src
-** Java
+** WAIT Java
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
 I kinda dislike Java, but if necessary I will code in it.  Just setup
 a style and some pretty symbols.  You can use LSP to get cooler
 features to be fair.
 #+begin_src emacs-lisp
 (use-package ob-java
-  :straight nil
   :defer t
   :pretty
   (java-mode-hook
@@ -1913,11 +3815,13 @@ points there.
 
 Here I configure the REPL for Haskell via the
 ~haskell-interactive-mode~.  I also load my custom package
-[[file:elisp/haskell-multiedit.el][haskell-multiedit]] which allows a user to create temporary
-~haskell-mode~ buffers that, upon completion, will run in the REPL.
-Even easier than making your own buffer.
+[[file:elisp/haskell-multiedit.el][haskell-multiedit]] which allows a
+user to create temporary ~haskell-mode~ buffers that, upon completion,
+will run in the REPL.  Even easier than making your own buffer.
 #+begin_src emacs-lisp
 (use-package haskell-mode
+  :straight t
+  :defer t
   :hook
   (haskell-mode-hook . haskell-indentation-mode)
   (haskell-mode-hook . interactive-haskell-mode)
@@ -1926,21 +3830,27 @@ Even easier than making your own buffer.
   (haskell-interactive-prompt-cont "{λ} ")
   (haskell-interactive-popup-errors nil)
   (haskell-stylish-on-save nil)
-  (haskell-process-type 'stack-ghci)
+  (haskell-process-type 'auto)
   :general
   (shell-leader
-    "h" #'+shell/toggle-haskell-repl)
+    "h" #'haskell-interactive-bring)
+  (local-leader
+    :keymaps 'haskell-mode-map
+    "l" #'haskell-process-load-or-reload
+    "t" #'haskell-process-do-type)
+  (local-leader
+    :keymaps 'haskell-interactive-mode-map
+    "c" #'haskell-interactive-mode-clear)
+  (imap
+    :keymaps 'haskell-interactive-mode-map
+    "M-k" #'haskell-interactive-mode-history-previous
+    "M-j" #'haskell-interactive-mode-history-next)
   :display
   ("\\*haskell.**\\*"
    (display-buffer-at-bottom)
    (window-height . 0.25))
   :config
-  (load (concat user-emacs-directory "elisp/haskell-multiedit.el"))
-  (+oreo/create-toggle-function
-   +shell/toggle-haskell-repl
-   "*haskell*"
-   haskell-interactive-bring
-   nil))
+  (load (concat user-emacs-directory "elisp/haskell-multiedit.el")))
 #+end_src
 ** Python
 Works well for python.  If you have ~pyls~ it should be on your path, so
@@ -1950,7 +3860,6 @@ source code blocks.
 #+begin_src emacs-lisp
 (use-package python
   :defer t
-  :straight nil
   :pretty
   (python-mode-hook
    ("None"   . "Ø")
@@ -1977,21 +3886,15 @@ source code blocks.
 Setup for python shell, including a toggle option
 #+begin_src emacs-lisp
 (use-package python
-  :straight nil
+  :defer t
   :commands +python/toggle-repl
   :general
   (shell-leader
-    "p" #'+shell/python-toggle-repl)
+    "p" #'run-python)
   :display
   ("\\*Python\\*"
    (display-buffer-at-bottom)
-   (window-height . 0.25))
-  :config
-  (+oreo/create-toggle-function
-   +shell/python-toggle-repl
-   "*Python*"
-   run-python
-   nil))
+   (window-height . 0.25)))
 #+end_src
 ** YAML
 YAML is a data language which is useful for config files.
@@ -2003,6 +3906,8 @@ YAML is a data language which is useful for config files.
 Firstly, web mode for consistent colouring of syntax.
 #+begin_src emacs-lisp
 (use-package web-mode
+  :straight t
+  :defer t
   :mode ("\\.html" . web-mode)
   :mode ("\\.js"   . web-mode)
   :mode ("\\.css"  . web-mode)
@@ -2015,6 +3920,7 @@ Firstly, web mode for consistent colouring of syntax.
 Emmet for super speed code writing.
 #+begin_src emacs-lisp
 (use-package emmet-mode
+  :straight t
   :hook (web-mode-hook . emmet-mode)
   :general
   (imap
@@ -2031,7 +3937,7 @@ Emmet for super speed code writing.
   (("\\.html\\'" . "HTML Skeleton")
    ""
    "<!doctype html>
-<html class='no-js' lang=''>
+<html lang=''>
   <head>
     <meta charset='utf-8'>
     <meta http-equiv='x-ua-compatible' content='ie=edge'>
@@ -2058,10 +3964,14 @@ Emmet for super speed code writing.
    "     </body>
 </html>"))
 #+end_src
-** Typescript
-Kinda expressive, interesting.
+*** WAIT Typescript
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
+A child language of javascript which compiles to it.
 #+begin_src emacs-lisp
 (use-package typescript-mode
+  :straight t
   :defer t
   :init
   (setq typescript-indent-level 2))
@@ -2070,11 +3980,13 @@ Kinda expressive, interesting.
 Common Lisp is a dialect of Lisp, the most /common/ one around.  Emacs
 comes with builtin Lisp support of course, but a REPL would be nice.
 
+*** WAIT Sly
 Enter /SLY/.  Sly is a fork of /SLIME/ and is *mandatory* for lisp
 development on Emacs.
 
 #+begin_src emacs-lisp
 (use-package sly
+  :defer t
   :straight t
   :init
   (setq inferior-lisp-program "sbcl")
@@ -2091,14 +4003,9 @@ development on Emacs.
     (setq-default org-babel-lisp-eval-fn #'sly-eval))
   (with-eval-after-load "company"
     (add-hook 'sly-mrepl-hook #'company-mode))
-  (+oreo/create-toggle-function
-   +shell/toggle-sly
-   "*sly-mrepl for sbcl*"
-   sly-mrepl
-   nil)
   :general
   (shell-leader
-    "s" #'+shell/toggle-sly)
+    "s" #'sly-mrepl)
   (nmap
     :keymaps '(lisp-mode-map sly-mrepl-mode-map)
     "gr" #'sly-eval-buffer
@@ -2124,12 +4031,10 @@ development on Emacs.
     :keymaps 'sly-inspector-mode-map
     "q" #'sly-inspector-quit))
 #+end_src
-*** Lisp indent function
-Add a new lisp indent function which indents newline lists more
-appropriately.
+*** Emacs lisp
 #+begin_src emacs-lisp
-(use-package lisp-mode
-  :straight nil
+(use-package elisp-mode
+  :defer t
   :pretty
   (lisp-mode-hook
    ("lambda" . "λ")
@@ -2141,11 +4046,75 @@ appropriately.
    ("for"    . "∀")
    ("mapc"   . "∀")
    ("mapcar" . "∀"))
+  (emacs-lisp-mode-hook
+   ("lambda" . "λ")
+   ("t"      . "⊨")
+   ("nil"    . "Ø")
+   ("and"    . "∧")
+   ("or"     . "∨")
+   ("defun"  . "ƒ")
+   ("for"    . "∀")
+   ("mapc"   . "∀")
+   ("mapcar" . "∀"))
   :general
   (:states '(normal motion visual)
    :keymaps '(emacs-lisp-mode-map lisp-mode-map)
    ")" #'sp-next-sexp
    "(" #'sp-previous-sexp)
+  (nmmap
+    :keymaps '(emacs-lisp-mode-map lisp-interaction-mode-map)
+    "gr" #'eval-last-sexp)
+  (vmap
+    :keymaps '(emacs-lisp-mode-map lisp-interaction-mode-map)
+    "gr" #'eval-region))
+#+end_src
+*** WIP Hydra like Lispy
+:PROPERTIES:
+:header-args:emacs-lisp: :tangle no
+:END:
+A [[*Hydra][Hydra]] which uses the ~Lispy~ package (by
+abo-abo) to create a set of motions that allow movement around a lisp
+file easily.
+
+2024-04-18: Still working on this, quite rough around the edges.
+#+begin_src emacs-lisp
+(use-package lispy
+  :after (lisp-mode elisp-mode)
+  :hydra
+  (hydra-lispy
+   nil "Move around quickly in Lisp"
+   ("h" #'lispy-left)
+   ("j" ("t" #'lispy-teleport)
+    #'lispy-down)
+   ("k" #'lispy-up)
+   ("l" #'lispy-right)
+   ("d" #'lispy-different)
+   ("u" #'lispy-flow)
+   ("o" #'lispy-oneline)
+   ("m" #'lispy-multiline)
+   ("N" #'lispy-narrow)
+   ("W" #'lispy-widen)
+   ("c" #'lispy-clone)
+   ("fp" #'lispy-ace-paren)
+   ("fs" #'lispy-ace-symbol :exit t)
+   ("H" #'lispy-slurp)
+   ("L" #'lispy-barf)
+   ("M-h" #'lispy-move-left)
+   ("M-j" #'lispy-move-down)
+   ("M-k" #'lispy-move-up)
+   ("M-l" #'lispy-move-right)
+   ("C-g" nil))
+  :general
+  (nmmap
+    :keymaps '(emacs-lisp-mode-map lisp-mode-map)
+    "." #'hydra-lispy/body))
+#+end_src
+*** Lisp indent function
+Add a new lisp indent function which indents newline lists more
+appropriately.
+#+begin_src emacs-lisp
+(use-package lisp-mode
+  :defer t
   :config
   (defun +oreo/lisp-indent-function (indent-point state)
     (let ((normal-indent (current-column))
@@ -2155,8 +4124,8 @@ appropriately.
       (cond
        ;; car of form doesn't seem to be a symbol, or is a keyword
        ((and (elt state 2)
-             (or (not (looking-at "\\sw\\|\\s_"))
-                 (looking-at ":")))
+           (or (not (looking-at "\\sw\\|\\s_"))
+              (looking-at ":")))
         (if (not (> (save-excursion (forward-line 1) (point))
                     calculate-lisp-indent-last-sexp))
             (progn (goto-char calculate-lisp-indent-last-sexp)
@@ -2170,12 +4139,12 @@ appropriately.
         (backward-prefix-chars)
         (current-column))
        ((and (save-excursion
-               (goto-char indent-point)
-               (skip-syntax-forward " ")
-               (not (looking-at ":")))
-             (save-excursion
-               (goto-char orig-point)
-               (looking-at ":")))
+             (goto-char indent-point)
+             (skip-syntax-forward " ")
+             (not (looking-at ":")))
+           (save-excursion
+             (goto-char orig-point)
+             (looking-at ":")))
         (save-excursion
           (goto-char (+ 2 (elt state 1)))
           (current-column)))
@@ -2184,12 +4153,12 @@ appropriately.
                                           (progn (forward-sexp 1) (point))))
               method)
           (setq method (or (function-get (intern-soft function)
-                                         'lisp-indent-function)
-                           (get (intern-soft function) 'lisp-indent-hook)))
+                                        'lisp-indent-function)
+                          (get (intern-soft function) 'lisp-indent-hook)))
           (cond ((or (eq method 'defun)
-                     (and (null method)
-                          (> (length function) 3)
-                          (string-match "\\`def" function)))
+                    (and (null method)
+                       (> (length function) 3)
+                       (string-match "\\`def" function)))
                  (lisp-indent-defform state indent-point))
                 ((integerp method)
                  (lisp-indent-specform method state
@@ -2198,12 +4167,3 @@ appropriately.
                  (funcall method indent-point state))))))))
   (setq-default lisp-indent-function #'+oreo/lisp-indent-function))
 #+end_src
-*** Emacs lisp
-#+begin_src emacs-lisp
-(use-package elisp-mode
-  :straight nil
-  :general
-  (vmap
-    :keymaps '(emacs-lisp-mode-map lisp-interaction-mode-map)
-    "gr" #'eval-region))
-#+end_src
diff --git a/Emacs/.config/emacs/core.org b/Emacs/.config/emacs/core.org
deleted file mode 100644
index 9ff0905..0000000
--- a/Emacs/.config/emacs/core.org
+++ /dev/null
@@ -1,739 +0,0 @@
-#+title: Core packages
-#+author: Aryadev Chavali
-#+description: The core components of my configuration
-#+date: 2023-09-29
-#+property: header-args:emacs-lisp :tangle core.el :comments link :results none
-#+options: toc:nil
-#+startup: noindent
-
-Packages that are absolutely necessary for the rest of the
-configuration.  These yield core functionality such as keybinding,
-modal editing, completion, auto typing to name a few.
-* General
-General provides a great solution for binding keys.  It has evil and
-use-package support so it fits nicely into configuration.  In this
-case, I define a "definer" for the "LEADER" keys.  Leader is bound to
-~SPC~ and it's functionally equivalent to the doom/spacemacs leader.
-Local leader is bound to ~SPC ,~ and it's similar to doom/spacemacs
-leader but doesn't try to fully assimilate the local-leader map,
-instead just picking stuff I think is useful.  This forces me to learn
-only as many bindings as I find necessary; no more, no less.
-
-I also define prefix leaders for differing applications.  These are
-quite self explanatory by their name and provide a nice way to
-visualise all bindings under a specific heading just by searching the
-code.
-#+begin_src emacs-lisp
-(use-package general
-  :straight t
-  :demand t
-  :config
-  ;; General which key definitions for leaders
-  (general-def
-    :states '(normal motion)
-    "SPC"   'nil
-    "\\"    '(nil :which-key "Local leader")
-    "SPC a" '(nil :which-key "Applications")
-    "SPC b" '(nil :which-key "Buffers")
-    "SPC c" '(nil :which-key "Code")
-    "SPC d" '(nil :which-key "Directories")
-    "SPC f" '(nil :which-key "Files")
-    "SPC i" '(nil :which-key "Insert")
-    "SPC m" '(nil :which-key "Modes")
-    "SPC q" '(nil :which-key "Quit/Literate")
-    "SPC s" '(nil :which-key "Search")
-    "SPC t" '(nil :which-key "Shell"))
-
-  (general-create-definer leader
-    :states '(normal motion)
-    :keymaps 'override
-    :prefix "SPC")
-
-  (general-create-definer local-leader
-    :states '(normal motion)
-    :prefix "\\")
-
-  (general-create-definer code-leader
-    :states '(normal motion)
-    :keymaps 'override
-    :prefix "SPC c")
-
-  (general-create-definer file-leader
-    :states '(normal motion)
-    :keymaps 'override
-    :prefix "SPC f")
-
-  (general-create-definer shell-leader
-    :states '(normal motion)
-    :keymaps 'override
-    :prefix "SPC t")
-
-  (general-create-definer mode-leader
-    :states '(normal motion)
-    :keymaps 'override
-    :prefix "SPC m")
-
-  (general-create-definer app-leader
-    :states '(normal motion)
-    :keymaps 'override
-    :prefix "SPC a")
-
-  (general-create-definer search-leader
-    :states '(normal motion)
-    :keymaps 'override
-    :prefix "SPC s")
-
-  (general-create-definer buffer-leader
-    :states '(normal motion)
-    :keymaps 'override
-    :prefix "SPC b")
-
-  (general-create-definer quit-leader
-    :states '(normal motion)
-    :keymaps 'override
-    :prefix "SPC q")
-
-  (general-create-definer insert-leader
-    :states '(normal motion)
-    :keymaps 'override
-    :prefix "SPC i")
-
-  (general-create-definer dir-leader
-    :states '(normal motion)
-    :keymaps 'override
-    :prefix "SPC d")
-
-  (general-create-definer general-nmmap
-    :states '(normal motion))
-
-  (defalias 'nmmap #'general-nmmap)
-
-  (general-evil-setup t))
-#+end_src
-** Some binds in Emacs
-Some bindings that I couldn't fit elsewhere easily.
-#+begin_src emacs-lisp
-(use-package emacs
-  :straight nil
-  :general
-  (general-def
-    "C-x d" #'delete-frame)
-
-  (nmmap
-    "C--" #'text-scale-decrease
-    "C-=" #'text-scale-increase
-    "C-+" #'text-scale-adjust)
-
-  (leader
-    "SPC" '(execute-extended-command :which-key "M-x")
-    "'"   '(browse-url-emacs :which-key "Open url in Emacs")
-    ";"   'eval-expression
-    ":"   `(,(proc (interactive) (switch-to-buffer "*scratch*"))
-            :which-key "Switch to *scratch*")
-    "!"   '(async-shell-command :which-key "Async shell command")
-    "h" '(help-command :which-key "Help"))
-
-  (mode-leader
-    "t" #'+oreo/switch-theme)
-
-  (code-leader
-    "F" `(,(proc (interactive) (find-file "~/Code/"))
-          :which-key "Open ~/Code/"))
-
-  (file-leader
-    "f" #'find-file
-    "F" #'find-file-other-frame
-    "s" #'save-buffer
-    "p" `(,(proc (interactive)
-                 (find-file (concat user-emacs-directory "config.org")))
-          :which-key "Open config.org"))
-
-  (quit-leader
-    "q" #'save-buffers-kill-terminal
-    "c" #'+literate/compile-config
-    "l" #'+literate/load-config
-    "d" #'delete-frame)
-
-  (search-leader "i" #'imenu))
-#+end_src
-* Evil
-My editor journey started off with Vim rather than Emacs, so my brain
-has imprinted on its style.  Thankfully Emacs is super extensible so
-there exists a package (more of a supreme system) for porting Vim's
-modal editing style to Emacs, called Evil (Emacs Vi Layer).
-
-However there are a lot of packages in Vim that provide greater
-functionality, for example 'vim-surround'.  Emacs, by default, has
-these capabilities but there are further packages which integrate them
-into Evil.
-** Evil core
-Setup the evil package, with some opinionated keybindings:
-- Switch ~evil-upcase~ and ~evil-downcase~ because I use ~evil-upcase~
-  more
-- Switch ~evil-goto-mark~ and ~evil-goto-mark-line~ as I'd rather have
-  the global one closer to the home row
-- Use 'T' character as an action for transposing objects
-#+begin_src emacs-lisp
-(use-package evil
-  :demand t
-  :hook (after-init-hook . evil-mode)
-  :general
-  (leader
-    "w"  '(evil-window-map :which-key "Window")
-    "wd" #'delete-frame)
-
-  (nmmap
-    "TAB" #'evil-jump-item
-    "r"   #'evil-replace-state
-    "zC"  #'hs-hide-level
-    "zO" #'hs-show-all
-    "'"   #'evil-goto-mark
-    "`"   #'evil-goto-mark-line
-    "C-w" #'evil-window-map
-    "gu"  #'evil-upcase
-    "gU"  #'evil-downcase
-    "T"   nil)
-
-  (nmmap
-    :infix "T"
-    "w" #'transpose-words
-    "c" #'transpose-chars
-    "s" #'transpose-sentences
-    "p" #'transpose-paragraphs
-    "e" #'transpose-sexps
-    "l" #'transpose-lines)
-  :init
-  (setq evil-want-keybinding nil
-        evil-split-window-below t
-        evil-vsplit-window-right t
-        evil-want-abbrev-expand-on-insert-exit t
-        evil-undo-system #'undo-tree)
-  :config
-  (fset #'evil-window-vsplit #'make-frame))
-#+end_src
-** Evil surround
-Evil surround is a port for vim-surround.
-#+begin_src emacs-lisp
-(use-package evil-surround
-  :after evil
-  :config
-  (global-evil-surround-mode))
-#+end_src
-** Evil commentary
-Allows generalised commenting of objects easily.
-#+begin_src emacs-lisp
-(use-package evil-commentary
-  :after evil
-  :config
-  (evil-commentary-mode))
-#+end_src
-** Evil multi cursor
-Setup for multi cursors in Evil mode.  Don't let evil-mc setup it's own
-keymap because it uses 'gr' as its prefix, which I don't like.
-#+begin_src emacs-lisp
-(use-package evil-mc
-  :after evil
-  :init
-  (defvar evil-mc-key-map (make-sparse-keymap))
-  :general
-  (nmap
-    :infix "gz"
-    "q" #'evil-mc-undo-all-cursors
-    "d" #'evil-mc-make-and-goto-next-match
-    "j" #'evil-mc-make-cursor-move-next-line
-    "k" #'evil-mc-make-cursor-move-prev-line
-    "j" #'evil-mc-make-cursor-move-next-line
-    "m" #'evil-mc-make-all-cursors
-    "z" #'evil-mc-make-cursor-here
-    "r" #'evil-mc-resume-cursors
-    "s" #'evil-mc-pause-cursors
-    "u" #'evil-mc-undo-last-added-cursor)
-  :config
-  ;; (evil-mc-define-vars)
-  ;; (evil-mc-initialize-vars)
-  ;; (add-hook 'evil-mc-before-cursors-created #'evil-mc-pause-incompatible-modes)
-  ;; (add-hook 'evil-mc-before-cursors-created #'evil-mc-initialize-active-state)
-  ;; (add-hook 'evil-mc-after-cursors-deleted  #'evil-mc-teardown-active-state)
-  ;; (add-hook 'evil-mc-after-cursors-deleted  #'evil-mc-resume-incompatible-modes)
-  ;; (advice-add #'evil-mc-initialize-hooks :override #'ignore)
-  ;; (advice-add #'evil-mc-teardown-hooks :override #'evil-mc-initialize-vars)
-  ;; (advice-add #'evil-mc-initialize-active-state :before #'turn-on-evil-mc-mode)
-  ;; (advice-add #'evil-mc-teardown-active-state :after #'turn-off-evil-mc-mode)
-  ;; (add-hook 'evil-insert-state-entry-hook #'evil-mc-resume-cursors)
-  (global-evil-mc-mode))
-#+end_src
-
-** Evil collection
-Provides a community based set of keybindings for most modes in
-Emacs.  I don't necessarily like all my modes having these bindings
-though, as I may disagree with some.  So I use it in a mode to mode basis.
-#+begin_src emacs-lisp
-(use-package evil-collection
-  :after evil)
-#+end_src
-* Completion
-Emacs is a text based interface.  Completion is its bread and butter
-in providing good user experience.  By default Emacs provides
-'completions-list' which produces a buffer of options which can be
-searched and selected.  We can take this further though!
-
-Ido and Icomplete are packages distributed with Emacs to provide
-greater completion interfaces.  They utilise the minibuffer to create
-a more interactive experience, allowing incremental searches and
-option selection.
-
-Ivy and Helm provide more modern interfaces, though Helm is quite
-heavy.  Ivy, on the other hand, provides an interface similar to Ido
-with less clutter and better customisation options.
-** Ivy
-Ivy is a completion framework for Emacs, and my preferred one.  It has
-a great set of features with little to no pain with setting up.
-*** Ivy Core
-Setup for ivy, in preparation for counsel.  Turn on ivy-mode just
-after init.
-
-Setup vim-like bindings for the minibuffer ("M-(j|k)" for down|up the
-selection list).
-#+begin_src emacs-lisp
-(use-package ivy
-  :defer t
-  :hook (after-init-hook . ivy-mode)
-  :general
-  (general-def
-    :keymaps 'ivy-minibuffer-map
-    "C-j"    #'ivy-yank-symbol
-    "M-j"    #'ivy-next-line-or-history
-    "M-k"    #'ivy-previous-line-or-history
-    "C-SPC"  #'ivy-occur)
-  (general-def
-    :keymaps  'ivy-switch-buffer-map
-    "M-j"     #'ivy-next-line-or-history
-    "M-k"     #'ivy-previous-line-or-history)
-  (nmap
-    :keymaps '(ivy-occur-mode-map ivy-occur-grep-mode-map)
-    "RET"    #'ivy-occur-press-and-switch
-    "J"      #'ivy-occur-press
-    "gr"     #'ivy-occur-revert-buffer
-    "q"      #'quit-window
-    "D"      #'ivy-occur-delete-candidate
-    "W"      #'ivy-wgrep-change-to-wgrep-mode
-    "{"      #'compilation-previous-file
-    "}"      #'compilation-next-file)
-  :init
-  (with-eval-after-load "evil"
-    (evil-set-initial-state 'ivy-occur-mode 'normal)
-    (evil-set-initial-state 'ivy-occur-grep-mode 'normal))
-  (with-eval-after-load "amx"
-    (setq amx-backend 'ivy))
-
-  (setq ivy-height 10
-        ivy-wrap t
-        ivy-fixed-height-minibuffer t
-        ivy-use-virtual-buffers nil
-        ivy-virtual-abbreviate 'full
-        ivy-on-del-error-function #'ignore
-        ivy-use-selectable-prompt t)
-  :config
-  (require 'counsel nil t))
-#+end_src
-*** Counsel
-Setup for counsel.  Load after ivy and helpful.
-#+begin_src emacs-lisp
-(use-package counsel
-  :defer t
-  :general
-  (search-leader
-    "s" #'counsel-grep-or-swiper
-    "r" #'counsel-rg)
-  (file-leader
-    "r" #'counsel-recentf)
-  (insert-leader
-    "c" #'counsel-unicode-char)
-  (general-def
-    [remap describe-bindings]        #'counsel-descbinds
-    [remap load-theme]               #'counsel-load-theme)
-  :config
-  (setq ivy-initial-inputs-alist '((org-insert-link . "^"))
-        counsel-describe-function-function #'helpful-callable
-        counsel-describe-variable-function #'helpful-variable
-        counsel-grep-swiper-limit 1500000
-        ivy-re-builders-alist '((swiper . ivy--regex-plus)
-                                (counsel-grep-or-swiper . ivy--regex-plus)
-                                (counsel-rg . ivy--regex-plus)
-                                (t . ivy--regex-ignore-order)))
-  (counsel-mode))
-#+end_src
-*** WIP Ivy posframe
-:PROPERTIES:
-:header-args:emacs-lisp: :tangle no
-:END:
-This makes ivy minibuffer windows use child frames.
-Very nice eyecandy, but can get kinda annoying.
-#+begin_src emacs-lisp
-(use-package ivy-posframe
-  :hook (ivy-mode-hook . ivy-posframe-mode)
-  :straight t
-  :init
-  (setq ivy-posframe-parameters
-        '((left-fringe      . 0)
-          (right-fringe     . 0)
-          (background-color . "grey7")))
-
-  (setq ivy-posframe-display-functions-alist
-        '((t . ivy-posframe-display-at-window-center))))
-#+end_src
-*** WIP Counsel etags
-:PROPERTIES:
-:header-args:emacs-lisp: :tangle no
-:END:
-Counsel etags allows me to search generated tag files for tags.  I
-already have a function defined to generate the tags, so it's just
-searching them which I find to be a bit of a hassle, and where this
-package comes in.
-
-This has been replaced by [[*xref][xref]] which is inbuilt.
-#+begin_src emacs-lisp
-(use-package counsel-etags
-  :after counsel
-  :general
-  (search-leader
-    "t" #'counsel-etags-find-tag))
-#+end_src
-** WIP Ido
-:PROPERTIES:
-:header-args:emacs-lisp: :tangle no
-:END:
-Ido is a very old completion package that still works great to this
-day.  Though it is limited in its scope (and may thus be called a
-completion add-on rather than a full on framework), it is still a very
-powerful package.  With the use of ido-completing-read+, it may be used
-similarly to a fully fledged completion framework.
-
-#+begin_src emacs-lisp
-(use-package ido
-  :demand t
-  :general
-  (general-def
-    :keymaps '(ido-buffer-completion-map
-               ido-file-completion-map
-               ido-file-dir-completion-map
-               ido-common-completion-map)
-    (kbd "M-j")   #'ido-next-match
-    (kbd "M-k")   #'ido-prev-match
-    (kbd "C-x o") #'evil-window-up)
-  :init
-  (setq ido-decorations
-        (list "{" "}" " \n" " ..." "[" "]" " [No match]" " [Matched]"
-              " [Not readable]" " [Too big]" " [Confirm]")
-        completion-styles '(flex partial-completion intials emacs22))
-  (setq-default ido-enable-flex-matching t
-                ido-enable-dot-prefix t
-                ido-enable-regexp nil)
-  (with-eval-after-load "magit"
-    (setq magit-completing-read-function 'magit-ido-completing-read))
-  :config
-  (ido-mode)
-  (ido-everywhere))
-#+end_src
-*** Ido ubiquitous
-Ido completing-read+ is a package that extends the ido package to work
-with more text based functions.
-#+begin_src emacs-lisp
-(use-package ido-completing-read+
-  :after ido
-  :config
-  (ido-ubiquitous-mode +1))
-#+end_src
-** Amx
-Amx is a fork of Smex that works to enhance the
-execute-extended-command interface.  It also provides support for ido
-or ivy (though I'm likely to use ido here) and allows you to switch
-between them.
-
-It provides a lot of niceties such as presenting the key bind when
-looking for a command.
-
-#+begin_src emacs-lisp
-(use-package amx
-  :config
-  (amx-mode))
-#+end_src
-** Orderless
-Orderless sorting method for completion, probably one of the best
-things ever.
-#+begin_src emacs-lisp
-(use-package orderless
-  :after (ivy ido)
-  :config
-  (setf (alist-get t ivy-re-builders-alist) 'orderless-ivy-re-builder))
-#+end_src
-** Completions-list
-In case I ever use the completions list, some basic commands to look
-around.
-#+begin_src emacs-lisp
-(use-package simple
-  :straight nil
-  :general
-  (nmmap
-    :keymaps 'completion-list-mode-map
-    "l"   #'next-completion
-    "h"   #'previous-completion
-    "ESC" #'delete-completion-window
-    "q"   #'quit-window
-    "RET" #'choose-completion)
-  :config
-  (with-eval-after-load "evil"
-    (setq evil-emacs-state-modes (cl-remove-if
-                                  #'(lambda (x) (eq 'completions-list-mode x))
-                                  evil-emacs-state-modes))
-    (add-to-list 'evil-normal-state-modes 'completions-list-mode)))
-#+end_src
-** Company
-Company is the auto complete system I use.  I don't like having heavy
-setups for company as it only makes it slower to use.  In this case,
-just setup some evil binds for company.
-#+begin_src emacs-lisp
-(use-package company
-  :straight t
-  :hook
-  (prog-mode-hook   . company-mode)
-  (eshell-mode-hook . company-mode)
-  :general
-  (imap
-    "C-SPC" #'company-complete)
-  (general-def
-    :states '(normal insert)
-    "M-j" #'company-select-next
-    "M-k" #'company-select-previous))
-#+end_src
-* Pretty symbols
-Prettify symbols mode allows for users to declare 'symbols' that
-replace text within certain modes.  Though this may seem like useless
-eye candy, it has aided my comprehension and speed of recognition
-(recognising symbols is easier than words).
-
-Essentially a use-package keyword which makes declaring pretty symbols
-for language modes incredibly easy.  Checkout my [[C/C++][C/C++]] configuration
-for an example.
-#+begin_src emacs-lisp
-(use-package prog-mode
-  :straight nil
-  :init
-  (setq prettify-symbols-unprettify-at-point t)
-  :config
-  (with-eval-after-load "use-package-core"
-    (add-to-list 'use-package-keywords ':pretty)
-    (defun use-package-normalize/:pretty (_name-symbol _keyword args)
-      args)
-
-    (defun use-package-handler/:pretty (name _keyword args rest state)
-      (use-package-concat
-       (use-package-process-keywords name rest state)
-       (mapcar
-        #'(lambda (arg)
-            (let ((mode (car arg))
-                  (rest (cdr arg)))
-              `(add-hook
-                ',mode
-                #'(lambda nil
-                    (setq prettify-symbols-alist ',rest)
-                    (prettify-symbols-mode)))))
-        args)))))
-#+end_src
-
-Here's a collection of keywords and possible associated symbols for
-any prog language of choice.  Mostly for reference and copying.
-#+begin_example
-("null"   . "Ø")
-("list"   . "ℓ")
-("string" . "𝕊")
-("true"   . "⊤")
-("false"  . "⊥")
-("char"   . "ℂ")
-("int"    . "ℤ")
-("float"  . "ℝ")
-("!"      . "¬")
-("&&"     . "∧")
-("||"      . "∨")
-("for"    . "∀")
-("return" . "⟼")
-("print"  . "ℙ")
-("lambda" . "λ")
-#+end_example
-* Window management
-Emacs' default window management is quite bad, eating other windows on
-a whim and not particularly caring for the current window setup.
-Thankfully you can change this via the ~display-buffer-alist~ which
-matches buffer names with how the window for the buffer should be
-displayed.  I add a use-package keyword to make ~display-buffer-alist~
-records within use-package.
-
-I have no idea whether it's optimal AT ALL, but it works for me.
-#+begin_src emacs-lisp
-(use-package window
-  :straight nil
-  :general
-  (buffer-leader
-    "b" #'switch-to-buffer
-    "d" #'kill-current-buffer
-    "K" #'kill-buffer
-    "j" #'next-buffer
-    "k" #'previous-buffer
-    "D" '(+oreo/clean-buffer-list :which-key "Kill most buffers"))
-  :init
-  (with-eval-after-load "use-package-core"
-    (add-to-list 'use-package-keywords ':display)
-    (defun use-package-normalize/:display (_name-symbol _keyword args)
-      args)
-
-    (defun use-package-handler/:display (name _keyword args rest state)
-      (use-package-concat
-       (use-package-process-keywords name rest state)
-       (mapcar
-        #'(lambda (arg)
-            `(add-to-list 'display-buffer-alist
-                          ',arg))
-        args)))))
-#+end_src
-** Some display records
-Using the ~:display~ keyword, setup up some ~display-buffer-alist~
-records.  This is mostly for packages that aren't really configured
-(like [[info:woman][woman]]) or packages that were configured before
-(like [[Ivy][Ivy]]).
-#+begin_src emacs-lisp
-(use-package window
-  :straight nil
-  :defer t
-  :display
-  ("\\*Process List\\*"
-   (display-buffer-at-bottom)
-   (window-height . 0.25))
-
-  ("\\*\\(Ido \\)?Completions\\*"
-   (display-buffer-in-side-window)
-   (window-height . 0.25)
-   (side . bottom))
-
-  ("\\*ivy-occur.*"
-   (display-buffer-at-bottom)
-   (window-height . 0.25))
-
-  ("\\*Async Shell Command\\*"
-   (display-buffer-at-bottom)
-   (window-height . 0.25)))
-#+end_src
-* Auto typing
-Snippets are a pretty nice way of automatically inserting code.  Emacs
-provides a ton of packages by default to do this, but there are great
-packages to install as well.
-
-Abbrevs and skeletons make up a popular solution within Emacs default.
-Abbrevs are for simple expressions wherein the only input is the key,
-and the output is some Elisp function.  They provide a lot of inbuilt
-functionality and are quite useful.  Skeletons, on the other hand, are
-for higher level insertions
-
-The popular external solution is Yasnippet.  Yasnippet is a great
-package for snippets, which I use heavily in programming and org-mode.
-I setup here the global mode for yasnippet and a collection of
-snippets for ease of use.
-** Abbrevs
-Just define a few abbrevs for various date-time operations.  Also
-define a macro that will assume a function for the expansion, helping
-with abstracting a few things away.
-#+begin_src emacs-lisp
-(use-package abbrev
-  :straight nil
-  :hook
-  (prog-mode-hook . abbrev-mode)
-  (text-mode-hook . abbrev-mode)
-  :init
-  (defmacro +abbrev/define-abbrevs (abbrev-table &rest abbrevs)
-    `(progn
-       ,@(mapcar #'(lambda (abbrev)
-                     `(define-abbrev
-                        ,abbrev-table
-                        ,(car abbrev)
-                        ""
-                        (proc (insert ,(cadr abbrev)))))
-                 abbrevs)))
-  (setq save-abbrevs nil)
-  :config
-  (+abbrev/define-abbrevs
-   global-abbrev-table
-   ("sdate"
-    (format-time-string "%Y-%m-%d" (current-time)))
-   ("stime"
-    (format-time-string "%H:%M:%S" (current-time)))
-   ("sday"
-    (format-time-string "%A" (current-time)))
-   ("smon"
-    (format-time-string "%B" (current-time)))))
-#+end_src
-** WIP Skeletons
-:PROPERTIES:
-:header-args:emacs-lisp: :tangle no
-:END:
-Defines a macro for generating a skeleton + abbrev for a given mode.
-Doesn't sanitise inputs because I assume callers are /rational/ actors
-who would *only* use this for their top level Emacs config.
-
-Honestly didn't find much use for this currently, so disabled.
-#+begin_src emacs-lisp
-(use-package skeleton
-  :straight nil
-  :after abbrev
-  :config
-  (defmacro +autotyping/gen-skeleton-abbrev (mode abbrev &rest skeleton)
-    (let* ((table          (intern (concat (symbol-name mode) "-abbrev-table")))
-           (skeleton-name  (intern (concat "+skeleton/" (symbol-name mode) "/" abbrev))))
-      `(progn
-         (define-skeleton
-           ,skeleton-name
-           ""
-           ,@skeleton)
-         (define-abbrev ,table
-           ,abbrev
-           ""
-           ',skeleton-name)))))
-#+end_src
-** Auto insert
-Allows inserting text immediately upon creating a new buffer with a
-given name.  Supports skeletons for inserting text.  To make it easier
-for later systems to define their own auto inserts, I define a
-~use-package~ keyword ~auto-insert~ which allows one to define an
-entry for ~auto-insert-alist~.
-#+begin_src emacs-lisp
-(use-package autoinsert
-  :straight nil
-  :demand t
-  :hook (after-init-hook . auto-insert-mode)
-  :config
-  (with-eval-after-load "use-package-core"
-    (add-to-list 'use-package-keywords ':auto-insert)
-    (defun use-package-normalize/:auto-insert (_name-symbol _keyword args)
-      args)
-    (defun use-package-handler/:auto-insert (name _keyword args rest state)
-      (use-package-concat
-       (use-package-process-keywords name rest state)
-       (mapcar
-        #'(lambda (arg)
-            `(add-to-list
-              'auto-insert-alist
-              ',arg))
-        args)))))
-#+end_src
-** Yasnippet default
-Look at the snippets [[file:../.config/yasnippet/snippets/][folder]]
-for all snippets I've got.
-#+begin_src emacs-lisp
-(use-package yasnippet
-  :defer t
-  :hook
-  (prog-mode-hook . yas-minor-mode)
-  :general
-  (insert-leader
-    "i" #'yas-insert-snippet)
-  :config
-  (yas-load-directory (no-littering-expand-etc-file-name "yasnippet/snippets")))
-#+end_src
diff --git a/Emacs/.config/emacs/early-init.el b/Emacs/.config/emacs/early-init.el
index dd0be9a..da57d3c 100644
--- a/Emacs/.config/emacs/early-init.el
+++ b/Emacs/.config/emacs/early-init.el
@@ -35,5 +35,5 @@
 (push '(menu-bar-lines . 0) default-frame-alist)
 (push '(tool-bar-lines . 0) default-frame-alist)
 (push '(vertical-scroll-bars) default-frame-alist)
-(push '(alpha . 85) default-frame-alist)
+(push '(alpha . (85 80)) default-frame-alist)
 (advice-add #'x-apply-session-resources :override #'ignore)
diff --git a/Emacs/.config/emacs/elisp/ada-mode.el b/Emacs/.config/emacs/elisp/ada-mode.el
index a789fc2..1d83da9 100644
--- a/Emacs/.config/emacs/elisp/ada-mode.el
+++ b/Emacs/.config/emacs/elisp/ada-mode.el
@@ -5,10 +5,9 @@
 ;; Author: Aryadev Chavali <aryadev@aryadevchavali.com>
 ;; Keywords: faces, languages
 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License Version
+;; 2 as published by the Free Software Foundation.
 
 ;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/Emacs/.config/emacs/elisp/haskell-multiedit.el b/Emacs/.config/emacs/elisp/haskell-multiedit.el
index 1dc857f..81a5338 100644
--- a/Emacs/.config/emacs/elisp/haskell-multiedit.el
+++ b/Emacs/.config/emacs/elisp/haskell-multiedit.el
@@ -1,14 +1,15 @@
-;;; haskell-multiedit.el --- Minor mode to edit and evaluate multi-line scripts of Haskell without making a file  -*- lexical-binding: t; -*-
+;;; haskell-multiedit.el --- Minor mode to edit and evaluate
+;;; multi-line scripts of Haskell without making a file
+;;; -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2021  Aryadev Chavali
 
 ;; Author: Aryadev Chavali <aryadev@aryadevchavali.com>
 ;; Keywords:
 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License version
+;; 2 as published by the Free Software Foundation.
 
 ;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -35,9 +36,8 @@
   "Minor mode for haskell buffers generated by haskell-interactive-mode.
 Provides bindings to retrieve content back into the REPL with
 full multi-edit commands"
-  nil
-  ""
-  haskell-multiedit-mode-map)
+  :lighter nil
+  :keymap haskell-multiedit-mode-map)
 
 (with-eval-after-load "haskell"
   (defun haskell-multiedit ()
diff --git a/Emacs/.config/emacs/elisp/hide-mode-line.el b/Emacs/.config/emacs/elisp/hide-mode-line.el
index a16667d..488bf3f 100644
--- a/Emacs/.config/emacs/elisp/hide-mode-line.el
+++ b/Emacs/.config/emacs/elisp/hide-mode-line.el
@@ -5,10 +5,9 @@
 ;; Author: Aryadev Chavali <aryadev@aryadevchavali.com>
 ;; Keywords:
 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License version
+;; 2 as published by the Free Software Foundation.
 
 ;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,11 +30,9 @@
   "Hides the mode line."
   :lighter nil
   (if mode-line-format
-      (progn
-        (setq-local hide-mode-line--prev-mode-line mode-line-format)
-        (setq-local mode-line-format nil))
-      (setq-local mode-line-format hide-mode-line--prev-mode-line)))
-
+      (setq-local hide-mode-line--prev-mode-line mode-line-format
+                  mode-line-format nil)
+    (setq-local mode-line-format hide-mode-line--prev-mode-line)))
 
 (provide 'hide-mode-line)
 ;;; hide-mode-line.el ends here
diff --git a/Emacs/.config/emacs/elisp/license.el b/Emacs/.config/emacs/elisp/license.el
index 8ea64fd..a4922ab 100644
--- a/Emacs/.config/emacs/elisp/license.el
+++ b/Emacs/.config/emacs/elisp/license.el
@@ -5,10 +5,9 @@
 ;; Author: Aryadev Chavali <aryadev@aryadevchavali.com>
 ;; Keywords:
 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License version
+;; 2 as published by the Free Software Foundation.
 
 ;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +18,7 @@
 ;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
-
 ;;
-
 ;;; Code:
 
 (defvar +license/license-choice nil)
@@ -419,20 +416,22 @@ For more information, please refer to <https://unlicense.org>")))
     (car (alist-get choice +license/licenses-alist "" nil #'string=))))
 
 (defun +license/copyright-notice ()
-  (let ((license-name (or (if (listp +license/license-choice)
-                              (car +license/license-choice)
-                            +license/license-choice)
-                          "Unlicense")))
-    (format "Copyright (C) %s %s
-
-You may distribute and modify this code under the terms of the %s
+  (let ((license-name (if (listp +license/license-choice)
+                          (car +license/license-choice)
+                        +license/license-choice)))
+    (concat
+     (format "Copyright (C) %s %s\n\n" (format-time-string "%Y") user-full-name)
+     (if license-name
+         (format "You may distribute and modify this code under the terms of the %s
 license.  You should have received a copy of the %s license with
 this file.  If not, please write to: %s."
-            (format-time-string "%Y")
-            user-full-name
-            license-name
-            license-name
-            user-mail-address)))
+                 license-name
+                 license-name
+                 user-mail-address)
+       (format
+        "All rights reserved. You may not distribute or modify this code
+without explicit legal permission from the author \"%s\""
+        user-full-name)))))
 
 (defun +license/insert-complete-license ()
   (interactive)
diff --git a/Emacs/.config/emacs/elisp/literate.el b/Emacs/.config/emacs/elisp/literate.el
index 114c3bb..43c39d8 100644
--- a/Emacs/.config/emacs/elisp/literate.el
+++ b/Emacs/.config/emacs/elisp/literate.el
@@ -5,10 +5,9 @@
 ;; Author: Aryadev Chavali <aryadev@aryadevchavali.com>
 ;; Keywords:
 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License version
+;; 2 as published by the Free Software Foundation.
 
 ;; This program is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,6 +23,16 @@
 
 ;;; Code:
 
+;; Predicates
+(defun +literate/org-to-el (name)
+  (string-replace ".org" ".el" name))
+
+(defun +literate/org-to-elc (name)
+  (string-replace ".org" ".elc" name))
+
+(defun +literate/el-to-elc (name)
+  (string-replace ".el" ".elc" name))
+
 (defun +literate/filter (predicate list)
   (if (null list)
       nil
@@ -39,70 +48,120 @@
 (defun +literate/el-p (filename)
   (string= "el" (file-name-extension filename)))
 
-(defconst +literate/org-files
-  (+literate/filter
-   #'+literate/org-p
-   (mapcar #'(lambda (file) (concat user-emacs-directory file))
-           (cddr (directory-files user-emacs-directory)))))
+(defun +literate/--reduce-bool (bools init)
+  (if (= (length bools) 0)
+      init
+    (+literate/--reduce-bool (cdr bools) (and (car bools) init))))
 
-(defconst +literate/output-files
-  (mapcar #'(lambda (x) (replace-regexp-in-string ".org" ".el" x)) +literate/org-files))
+;; Files
+(defconst +literate/org-files
+  (mapcar #'(lambda (x) (expand-file-name (concat user-emacs-directory x)))
+     (list "config.org")))
 
-(defconst +literate/elisp-files
+(defconst +literate/el-init-files
   `(,(concat user-emacs-directory "early-init.el")
-    ,(concat user-emacs-directory "init.el")
-    ,@+literate/output-files
-    ,@(mapcar
-       #'(lambda (name) (concat user-emacs-directory "elisp/" name))
-       ;; Only take .el files
-       (+literate/filter
-	      #'+literate/el-p
-        (cddr (directory-files (concat user-emacs-directory "elisp/")))))))
+    ,(concat user-emacs-directory "init.el")))
 
-;; Setup predicates and loading
+(defconst +literate/el-lib-files
+  (mapcar
+   #'(lambda (name) (concat user-emacs-directory "elisp/" name))
+   ;; Only take .el files
+   (+literate/filter
+	  #'+literate/el-p
+    (cddr (directory-files (concat user-emacs-directory "elisp/"))))))
 
-(defun +literate/--reduce-bool (bools init)
-  (if (= (length bools) 0)
-      init
-    (+literate/--reduce-bool (cdr bools) (and (car bools) init))))
+(defconst +literate/el-org-files
+  (mapcar #'+literate/org-to-el +literate/org-files))
 
-(defun +literate/output-files-exist ()
-  "Checks if output files exist, for compilation purposes."
-  (if (< 1 (length +literate/output-files))
-      (+literate/--reduce-bool (mapcar #'file-exists-p +literate/output-files) t)
-    (file-exists-p (car +literate/output-files))))
+(defconst +literate/el-files
+  (cl-concatenate
+   'list
+   +literate/el-init-files
+   +literate/el-lib-files
+   +literate/el-org-files))
 
-(defun +literate/load-config ()
-  "Load the first file in +literate/output-files."
-  (interactive)
-  (load-file (concat user-emacs-directory "config.el")))
+(defconst +literate/elc-init-files
+  (mapcar #'+literate/el-to-elc +literate/el-init-files))
+
+(defconst +literate/elc-lib-files
+  (mapcar #'+literate/el-to-elc +literate/el-lib-files))
+
+(defconst +literate/elc-org-files
+  (mapcar #'+literate/org-to-elc +literate/org-files))
 
+(defvar +literate/bytecompile? t
+  "Bytecompile all files?")
+
+;; Basic compilation and loading files
 (autoload #'org-babel-tangle-file "ob-tangle")
 
 (defun +literate/tangle-if-old (org-file)
-  (let ((output-file (replace-regexp-in-string ".org" ".el" org-file)))
-    (message "Tangle(%s)->%s" org-file output-file)
-    (if (or (not (file-exists-p output-file)) (file-newer-than-file-p org-file output-file))
-        (org-babel-tangle-file org-file))))
+  (let ((output-file (+literate/org-to-el org-file)))
+    (when (file-newer-than-file-p org-file output-file)
+      (message "[Literate]:\tTangle(%s)->%s" org-file output-file)
+      (org-babel-tangle-file org-file))))
 
 (defun +literate/byte-compile-if-old (el-file)
-  (let ((output-file (replace-regexp-in-string ".el" ".elc" el-file)))
-    (if (file-newer-than-file-p el-file output-file)
-        (byte-compile-file el-file))))
+  (let ((output-file (+literate/el-to-elc el-file)))
+    (when (file-newer-than-file-p el-file output-file)
+      (message "[Literate]:\tByteCompile(%s)->%s" el-file output-file)
+      (byte-compile-file el-file))))
+
+(defun +literate/load-org-file (org-file)
+  (+literate/tangle-if-old org-file)
+  (load-file (+literate/org-to-el org-file)))
+
+(defun +literate/load-config ()
+  "Load the config.el."
+  (interactive)
+  (mapcar #'+literate/tangle-if-old +literate/org-files)
+  (load-file (concat user-emacs-directory "config.el")))
+
+;; Compiling all files
+(defun +literate/compile-init-files ()
+  (when +literate/bytecompile?
+    (message "[Literate/init]: Byte compiling init files...")
+    (mapc #'+literate/byte-compile-if-old +literate/el-init-files))
+  (message "[Literate/init]: Init files compiled!"))
+
+(defun +literate/compile-lib-files ()
+  (when +literate/bytecompile?
+    (message "[Literate/lib]: Byte compiling lib files...")
+    (mapc #'+literate/byte-compile-if-old +literate/el-lib-files))
+  (message "[Literate/lib]: Lib files compiled!"))
+
+(defun +literate/compile-org-files ()
+  (message "[Literate/org]: Tangling org files...")
+  (mapc #'+literate/tangle-if-old +literate/org-files)
+  (message "[Literate/org]: Tangled org files!")
+  (when +literate/bytecompile?
+    (message "[Literate/org]: Byte compiling org files...")
+    (mapc #'+literate/byte-compile-if-old +literate/el-org-files)
+    (message "[Literate/org]: Byte compiled org files!")))
 
 (defun +literate/compile-config ()
   "Compile all files in +literate/org-files via org-babel-tangle."
   (interactive)
-  (message "Compiling files...")
-  (mapc #'+literate/tangle-if-old +literate/org-files)
-  (message "Files compiled")
-
-  (message "Byte-compiling literate files...")
-  (mapc #'+literate/byte-compile-if-old +literate/output-files)
-  (message "Literate files byte-compiled")
-  (message "Byte compiling init.el, early-init.el, *.org~>*.el elisp/*")
-  (mapc #'+literate/byte-compile-if-old +literate/elisp-files)
-  (message "Finished byte-compiling"))
+  (message "[Literate]: Starting compilation...")
+  (+literate/compile-init-files)
+  (+literate/compile-lib-files)
+  (+literate/compile-org-files)
+  (message "[Literate]: Finished compilation!"))
+
+;; Cleaning config
+(defun +literate/clean-config ()
+  "Removes all .el files generated by literate org files and .elc
+files by byte compilation"
+  (interactive)
+  (message "[Literate]: Cleaning configuration...")
+  (mapcar #'delete-file
+     (cl-concatenate
+      'list
+      +literate/el-org-files
+      +literate/elc-init-files
+      +literate/elc-lib-files
+      +literate/elc-org-files))
+  (message "[Literate]: Cleaned configuration!"))
 
 (provide 'literate)
 ;;; literate.el ends here
diff --git a/Emacs/.config/emacs/elisp/move.el b/Emacs/.config/emacs/elisp/move.el
new file mode 100644
index 0000000..ed154fb
--- /dev/null
+++ b/Emacs/.config/emacs/elisp/move.el
@@ -0,0 +1,80 @@
+;;; move-line.el --- Move current line up or down    -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2024  Aryadev Chavali
+
+;; Author: Aryadev Chavali <aryadev@aryadevchavali.com>
+;; Keywords:
+
+;; This is free and unencumbered software released into the public domain.
+
+;; Anyone is free to copy, modify, publish, use, compile, sell, or
+;; distribute this software, either in source code form or as a compiled
+;; binary, for any purpose, commercial or non-commercial, and by any
+;; means.
+
+;; In jurisdictions that recognize copyright laws, the author or authors
+;; of this software dedicate any and all copyright interest in the
+;; software to the public domain. We make this dedication for the benefit
+;; of the public at large and to the detriment of our heirs and
+;; successors. We intend this dedication to be an overt act of
+;; relinquishment in perpetuity of all present and future rights to this
+;; software under copyright law.
+
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+;; IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+;; OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+;; ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+;; OTHER DEALINGS IN THE SOFTWARE.
+
+;; For more information, please refer to <https://unlicense.org>
+
+;;; Commentary:
+
+;; Move the current line up or down.  Shamelessly copied from
+;; https://emacsredux.com/blog/2013/04/02/move-current-line-up-or-down/ so
+
+;;; Code:
+
+(defmacro +move/create-move (name description &rest body)
+  `(defun ,name (&optional arg)
+     ,description
+     (interactive "P")
+     (let ((arg (if (or (null arg) (< arg 1)) 1 arg)))
+       (while (not (= arg 0))
+         ,@body
+         (setq arg (- arg 1))))))
+
+(+move/create-move
+ +move/line-up
+ "Move the current line up"
+ (transpose-lines 1)
+ (forward-line -2)
+ (indent-according-to-mode))
+
+(+move/create-move
+ +move/line-down
+ "Move the current line down"
+ (forward-line 1)
+ (transpose-lines 1)
+ (forward-line -1)
+ (indent-according-to-mode))
+
+(+move/create-move
+ +move/word-forward
+ "Move the current word forward"
+ (forward-word 1)
+ (transpose-words 1)
+ (forward-word -1)
+ (indent-according-to-mode))
+
+(+move/create-move
+ +move/word-backward
+ "Move the current word backward"
+ (transpose-words 1)
+ (forward-word -2)
+ (indent-according-to-mode))
+
+(provide 'move)
+;;; move.el ends here
diff --git a/Emacs/.config/emacs/elisp/org-bookmark.el b/Emacs/.config/emacs/elisp/org-bookmark.el
new file mode 100644
index 0000000..6bbad5d
--- /dev/null
+++ b/Emacs/.config/emacs/elisp/org-bookmark.el
@@ -0,0 +1,77 @@
+;;; org-bookmark.el --- Bookmark manager using org-mode  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2024  Aryadev Chavali
+
+;; Author: Aryadev Chavali <aryadev@aryadevchavali.com>
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License Version
+;; 2 as published by the Free Software Foundation.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+(require 'org)
+
+(defvar +bookmark/file (expand-file-name "~/Text/bookmarks.org"))
+(defvar +bookmark/mpv-args "--ytdl-raw-options=force-ipv4= --ytdl-format=22")
+
+(defun +bookmark/bookmarks ()
+  (with-current-buffer (find-file-noselect +bookmark/file)
+    (org-scan-tags
+     #'(lambda nil
+         (let ((heading-components (org-heading-components)))
+           (cons
+            (concat (nth 4 heading-components) (nth 5 heading-components))
+            (substring-no-properties (org-agenda-get-some-entry-text
+                                      (point-marker)
+                                      most-positive-fixnum)))))
+     (cdr (org-make-tags-matcher ":bookmark:"))
+     nil)))
+
+(defun +bookmark/open-bookmark ()
+  (interactive)
+  (let* ((bookmarks (+bookmark/bookmarks))
+         (choice (completing-read "Choose bookmark: "
+                                  (mapcar #'car bookmarks)
+                                  nil t))
+         (pair (assoc choice bookmarks #'string=)))
+    (if (null pair)
+        (error (format "`%s' is not a valid bookmark" choice))
+      (message "[bookmark]: Opening `%s`" (car pair))
+      (cond
+       ((or
+         (string-match-p "^https://\\(www.\\)?youtu\\(.\\)?be" (cdr pair))
+         (string-match-p "\\.mp4$" (cdr pair)))
+        ;; Open MPV
+        (message "[bookmark]: Starting MPV process")
+        (with-current-buffer (get-buffer-create "*mpv*")
+          (ansi-color-for-comint-mode-on)
+          (comint-mode))
+        (set-process-filter (start-process-shell-command
+                             "bookmark-mpv" "*mpv*"
+                             (concat
+                              "mpv "
+                              +bookmark/mpv-args
+                              " \""
+                              (cdr pair)
+                              "\""))
+                            #'comint-output-filter))
+       (t
+        (message "[bookmark]: Starting eww")
+        (eww (cdr pair)))))))
+
+(provide 'org-bookmark)
+;;; bookmark.el ends here
diff --git a/Emacs/.config/emacs/elisp/personal-light-theme.el b/Emacs/.config/emacs/elisp/personal-light-theme.el
index 5486b5c..3747f05 100644
--- a/Emacs/.config/emacs/elisp/personal-light-theme.el
+++ b/Emacs/.config/emacs/elisp/personal-light-theme.el
@@ -3,18 +3,17 @@
 
 (custom-theme-set-faces
  'personal-light
- '(default ((t (:family "Source Code Pro" :foundry "ADBO" :width normal :height 143 :weight normal :slant normal :underline nil :overline nil :extend nil :strike-through nil :box nil :inverse-video nil :foreground "black" :background "white" :stipple nil :inherit nil))))
- '(cursor ((((background light)) (:background "black")) (((background dark)) (:background "white"))))
- '(fixed-pitch ((t (:family "Monospace"))))
- '(variable-pitch ((((type w32)) (:foundry "outline" :family "Arial")) (t (:family "Sans Serif"))))
+ '(button ((t (:inherit (link)))))
+ '(company-preview
+   ((t (:foreground "black" :background "deepskyblue"))))
+ '(company-preview-common ((t (:inherit company-preview))))
+ '(company-tooltip ((t (:background "white" :foreground "black"))))
+ '(company-tooltip-annotation ((t (:foreground "grey70" :slant italic))))
+ '(company-tooltip-selection ((t (:background "grey80" :slant italic))))
+ '(cursor ((t (:background "grey50"))))
+ '(dired-ignored ((t (:background "grey80" :slant italic :underline t))))
  '(escape-glyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown"))))
- '(homoglyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown"))))
- '(minibuffer-prompt ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "medium blue"))))
- '(highlight ((((class color) (min-colors 88) (background light)) (:background "darkseagreen2")) (((class color) (min-colors 88) (background dark)) (:background "darkolivegreen")) (((class color) (min-colors 16) (background light)) (:background "darkseagreen2")) (((class color) (min-colors 16) (background dark)) (:background "darkolivegreen")) (((class color) (min-colors 8)) (:foreground "black" :background "green")) (t (:inverse-video t))))
- '(region ((t (:extend t :background "green yellow" :distant-foreground "gtk_selection_fg_color"))))
- '(shadow ((((class color grayscale) (min-colors 88) (background light)) (:foreground "grey50")) (((class color grayscale) (min-colors 88) (background dark)) (:foreground "grey70")) (((class color) (min-colors 8) (background light)) (:foreground "green")) (((class color) (min-colors 8) (background dark)) (:foreground "yellow"))))
- '(secondary-selection ((((class color) (min-colors 88) (background light)) (:extend t :background "yellow1")) (((class color) (min-colors 88) (background dark)) (:extend t :background "SkyBlue4")) (((class color) (min-colors 16) (background light)) (:extend t :background "yellow")) (((class color) (min-colors 16) (background dark)) (:extend t :background "SkyBlue4")) (((class color) (min-colors 8)) (:extend t :foreground "black" :background "cyan")) (t (:inverse-video t))))
- '(trailing-whitespace ((((class color) (background light)) (:background "red1")) (((class color) (background dark)) (:background "red1")) (t (:inverse-video t))))
+ '(fixed-pitch ((t (:family "Monospace"))))
  '(font-lock-builtin-face ((((class grayscale) (background light)) (:weight bold :foreground "LightGray")) (((class grayscale) (background dark)) (:weight bold :foreground "DimGray")) (((class color) (min-colors 88) (background light)) (:foreground "dark slate blue")) (((class color) (min-colors 88) (background dark)) (:foreground "LightSteelBlue")) (((class color) (min-colors 16) (background light)) (:foreground "Orchid")) (((class color) (min-colors 16) (background dark)) (:foreground "LightSteelBlue")) (((class color) (min-colors 8)) (:weight bold :foreground "blue")) (t (:weight bold))))
  '(font-lock-comment-delimiter-face ((t (:inherit (font-lock-comment-face)))))
  '(font-lock-comment-face ((t (:foreground "dim gray"))))
@@ -31,26 +30,37 @@
  '(font-lock-type-face ((((class grayscale) (background light)) (:weight bold :foreground "Gray90")) (((class grayscale) (background dark)) (:weight bold :foreground "DimGray")) (((class color) (min-colors 88) (background light)) (:foreground "ForestGreen")) (((class color) (min-colors 88) (background dark)) (:foreground "PaleGreen")) (((class color) (min-colors 16) (background light)) (:foreground "ForestGreen")) (((class color) (min-colors 16) (background dark)) (:foreground "PaleGreen")) (((class color) (min-colors 8)) (:foreground "green")) (t (:underline (:color foreground-color :style line) :weight bold))))
  '(font-lock-variable-name-face ((((class grayscale) (background light)) (:slant italic :weight bold :foreground "Gray90")) (((class grayscale) (background dark)) (:slant italic :weight bold :foreground "DimGray")) (((class color) (min-colors 88) (background light)) (:foreground "sienna")) (((class color) (min-colors 88) (background dark)) (:foreground "LightGoldenrod")) (((class color) (min-colors 16) (background light)) (:foreground "DarkGoldenrod")) (((class color) (min-colors 16) (background dark)) (:foreground "LightGoldenrod")) (((class color) (min-colors 8)) (:weight light :foreground "yellow")) (t (:slant italic :weight bold))))
  '(font-lock-warning-face ((t (:inherit (error)))))
- '(button ((t (:inherit (link)))))
- '(link ((t (:underline (:color foreground-color :style line) :foreground "RoyalBlue3"))))
- '(link-visited ((t (:foreground "magenta4" :inherit (link)))))
  '(fringe ((((class color) (background light)) (:background "grey95")) (((class color) (background dark)) (:background "grey10")) (t (:background "gray"))))
  '(header-line ((t (:box nil :foreground "grey20" :background "grey90" :inherit (mode-line)))))
- '(tooltip ((t (:foreground "black" :background "lightyellow" :inherit (variable-pitch)))))
- '(mode-line ((t (:box (:line-width (1 . -1) :color nil :style released-button) :foreground "black" :background "grey75"))))
- '(mode-line-buffer-id ((t (:weight bold))))
- '(mode-line-emphasis ((t (:weight bold))))
- '(mode-line-highlight ((t (:box (:line-width (2 . 2) :color "grey40" :style released-button)))))
- '(mode-line-inactive ((t (:weight light :box (:line-width (1 . -1) :color "grey75" :style nil) :foreground "grey20" :background "grey90" :inherit (mode-line)))))
+ '(highlight ((t (:background "grey90"))))
+ '(homoglyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown"))))
  '(isearch ((((class color) (min-colors 88) (background light)) (:foreground "lightskyblue1" :background "magenta3")) (((class color) (min-colors 88) (background dark)) (:foreground "brown4" :background "palevioletred2")) (((class color) (min-colors 16)) (:foreground "cyan1" :background "magenta4")) (((class color) (min-colors 8)) (:foreground "cyan1" :background "magenta4")) (t (:inverse-video t))))
  '(isearch-fail ((((class color) (min-colors 88) (background light)) (:background "RosyBrown1")) (((class color) (min-colors 88) (background dark)) (:background "red4")) (((class color) (min-colors 16)) (:background "red")) (((class color) (min-colors 8)) (:background "red")) (((class color grayscale)) (:foreground "grey")) (t (:inverse-video t))))
  '(lazy-highlight ((((class color) (min-colors 88) (background light)) (:background "paleturquoise")) (((class color) (min-colors 88) (background dark)) (:background "paleturquoise4")) (((class color) (min-colors 16)) (:background "turquoise3")) (((class color) (min-colors 8)) (:background "turquoise3")) (t (:underline (:color foreground-color :style line)))))
+ '(link ((t (:underline (:color foreground-color :style line) :foreground "RoyalBlue3"))))
+ '(link-visited ((t (:foreground "magenta4" :inherit (link)))))
  '(match ((((class color) (min-colors 88) (background light)) (:background "khaki1")) (((class color) (min-colors 88) (background dark)) (:background "RoyalBlue3")) (((class color) (min-colors 8) (background light)) (:foreground "black" :background "yellow")) (((class color) (min-colors 8) (background dark)) (:foreground "white" :background "blue")) (((type tty) (class mono)) (:inverse-video t)) (t (:background "gray"))))
+ '(minibuffer-prompt ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "medium blue"))))
+ '(mode-line ((t (:box nil :background "LightSkyBlue" :foreground "black"))))
+ '(mode-line-buffer-id ((t (:weight bold))))
+ '(mode-line-emphasis ((t (:weight bold))))
+ '(mode-line-highlight ((t (:box (:line-width (2 . 2) :color "grey40" :style released-button)))))
+ '(mode-line-inactive ((t (:foreground "grey20" :background "grey90" :inherit (mode-line)))))
  '(next-error ((t (:inherit (region)))))
- '(query-replace ((t (:inherit (isearch)))))
  '(org-block ((t (:background "white" :inherit shadow))))
- '(whitespace-space ((t (:background "white" :foreground "lightgray"))))
+ '(query-replace ((t (:inherit (isearch)))))
+ '(region ((t (:extend t :background "green yellow" :distant-foreground "gtk_selection_fg_color"))))
+ '(secondary-selection ((((class color) (min-colors 88) (background light)) (:extend t :background "yellow1")) (((class color) (min-colors 88) (background dark)) (:extend t :background "SkyBlue4")) (((class color) (min-colors 16) (background light)) (:extend t :background "yellow")) (((class color) (min-colors 16) (background dark)) (:extend t :background "SkyBlue4")) (((class color) (min-colors 8)) (:extend t :foreground "black" :background "cyan")) (t (:inverse-video t))))
+ '(shadow ((((class color grayscale) (min-colors 88) (background light)) (:foreground "grey50")) (((class color grayscale) (min-colors 88) (background dark)) (:foreground "grey70")) (((class color) (min-colors 8) (background light)) (:foreground "green")) (((class color) (min-colors 8) (background dark)) (:foreground "yellow"))))
+ '(tab-bar ((t (:background "white"))))
+ '(tab-bar-tab ((t (:foreground "gray30" :background "white"))))
+ '(tab-bar-tab-inactive ((t (:foreground "gray13" :background "gray80"))))
+ '(tooltip ((t (:foreground "black" :background "lightyellow" :inherit (variable-pitch)))))
+ '(trailing-whitespace ((((class color) (background light)) (:background "red1")) (((class color) (background dark)) (:background "red1")) (t (:inverse-video t))))
+ '(variable-pitch ((((type w32)) (:foundry "outline" :family "Arial")) (t (:family "Sans Serif"))))
  '(whitespace-line ((t (:background "white" :foreground "violet"))))
+ '(whitespace-space ((t (:background "white" :foreground "lightgray"))))
+ '(default ((t (:family "Source Code Pro" :foundry "ADBO" :width normal :height 143 :weight normal :slant normal :underline nil :overline nil :extend nil :strike-through nil :box nil :inverse-video nil :foreground "black" :background "white" :stipple nil :inherit nil))))
  )
 
 (provide-theme 'personal-light)
diff --git a/Emacs/.config/emacs/elisp/personal-primary-theme.el b/Emacs/.config/emacs/elisp/personal-primary-theme.el
index 747b483..07ef4fa 100644
--- a/Emacs/.config/emacs/elisp/personal-primary-theme.el
+++ b/Emacs/.config/emacs/elisp/personal-primary-theme.el
@@ -3,26 +3,30 @@
 
 (custom-theme-set-faces
  'personal-primary
- '(line-number ((t (:foreground "gray45" :background "gray1" :inherit (default)))))
- '(line-number-current-line ((t (:foreground "white" :background "gray1" :inherit (default)))))
+ '(button ((t (:inherit (link)))))
+ '(tab-bar ((t (:background "grey13"))))
+ '(tab-bar-tab ((t (:background "grey20" :foreground "white" :box (:color )))))
+ '(tab-bar-tab-inactive ((t (:background "grey13" :foreground "DimGrey"))))
  '(child-frame-border ((t (:background "white"))))
- '(cursor ((((background light)) (:background "black")) (((background dark)) (:background "white"))))
+ '(company-preview
+   ((t (:foreground "wheat" :background "blue4"))))
+ '(company-preview-common ((t (:inherit company-preview :foreground "grey"))))
+ '(company-tooltip ((t (:background "black" :foreground "white"))))
+ '(company-tooltip-annotation ((t (:foreground "grey" :slant italic))))
+ '(company-tooltip-selection ((t (:background "grey31" :slant italic))))
+ '(cursor ((t (:background "white"))))
+ '(dired-ignored ((t (:background "grey10" :slant italic :underline t))))
+ '(escape-glyph ((t (:foreground "cyan"))))
+ '(eshell-ls-directory ((t (:foreground "DeepSkyBlue3" :weight bold))))
+ '(eshell-prompt ((t (:foreground "turquoise3" :weight bold))))
  '(fixed-pitch ((t (:family "Monospace"))))
- '(variable-pitch ((((type w32)) (:foundry "outline" :family "Arial")) (t (:family "Sans Serif"))))
- '(escape-glyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown"))))
- '(homoglyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown"))))
- '(minibuffer-prompt ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "medium blue"))))
- '(highlight ((t (:background "gray14"))))
- '(region ((t (:extend t :background "gray25"))))
- '(shadow ((((class color grayscale) (min-colors 88) (background light)) (:foreground "grey50")) (((class color grayscale) (min-colors 88) (background dark)) (:foreground "grey70")) (((class color) (min-colors 8) (background light)) (:foreground "green")) (((class color) (min-colors 8) (background dark)) (:foreground "yellow"))))
- '(secondary-selection ((((class color) (min-colors 88) (background light)) (:extend t :background "yellow1")) (((class color) (min-colors 88) (background dark)) (:extend t :background "SkyBlue4")) (((class color) (min-colors 16) (background light)) (:extend t :background "yellow")) (((class color) (min-colors 16) (background dark)) (:extend t :background "SkyBlue4")) (((class color) (min-colors 8)) (:extend t :foreground "black" :background "cyan")) (t (:inverse-video t))))
- '(trailing-whitespace ((((class color) (background light)) (:background "red1")) (((class color) (background dark)) (:background "red1")))) ;;(t (:inverse-video t))))
  '(font-lock-builtin-face ((t (:foreground "powder blue"))))
- '(font-lock-comment-delimiter-face ((t (:slant italic :foreground "gray24"))))
+ '(font-lock-comment-delimiter-face ((t (:slant italic :foreground "grey24"))))
  '(font-lock-comment-face ((t (:slant italic :foreground "#868686"))))
  '(font-lock-constant-face ((t (:foreground "indian red" :weight semi-bold :height 0.99 :family "Source Code Pro"))))
  '(font-lock-doc-face ((t (:inherit (font-lock-string-face)))))
- '(font-lock-function-name-face ((t (:weight semi-bold))))
+ '(font-lock-function-name-face ((t (:weight semi-bold :foreground "#b6b6b6"))))
+ '(font-lock-function-call-face ((t (:weight semi-bold :foreground "#b6b6b6"))))
  '(font-lock-keyword-face ((t (:foreground "spring green" :weight bold :height 0.95 :family "Fira Code"))))
  '(font-lock-negation-char-face ((t nil)))
  '(font-lock-preprocessor-face ((t (:family "Source Code Pro" :foreground "#868686"))))
@@ -32,44 +36,54 @@
  '(font-lock-type-face ((t (:weight light :foreground "deepskyblue" :family "DejaVu Sans Mono"))))
  '(font-lock-variable-name-face ((nil (:family "Source Code Pro" :foreground "white"))))
  '(font-lock-warning-face ((t (:inherit (error)))))
- '(button ((t (:inherit (link)))))
- '(link ((t (:underline (:color foreground-color :style line) :foreground "cyan1"))))
- '(link-visited ((t (:foreground "violet" :inherit (link)))))
  '(fringe ((t (:background "grey4"))))
+ '(haskell-interactive-face-prompt ((t (:foreground "green"))))
  '(header-line ((t (:box nil :foreground "grey90" :background "grey20" :inherit (mode-line)))))
- '(tooltip ((t (:foreground "black" :background "lightyellow" :inherit (variable-pitch)))))
+ '(highlight ((t (:extend t :background "#222233"))))
+ '(homoglyph ((t (:foreground "cyan"))))
+ '(isearch ((t (:foreground "brown4" :background "white"))))
+ '(isearch-fail ((t (:background "red4"))))
+ '(ivy-current-match ((t (:weight bold :underline t :slant italic))))
+ '(lazy-highlight ((t (:background "paleturquoise4"))))
+ '(line-number ((t (:foreground "grey45" :background "grey1" :inherit (default)))))
+ '(line-number-current-line ((t (:foreground "white" :background "grey1" :inherit (default)))))
+ '(link ((t (:underline (:color foreground-color :style line) :foreground "cyan1"))))
+ '(link-visited ((t (:foreground "violet" :inherit (link)))))
+ '(match ((t (:background "RoyalBlue3"))))
+ '(minibuffer-prompt ((t (:foreground "cyan"))))
  '(mode-line ((t (:box nil :foreground "LightSkyBlue" :background "black"))))
  '(mode-line-buffer-id ((t (:weight bold))))
  '(mode-line-emphasis ((t (:weight bold))))
- '(mode-line-highlight ((((class color) (min-colors 88)) (:box (:line-width 2 :color "grey40" :style released-button))) (t (:inherit (highlight)))))
- '(mode-line-inactive ((t (:weight light :foreground "CadetBlue" :background "grey7" :inherit (mode-line)))))
- '(isearch ((t (:foreground "brown4" :background "white"))))
- '(isearch-fail ((((class color) (min-colors 88) (background light)) (:background "RosyBrown1")) (((class color) (min-colors 88) (background dark)) (:background "red4")) (((class color) (min-colors 16)) (:background "red")) (((class color) (min-colors 8)) (:background "red")) (((class color grayscale)) (:foreground "grey")) (t (:inverse-video t))))
- '(lazy-highlight ((((class color) (min-colors 88) (background light)) (:background "paleturquoise")) (((class color) (min-colors 88) (background dark)) (:background "paleturquoise4")) (((class color) (min-colors 16)) (:background "turquoise3")) (((class color) (min-colors 8)) (:background "turquoise3")) (t (:underline (:color foreground-color :style line)))))
- '(match ((((class color) (min-colors 88) (background light)) (:background "yellow1")) (((class color) (min-colors 88) (background dark)) (:background "RoyalBlue3")) (((class color) (min-colors 8) (background light)) (:foreground "black" :background "yellow")) (((class color) (min-colors 8) (background dark)) (:foreground "white" :background "blue")) (((type tty) (class mono)) (:inverse-video t)) (t (:background "gray"))))
+ '(mode-line-inactive ((t (:weight light :foreground "CadetBlue" :background "grey7"
+                           :inherit (mode-line)))))
  '(next-error ((t (:inherit (region)))))
- '(query-replace ((t (:inherit (isearch)))))
- '(company-tooltip ((t (:background "black" :foreground "white"))))
- '(company-tooltip-selection ((t (:background "gray31" :slant italic))))
- '(company-tooltip-annotation ((t (:foreground "grey" :slant italic))))
- '(company-preview ((((background light)) (:inherit (company-tooltip-selection company-tooltip))) (((background dark)) (:foreground "wheat" :background "blue4"))))
- '(company-preview-common ((t (:inherit company-preview :foreground "grey"))))
- '(org-block ((t (:background "gray3" :inherit shadow))))
- '(org-quote ((t (:slant italic))))
- '(eshell-prompt ((t (:foreground "turquoise3" :weight bold))))
- '(eshell-ls-directory ((t (:foreground "DeepSkyBlue3" :weight bold))))
- '(whitespace-tab ((t (:background "gray5" :foreground "gray20"))))
- '(whitespace-space ((t (:background "gray2" :foreground "darkgray"))))
- '(whitespace-line ((t (:background "black" :foreground "violet"))))
- '(haskell-interactive-face-prompt ((t (:foreground "green"))))
- '(org-verbatim ((t (:foreground "red3"))))
- '(org-code ((t (:foreground "green3"))))
- '(ivy-current-match ((t (:weight bold :underline t :slant italic))))
  '(orderless-match-face-0 ((t (:weight bold :foreground "lime green"))))
  '(orderless-match-face-1 ((t (:weight bold :foreground "light green"))))
  '(orderless-match-face-2 ((t (:weight bold :foreground "forest green"))))
  '(orderless-match-face-3 ((t (:weight bold :foreground "dark green"))))
+ '(org-block ((t (:background "grey3" :inherit shadow))))
+ '(org-code ((t (:foreground "green3"))))
+ '(org-quote ((t (:slant italic))))
+ '(org-verbatim ((t (:foreground "red3"))))
  '(pdf-isearch-batch ((t (:foreground "black" :background "white"))))
- '(default ((t (:family "Source Code Pro" :foundry "ADBO" :width normal :weight normal :slant normal :underline nil :overline nil :extend nil :strike-through nil :box nil :inverse-video nil :foreground "#b6b6b6" :background "gray5" :stipple nil :inherit nil)))))
+ '(query-replace ((t (:inherit (isearch)))))
+ '(region ((t (:extend t :background "grey25"))))
+ '(shadow ((((class color grayscale) (min-colors 88) (background light)) (:foreground "grey50"))
+           (((class color grayscale) (min-colors 88) (background dark)) (:foreground "grey70"))
+           (((class color) (min-colors 8) (background light)) (:foreground "green"))
+           (((class color) (min-colors 8) (background dark)) (:foreground "yellow"))))
+ '(secondary-selection
+   ((t (:extend t :background "SkyBlue4"))))
+ '(tooltip ((t (:foreground "black" :background "lightyellow" :inherit (variable-pitch)))))
+ '(trailing-whitespace ((((class color) (background light)) (:background "red1"))
+                        (((class color) (background dark)) (:background "red1"))))
+ '(variable-pitch ((((type w32)) (:foundry "outline" :family "Arial")) (t (:family "Sans Serif"))))
+ '(whitespace-line ((t (:background "black" :foreground "violet"))))
+ '(whitespace-space ((t (:background "grey6" :foreground "black"))))
+ '(whitespace-tab ((t (:background "grey5" :foreground "grey20"))))
+ '(default ((t (:family "Source Code Pro" :foundry "ADBO" :width normal
+                :weight normal :slant normal :underline nil :overline nil
+                :extend nil :strike-through nil :box nil :inverse-video nil
+                :foreground "#b6b6b6" :background "black" :stipple nil :inherit nil)))))
 
 (provide-theme 'personal-primary)
diff --git a/Emacs/.config/emacs/elisp/search.el b/Emacs/.config/emacs/elisp/search.el
new file mode 100644
index 0000000..8988572
--- /dev/null
+++ b/Emacs/.config/emacs/elisp/search.el
@@ -0,0 +1,67 @@
+;;; search.el --- Search a list of git directories at once!  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2024  Aryadev Chavali
+
+;; Author: Aryadev Chavali <aryadev@aryadevchavali.com>
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License Version
+;; 2 as published by the Free Software Foundation.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Given a list of git source directories, provide a completing-read
+;; interface which will narrow and give you a file.
+
+;;; Code:
+
+(defvar +search/directories
+  '("~/Dotfiles/" "~/Text/" "~/.local/src/dwm/" "~/.local/src/dwmblocks/" "~/.local/src/st/")
+  "List of directories to get candidates from.")
+
+(defun +search/get-candidates (directory)
+  "Get files from DIRECTORY using counsel-git-cands.
+Returns a list of files with the directory preprended to them."
+  (let* ((default-directory directory)
+         (names (split-string
+                 (shell-command-to-string "git ls-files -z --full-name --")
+                 "\0")))
+    (mapcar #'(lambda (name)
+           (concat directory name))
+       names)))
+
+(defun +search/get-all-candidates ()
+  (cl-reduce
+   #'(lambda (x y) (append x y))
+   (mapcar #'(lambda (directory)
+          (+search/get-candidates (expand-file-name directory)))
+      +search/directories)))
+
+(defun +search/find-file ()
+  (interactive)
+  (find-file
+   (completing-read "Find file: "
+                    (+search/get-all-candidates)
+                    nil
+                    t)))
+
+(defun +search/search-all ()
+  (interactive)
+  (let ((term (read-string "Search for: ")))
+    (grep (format "grep --color=auto -nH --null -e \"%s\" -- %s"
+                  term
+                  (cl-reduce #'(lambda (x y) (concat x " " y))
+                             (mapcar #'(lambda (x) (concat "\"" x "\""))
+                                (cl-remove-if #'directory-name-p (+search/get-all-candidates))))))))
+
+(provide 'search)
+;;; search.el ends here
diff --git a/Emacs/.config/emacs/init.el b/Emacs/.config/emacs/init.el
index e182c69..0f7dfe8 100644
--- a/Emacs/.config/emacs/init.el
+++ b/Emacs/.config/emacs/init.el
@@ -25,60 +25,63 @@
 ;; Before doing anything else, make gc-cons-threshold ridiculously
 ;; high.  This makes it so we have as few pauses during init as
 ;; possible.
-(setq gc-cons-threshold (* 1024 1024 1024)) ; ~1GiB
-
-;; Straight
-(defvar bootstrap-version)
-(let ((bootstrap-file
-       (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
-      (bootstrap-version 5))
-  (unless (file-exists-p bootstrap-file)
-    (with-current-buffer
-        (url-retrieve-synchronously
-         "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
-         'silent 'inhibit-cookies)
-      (goto-char (point-max))
-      (eval-print-last-sexp)))
-  (load bootstrap-file nil 'nomessage))
-
-(setq straight-disable-native-compile nil
-      straight-use-package-by-default t
-      use-package-enable-imenu-support t
-      use-package-always-demand nil
-      use-package-always-defer nil
-      use-package-hook-name-suffix nil
-      use-package-compute-statistics t)
-
-(straight-use-package 'use-package)
-(straight-use-package 'org)
-(straight-use-package 'no-littering)
-
-(setq no-littering-etc-directory (expand-file-name ".config/"  user-emacs-directory)
-      no-littering-var-directory (expand-file-name ".local/" user-emacs-directory)
-      custom-file (no-littering-expand-etc-file-name "custom.el"))
-
-(load-file custom-file)
+(let ((gc-cons-threshold most-positive-fixnum))
+  ;; Straight
+  (setq straight-disable-native-compile nil
+        straight-use-package-by-default nil
+        straight-check-for-modifications 'live)
+
+  (defvar bootstrap-version)
+  (let ((bootstrap-file
+         (expand-file-name
+          "straight/repos/straight.el/bootstrap.el"
+          (or (bound-and-true-p straight-base-dir)
+             user-emacs-directory)))
+        (bootstrap-version 7))
+    (unless (file-exists-p bootstrap-file)
+      (with-current-buffer
+          (url-retrieve-synchronously
+           "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el"
+           'silent 'inhibit-cookies)
+        (goto-char (point-max))
+        (eval-print-last-sexp)))
+    (load bootstrap-file nil 'nomessage))
+
+  (setq use-package-enable-imenu-support t
+        use-package-always-demand nil
+        use-package-always-defer nil
+        use-package-hook-name-suffix nil
+        use-package-compute-statistics t)
+
+  (straight-use-package 'use-package)
+  (straight-use-package 'org)
+  (straight-use-package 'no-littering)
+
+  (setq no-littering-etc-directory (expand-file-name ".config/"  user-emacs-directory)
+        no-littering-var-directory (expand-file-name ".local/" user-emacs-directory)
+        custom-file (no-littering-expand-etc-file-name "custom.el"))
+
+  (load-file custom-file)
 
 ;;; Load literate
-(load-file (concat user-emacs-directory "elisp/literate.el"))
-
-;; Compile on Emacs quit
-(add-hook
- 'kill-emacs-hook
- #'+literate/compile-config)
-
-(if (not (+literate/output-files-exist))
-    (+literate/compile-config))
-
-(+literate/load-config)
-
-(when (daemonp)
-  (require 'general)
-  (require 'evil)
-  (require 'notmuch)
-  (require 'company)
-  (require 'org)
-  (require 'eglot))
+  (load-file (concat user-emacs-directory "elisp/literate.el"))
+
+  ;; Compile on Emacs quit
+  (add-hook
+   'kill-emacs-hook
+   #'+literate/compile-config)
+
+  (+literate/load-config)
+
+  (when (daemonp)
+    (require 'general)
+    (require 'evil)
+    (require 'ivy)
+    (require 'counsel)
+    (require 'notmuch)
+    (require 'company)
+    (require 'org)
+    (require 'eglot)))
 
 (setq gc-cons-threshold (* 100 1024 1024) ; ~100MiB
       read-process-output-max 5242880 ; ~5MiB
diff --git a/Emacs/.config/emacs/straight/versions/default.el b/Emacs/.config/emacs/straight/versions/default.el
index 07cbc38..eb14e45 100644
--- a/Emacs/.config/emacs/straight/versions/default.el
+++ b/Emacs/.config/emacs/straight/versions/default.el
@@ -1,90 +1,93 @@
-(("Emacs-wgrep" . "f9687c28bbc2e84f87a479b6ce04407bb97cfb23")
- ("ace-window" . "c7cb315c14e36fded5ac4096e158497ae974bec9")
- ("all-the-icons.el" . "6f876fa11ef64af20d9b2a44fdabac6446de51ba")
- ("amx" . "37f9c7ae55eb0331b27200fb745206fc58ceffc0")
+(("Emacs-wgrep" . "3132abd3750b8c87cbcf6942db952acfab5edccd")
+ ("ace-link" . "06ab398df85e81d1dc763b3210732dd26cba60a1")
+ ("ace-window" . "77115afc1b0b9f633084cf7479c767988106c196")
+ ("aggressive-indent-mode" . "a437a45868f94b77362c6b913c5ee8e67b273c42")
+ ("all-the-icons.el" . "f491f39c21336d354e85bdb4cca281e0a0c2f880")
+ ("amx" . "5b3aa1aae84f4a225cb8d26ab79a32f97693f023")
  ("annalist.el" . "134fa3f0fb91a636a1c005c483516d4b64905a6d")
- ("avy" . "e92cb37457b43336b765630dbfbea8ba4be601fa")
+ ("avy" . "be612110cb116a38b8603df367942e2bb3d9bdbe")
  ("biblio.el" . "ee52f6cda82ea6fbc3b400e7b12132595cc0374c")
- ("citeproc-el" . "678db833e0128fe399ad4c99794186b46f33a68a")
- ("company-mode" . "88001d794d963049339883216b6606de0a1209ea")
- ("counsel-projectile" . "06b03c1080d3ccc3fa9b9c41b1ccbcf13f058e4b")
- ("dash.el" . "a17b6b5409825891423b3867cd7bea84852d6ddd")
- ("eglot" . "b4ffcf26fb392ed83f6c40bc9b62cbe54483119c")
- ("el-get" . "9a4ab9cc8ae4a9b9a4b232788039cc679a4ba249")
- ("eldoc" . "a8068079578b8a8bfffa046bd79f2005813161fe")
- ("eldoc-box" . "d4574ee392b9a8c537bec895be37468b600c25ac")
+ ("citeproc-el" . "290320fc579f886255f00d7268600df7fa5cc7e8")
+ ("company-mode" . "7c24dc8668af5aea8a5d07aeceda5fac7a2a85b5")
+ ("compat" . "a20862e377a137961dd82706a7654a090210f7f7")
+ ("counsel-projectile" . "40d1e1d4bb70acb00fddd6f4df9778bf2c52734b")
+ ("dash.el" . "6db80c711ce947f6c6fa11e5c2257fff2c79d139")
+ ("eglot" . "bc85762d234805f21e1ab168af6826a50e93a3fb")
+ ("el-get" . "f3f1edd434221dc6daef565ebf77fa40c4cead36")
+ ("eldoc" . "a2aaed2b7c70c1f28dd212fe2f4304ce89c338d7")
+ ("eldoc-box" . "b5aa4814326f592d15332c5da4e62ed513fa85d7")
  ("elfeed" . "e29c8b91450bd42d90041231f769c4e5fe5070da")
- ("elisp-refs" . "b3634a4567c655a1cda51b217629849cba0ac6a7")
- ("emacs-dashboard" . "c3105dc0e1a32037a0db2d2808c980dd01053a8b")
- ("emacs-htmlize" . "49205105898ba8993b5253beec55d8bddd820a70")
- ("emacs-which-key" . "c632dbf27a77c1c73ce559041b3a78ec5f78b187")
- ("emacsmirror-mirror" . "5785643381798bc5c82a11a1b9492c5857a20957")
- ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70")
+ ("elisp-refs" . "bf3cca8f74065b1b31036f461e3a093b162311bd")
+ ("emacs-htmlize" . "dd27bc3f26efd728f2b1f01f9e4ac4f61f2ffbf9")
+ ("emacs-request" . "01e338c335c07e4407239619e57361944a82cb8a")
+ ("emacs-which-key" . "df6b0cb8449812e7fb200bc852107fa7eb708496")
+ ("emacsmirror-mirror" . "8e7cbfea765e5f9095c6f130a5efd949c04f9c72")
+ ("emmet-mode" . "63b6932603184956b5ea8919036d2b307b48d7fd")
  ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
- ("esup" . "4b49c8d599d4cc0fbf994e9e54a9c78e5ab62a5f")
- ("evil" . "325a822bee6b9f8590e6e77fe73b4d916fcec357")
- ("evil-collection" . "b45ec5b3156d27a18a949e4bf55643107a21abc2")
- ("evil-commentary" . "2dab6ac34d1617971768ad219d73af48f7473fec")
- ("evil-ledger" . "7a9f9f5d39c42fffdba8004f8982642351f2b233")
- ("evil-mc" . "f04fb17f35f2722f2ac93c862b4450bb8e5b739a")
- ("evil-org-mode" . "80ef38fb378541937f6ddfe836809e76eda1e355")
- ("evil-surround" . "346d4d85fcf1f9517e9c4991c1efe68b4130f93a")
- ("f.el" . "c4dbf8c8e83df834f5d6f72cd5649b9d8a8812ec")
- ("faceup" . "6c92dad56a133e14e7b27831e1bcf9b3a71ff154")
+ ("erc" . "6c8b390ae3ffe2d1c8d8200785da64100d8ad3cd")
+ ("evil" . "6e30037fdc6a275d78d6b82d89bd8e47bcf4d4e3")
+ ("evil-collection" . "1ad283f5b7ac9320ac3d41bccfc71a52f714563a")
+ ("evil-commentary" . "c5945f28ce47644c828aac1f5f6ec335478d17fb")
+ ("evil-mc" . "bdf893ea6f52fd0f10bece8ddae813658e17bbb4")
+ ("evil-numbers" . "7a1b62afc12da2b582bf84d722e7b10ca8b97065")
+ ("evil-org-mode" . "b1f309726b1326e1a103742524ec331789f2bf94")
+ ("evil-surround" . "4a21d756b76a50e0c0619555836c9aa98f103d3d")
+ ("external-completion" . "d717c138623aeecc8e0a0312e0576e98604c43f2")
+ ("f.el" . "19e1da061e759b05e8c480b426287a063ca39484")
  ("fd-dired" . "458464771bb220b6eb87ccfd4c985c436e57dc7e")
- ("flycheck" . "f8c679fff349850c80541a31de50009c3c15d4c9")
- ("flymake" . "43ec1aff768073aacc842dd418944f81e80e9ee0")
- ("general.el" . "a0b17d207badf462311b2eef7c065b884462cb7c")
- ("gnu-elpa-mirror" . "ff81342fefc6e7a58ce5861965d363d5c8b2de7c")
- ("goto-chg" . "2af612153bc9f5bed135d25abe62f46ddaa9027f")
- ("haskell-mode" . "20f72ccc17c8233dbb7c94ebf52a2a59e7d97730")
- ("helpful" . "7e4b1f0d5572a4e2b8ee7a9b084ef863d0315a73")
- ("hl-todo" . "4d18ccde596aef84ef278aa60144390ab41f0046")
- ("ht.el" . "cdc76669a5032c42a2b9f7cddcbc33c5deeb6beb")
+ ("flycheck" . "5f2ef177cb21ae8b73714575802beef04abd0f5e")
+ ("flycheck-eglot" . "114e1315aaf0dc3196da67da426bbe2b46384fe2")
+ ("flymake" . "6950c8099e3ee7cafc701b1f86797b2a1b466067")
+ ("general.el" . "833dea2c4a60e06fcd552b653dfc8960935c9fb4")
+ ("gnu-elpa-mirror" . "be1351c478935b8348c19d3197cd5d84330c708d")
+ ("goto-chg" . "278cd3e6d5107693aa2bb33189ca503f22f227d0")
+ ("haskell-mode" . "d23ec34788286405f377ce485d2a17e302d94a4f")
+ ("helm-bibtex" . "ef07adfeda1e25d891875cb9a11983d5e26fc36d")
+ ("helpful" . "6f8991a72c83d904725a9d6c00de2cabbef32de9")
+ ("hl-todo" . "b27cddf7373408681cc949c8ef829f87a01ed3f3")
+ ("ht.el" . "1c49aad1c820c86f7ee35bf9fff8429502f60fef")
  ("hydra" . "317e1de33086637579a7aeb60f77ed0405bf359b")
- ("jsonrpc" . "dbfa30971026dacd9389f4312b0dd7a12fef0d87")
- ("key-chord" . "7f7fd7c5bd2b996fa054779357e1566f7989e07d")
- ("ledger-mode" . "4c48d4136229e1ba399906d6b23f7f39c9d4fb3c")
- ("let-alist" . "6708ec0b2e6dff80ff5b64698aa009d9070a2ed2")
- ("magit" . "386843483b262ad57b24aec3167035b01acb4bf1")
- ("melpa" . "d35f8cf6c6e0ee440ee5b6ca150b87015d1d4a46")
- ("nhexl-mode" . "211e6c72e1489426cde64eb9ac26719463524bde")
- ("no-littering" . "57357e15643158b4e0d9b3b4f70a82f5fc73178a")
- ("notmuch" . "4e209ca99ac8084a357c6fc8d7773f6207cfa16d")
- ("olivetti" . "95479d5178fc5017060c963a45de0d2095c00e0f")
- ("orderless" . "2646dad28c0819fbe9ee521d39efb9ae40e03982")
- ("org" . "8589de94d8a44cd566eb3fe128f8091d7e958ee9")
- ("org-fragtog" . "c675563af3f9ab5558cfd5ea460e2a07477b0cfd")
- ("org-msg" . "7b1dfb96d558f6e5626e96d4f4a5150d55cb7eb2")
+ ("jsonrpc" . "ba4275ef5bcbfceebd7049c5669dec9edabcb1fc")
+ ("le-thesaurus.el" . "83e8df8957a3b8167cc2bf97849a1eca555ce9a6")
+ ("let-alist" . "021fc10df2e44faba4728d849ee767cf890aa51a")
+ ("magit" . "93d30c5459e75a0d53581da2a5539a54efa329ab")
+ ("melpa" . "fc5b27dd4aa32f75844bf6db7e9e0f44275631ea")
+ ("mpv.el" . "2e0234bc21a3dcdf12d94d3285475e7f6769d3e8")
+ ("nhexl-mode" . "dec55097dc6938122e7886a89e64dd528b1ce55a")
+ ("no-littering" . "fcfd51fbdf08469e6d1b59bc4bd2d75aa708c791")
+ ("nongnu-elpa" . "14e9631cd2b81f66ed551b14d31811a75cc53a4b")
+ ("notmuch" . "b6f144abe1f5aa3519240cf52f4cb9907fefcd0e")
+ ("olivetti" . "a644ee9d24c7283435ce42e11498951e100608c9")
+ ("orderless" . "6936fe46ef07df168a423f04efeda130b4e69753")
+ ("org" . "a18ebc78934a1efa2adec3ebc88d8e155d5b3301")
+ ("org-msg" . "055de4abf611c5d5e12c770fe149c1861b402817")
+ ("org-ref" . "26c06912c7833104c7b4c7b96b8f200e98067a68")
  ("org-reveal" . "f55c851bf6aeb1bb2a7f6cf0f2b7bd0e79c4a5a0")
  ("org-superstar-mode" . "54c81c27dde2a6dc461bb064e79a8b2089093a2e")
- ("ox-pandoc" . "f8eac5e5692fc44a4724ada43191e7c28a1ccf30")
- ("page-break-lines" . "69caea070379f3324c530e96e06625c3cd097cb9")
+ ("ox-pandoc" . "0f758517f512e375825679541b5d905be40342eb")
  ("parsebib" . "ace9df707108b17759c004c7387655277122d4c1")
- ("pdf-tools" . "bb0b71f5bafd81d0b5647c4ec48fafa0bb6f6c21")
  ("pdfgrep" . "a4ca0a1e6521de93f28bb6736a5344b4974d144c")
  ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
- ("pos-tip" . "179cc126b363f72ca12fab1e0dc462ce0ee79742")
  ("proced-narrow" . "0e2a4dfb072eb0369d0020b429e820ae620d325e")
- ("project" . "388ffdfc5cdd075fa868d472c57369fd955d1e6a")
- ("projectile" . "1528ed4f082e7aaca19f22394eb4bed879645b7c")
+ ("project" . "927a7534138b70fa80e89450c77258f9386d03a1")
+ ("projectile" . "971cd5c4f25ff1f84ab7e8337ffc7f89f67a1b52")
  ("queue" . "130c2d656cd5d7376552272fab9e50a7c37d0c4a")
- ("racket-mode" . "7f12cb1ff2774e7592632d8aab1572f57d045419")
- ("rg.el" . "10e64887c224002572e1f1e19c74453cba606c3f")
- ("s.el" . "43ba8b563bee3426cead0e6d4ddc09398e1a349d")
- ("sly" . "ef5211456a59d639c98b2ed42428726d32728ff8")
- ("smartparens" . "c59bfef7e8f1687ac77b0afaaaed86d8051d3de1")
- ("straight.el" . "3eca39dfc6797243ec7d1c6a7d45142407f73f88")
+ ("rg.el" . "e9dc4ed342e0212d08fb82554dfd3c57fdfa5b1a")
+ ("rust-mode" . "9c26dc1195ec05309ee15c014631fb9abd6cf5d2")
+ ("s.el" . "dda84d38fffdaf0c9b12837b504b402af910d01d")
+ ("sly" . "df62abae73bd511885c9c7ec0ea7ea1469a00923")
+ ("smartparens" . "79a338db115f441cd47bb91e6f75816c5e78a772")
+ ("straight.el" . "ff63b154bef1ef8d92c141bd189001bff74f6982")
  ("string-inflection" . "50ad54970b3cc79b6b83979bde9889ad9a9e1a9c")
- ("swiper" . "47b496544e238041bca5e3c9ca55848648344312")
- ("tablist" . "faab7a035ef2258cc4ea2182f67e3aedab7e2af9")
- ("transient" . "cc16a5eaa73617a281b0bbf71b24432c38994e30")
- ("typescript.el" . "b369d7d2518fa11760ac3908a383405350cd51d2")
- ("undo-tree" . "e326c6135e62f5fe8536528d3acd5e798f847407")
- ("use-package" . "a7422fb8ab1baee19adb2717b5b47b9c3812a84c")
- ("web-mode" . "8ef47935d638902ba35a557cae5edd6ab6ab1346")
- ("with-editor" . "ebcbd3b137154e6c5a2b976bacbb89d48ddfa242")
- ("xref" . "b2bf147ee8bb6c67403e6ce2104e164f184623c8")
- ("yaml-mode" . "fc5e1c58f94472944c4aa838f00f6adcac6fa992")
- ("yasnippet" . "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6"))
-:beta
+ ("swiper" . "595d44264420d989e420351ea25b3c99528547c0")
+ ("transient" . "323d6b6c84e6ae55e578efa1efb6bb4d42a69cac")
+ ("typescript.el" . "4fcb4594819caf472ae42ea068a1c7795cf07f46")
+ ("undo-tree" . "16f4121032d09ef44b3d7d02c4d02c3c2f18041f")
+ ("use-package" . "a6e856418d2ebd053b34e0ab2fda328abeba731c")
+ ("web-mode" . "57856ba64b9382811b35df0d9ab0a24aede0c1f0")
+ ("with-editor" . "a4853781835346aabf083d2d9cb87f656d01ccac")
+ ("xref" . "420511e20187d0c6c8680c0e63ae8810f84dee00")
+ ("yaml-mode" . "13728b4b1b1bd33d3a754236a0f23e4c76d6ba91")
+ ("yasnippet" . "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6")
+ ("zone-matrix" . "3ab1b47f9c0ff92ec71f76f5e95cdea3a7b06870"))
+:gamma
diff --git a/LICENSE b/LICENSE
index 83a869e..aebe399 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Aryadev Chavali
+Copyright (c) 2023 Aryadev Chavali, 2024 Aryadev Chavali
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/NeoVim/.config/nvim/init.vim b/NeoVim/.config/nvim/init.vim
index 14c5131..3c6aadd 100644
--- a/NeoVim/.config/nvim/init.vim
+++ b/NeoVim/.config/nvim/init.vim
@@ -51,6 +51,11 @@ let mapleader = ' '
 "" Theming
 set background=dark
 colorscheme koehler
+" Set backgrounds off => transparency!
+highlight Normal guibg=none
+highlight NonText guibg=none
+highlight Normal ctermbg=none
+highlight NonText ctermbg=none
 
 "" Dir Config
 let g:NERDTreeHijackNetrw = 1
diff --git a/Pictures/Pictures/SplashScreens/space.png b/Pictures/Pictures/SplashScreens/space.png
deleted file mode 100644
index 13dc425..0000000
--- a/Pictures/Pictures/SplashScreens/space.png
+++ /dev/null
diff --git a/Pictures/Pictures/SplashScreens/space2.png b/Pictures/Pictures/SplashScreens/space2.png
deleted file mode 100644
index ba44d23..0000000
--- a/Pictures/Pictures/SplashScreens/space2.png
+++ /dev/null
diff --git a/README.org b/README.org
index 5481413..fc77e3e 100644
--- a/README.org
+++ b/README.org
@@ -5,7 +5,7 @@
 This repository contains all of my custom configurations for programs
 I use daily.
 
-* Setup and installation procedure
+* Setup and installation
 1) Clone this repository to =~/Dotfiles=
 2) Construct the following directories:
    + =~/.local=
@@ -22,6 +22,34 @@ I use daily.
 4) Pick and choose what configurations you want
    + To install a module use ~stow <module>~
    + To remove a module use ~stow -D <module>~
+
+GNU/stow just makes it easier to instruct a new user on what to do:
+you can just setup symlinks from a given module to the root directory
+yourself.
+* Emacs archives
+At https://aryadevchavali.com/resources/ I maintain a compressed
+backup of some of =~/.config/emacs=.  The purpose of this is simply to
+escape having to clone this repository just to be able to use my
+editor: I can just copy then uncompress this backup to get a
+just-about-working version of my Emacs without having to do any
+further work.  It isn't so I can have a completely working system,
+just some comfort in an otherwise potentially alien environment.
+
+This script generates the archive:
+#+begin_src sh
+tar -Jcvf emacs-config.tar.xz \
+    ~/.config/emacs/config.org \
+    ~/.config/emacs/early-init.el \
+    ~/.config/emacs/init.el \
+    ~/.config/emacs/elisp/ \
+    ~/.config/emacs/straight/
+#+end_src
+
+And this script sends it over via rsync
+#+begin_src sh
+rsync -avz --info=progress2 --info=name0 emacs-config.tar.xz \
+      root@aryadevchavali.com:/var/www/html/resources
+#+end_src
 * Installing Emacs
 I like a specific set of flags on my Emacs install, and my
 configuration kind of depends on them existing as well.  Prepackaged
@@ -38,4 +66,3 @@ git clone git@github.com:oreodave/emacs-29-custom emacs;
 cd emacs;
 sh personal-install; # Will configure, build and attempt to install
 #+end_src
-
diff --git a/SXHkD/.config/sxhkd/sxhkdrc b/SXHkD/.config/sxhkd/sxhkdrc
index f01b136..e96eafb 100644
--- a/SXHkD/.config/sxhkd/sxhkdrc
+++ b/SXHkD/.config/sxhkd/sxhkdrc
@@ -37,6 +37,9 @@ super + alt + l
 super + ctrl + L
   xtrlock -b;
 
+super + ctrl + m
+  $HOME/.local/scripts/mail_fetch
+
 super + ctrl + d
   notify-send -u low "Changing background"; \
   $HOME/.local/scripts/background;
@@ -76,7 +79,7 @@ XF86AudioMute
 Pause
   playerctl --player=spotify play-pause
 
-# Connections and brightness
+# Connections
 Print
   scrot -f -s '%Y%m%d_%H%M%S.png' -e 'mv $f ~/Pictures/';
 
@@ -87,39 +90,19 @@ Scroll_Lock
   nmcli c up "$conn"; \
   notify-send -u low "Reset " $conn;
 
+# Brightness
 XF86MonBrightness{Down,Up}
-  xbacklight -{dec,inc} 5; \
+  xbacklight -{dec,inc} 25; \
   notify-send -u low "Brightness: $(xbacklight)"
 
-super + F{3,4}
+super + XF86MonBrightness{Down,Up}
   xbacklight -{dec,inc} 5; \
   notify-send -u low "Brightness: $(xbacklight)"
 
-# BSPWM
-# super + {_, shift + } {h,j,k,l}
-#   bspc node -{f,s} {west, south, north, east}
-
-# super + {_,shift + } q
-#   bspc node -{c,k};
-
-# super + alt + {q,r}
-#   bspc {quit,wm -r}
-
-# super + c
-#   bspc node -s biggest
-
-# super + shift + {t,f}
-#   notify-send -u low "Switched window state"; \
-#   bspc node -t {tiled,floating}
-
-# super + f
-#   bspc node -t ~fullscreen
-
-# super + {_,shift + }{1,2,3,4}
-#   bspc {desktop -f,node -d} {Development,Browser,Media,4}
-
-# hyper + {_,shift + }{1,2,3,4}
-#   bspc {desktop -f,node -d} {Development,Browser,Media,4}
+super + F{3,4}
+  xbacklight -{dec,inc} 25; \
+  notify-send -u low "Brightness: $(xbacklight)"
 
-# super + {comma,period}
-#   bspc node -z {left -20 0,right 20 0};
+super + shift + F{3,4}
+  xbacklight -{dec,inc} 5; \
+  notify-send -u low "Brightness: $(xbacklight)"
diff --git a/Scripts/.local/scripts/cowfortune b/Scripts/.local/scripts/cowfortune
new file mode 100755
index 0000000..d78a950
--- /dev/null
+++ b/Scripts/.local/scripts/cowfortune
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+cow=$(echo -e "default\ncower\nmoofasa\nmoose\nmutilated\nsatanic\nsheep\nsmall\ntux\nvader" | shuf | head -1)
+
+fortune | cowsay -f $cow
diff --git a/Scripts/.local/scripts/eselect b/Scripts/.local/scripts/eselect
index 0f2d682..7bd4016 100755
--- a/Scripts/.local/scripts/eselect
+++ b/Scripts/.local/scripts/eselect
@@ -9,11 +9,11 @@ case "$(printf "new\nstop\nrestart\neshell\nmail" | dmenu -p "eserver: ")" in
         notify-send "eselect: Halted Emacs server";;
     "new")
         notify-send "eselect: Launching Emacs";
-        emacsclient -c;;
+        emacsclient -c -a emacs;;
     "eshell")
         notify-send "eselect: Launching Eshell";
-        emacsclient -c --eval '(let ((b (or (get-buffer "*eshell*") (eshell)))) (switch-to-buffer b))';;
+        emacsclient -c -a emacs --eval '(let ((b (or (get-buffer "*eshell*") (eshell)))) (switch-to-buffer b))';;
     "mail")
         notify-send "eselect: Launching notmuch";
-        emacsclient -c --eval '(let ((b (or (get-buffer "*notmuch-hello*") (progn (notmuch) (get-buffer "*notmuch-hello*"))))) (switch-to-buffer b))';;
+        emacsclient -c -a emacs --eval '(let ((b (or (get-buffer "*notmuch-hello*") (progn (notmuch) (get-buffer "*notmuch-hello*"))))) (switch-to-buffer b))';;
 esac
diff --git a/Scripts/.local/scripts/folder_size b/Scripts/.local/scripts/folder_size
deleted file mode 100755
index fe136c6..0000000
--- a/Scripts/.local/scripts/folder_size
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/sh
-
-du -BM -d $1 | sort -n
diff --git a/Scripts/.local/scripts/labelled_terminals b/Scripts/.local/scripts/labelled_terminals
new file mode 100755
index 0000000..2f72a95
--- /dev/null
+++ b/Scripts/.local/scripts/labelled_terminals
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+for v in $(seq 1 $1)
+do
+    $TERMINAL -e sh -c "figlet ${v} && echo \"Press any key to exit...\" && read" &
+    sleep 0.5
+done
diff --git a/Scripts/.local/scripts/launch_music b/Scripts/.local/scripts/launch_music
deleted file mode 100755
index 44cdad8..0000000
--- a/Scripts/.local/scripts/launch_music
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-$($TERMINAL -c 'media-term' -t 'NCM' -e ncmpcpp) &
-$($TERMINAL -c 'media-term' -t 'VIS' -e vis)
diff --git a/Scripts/.local/scripts/launch_polybar b/Scripts/.local/scripts/launch_polybar
deleted file mode 100755
index 536873a..0000000
--- a/Scripts/.local/scripts/launch_polybar
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-killall polybar;
-polybar custom-bar;
diff --git a/Scripts/.local/scripts/list_packages b/Scripts/.local/scripts/list_packages
index 48d655d..886292a 100755
--- a/Scripts/.local/scripts/list_packages
+++ b/Scripts/.local/scripts/list_packages
@@ -1,2 +1,3 @@
-#/usr/bin/env bash
-pacman -Qs | fzf
+#!/usr/bin/env bash
+
+pacman -Qs | less
diff --git a/Scripts/.local/scripts/st-scripts/link-grab.sh b/Scripts/.local/scripts/st-scripts/link-grab.sh
new file mode 100755
index 0000000..e8eee52
--- /dev/null
+++ b/Scripts/.local/scripts/st-scripts/link-grab.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+# From https://github.com/LukeSmithxyz/st
+
+urlregex="(((http|https|gopher|gemini|ftp|ftps|git)://|www\\.)[a-zA-Z0-9.]*[:;a-zA-Z0-9./+@$&%?$\#=_~-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)"
+
+urls="$(sed 's/.*│//g' | tr -d '\n' | # First remove linebreaks and mutt sidebars:
+	grep -aEo "$urlregex" | # grep only urls as defined above.
+	uniq | # Ignore neighboring duplicates.
+	sed "s/\(\.\|,\|;\|\!\\|\?\)$//;
+	s/^www./http:\/\/www\./")" # xdg-open will not detect url without http
+
+[ -z "$urls" ] && exit 1
+
+while getopts "hoc" o
+do
+    case "${o}" in
+	      h) printf "Optional arguments for custom use:\\n  -c: copy\\n  -o: xdg-open\\n  -h: Show this message\\n" && exit 1 ;;
+	      o) chosen="$(echo "$urls" | dmenu -i -p 'Follow which url?' -l 10)"
+	         setsid xdg-open "$chosen" >/dev/null 2>&1 & ;;
+	      c) echo "$urls" | dmenu -i -p 'Copy which url?' -l 10 | tr -d '\n' | xclip -selection clipboard ;;
+	      *) printf "Invalid option: -%s\\n" "$OPTARG" && exit 1 ;;
+   esac
+done
diff --git a/Scripts/.local/scripts/st-scripts/output-copy.sh b/Scripts/.local/scripts/st-scripts/output-copy.sh
new file mode 100755
index 0000000..6ce52ee
--- /dev/null
+++ b/Scripts/.local/scripts/st-scripts/output-copy.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# From https://github.com/LukeSmithxyz/st
+
+# By Jaywalker and Luke
+
+tmpfile=$(mktemp /tmp/st-cmd-output.XXXXXX)
+trap 'rm "$tmpfile"' 0 1 15
+sed -n "w $tmpfile"
+sed -i 's/\x0//g' "$tmpfile"
+ps1="$(grep "\S" "$tmpfile" | tail -n 1 | sed 's/^\s*//' | cut -d' ' -f1)"
+chosen="$(grep -F "$ps1" "$tmpfile" | sed '$ d' | tac | dmenu -p "Copy which command's output?" -i -l 10 | sed 's/[^^]/[&]/g; s/\^/\\^/g')"
+eps1="$(echo "$ps1" | sed 's/[^^]/[&]/g; s/\^/\\^/g')"
+awk "/^$chosen$/{p=1;print;next} p&&/$eps1/{p=0};p" "$tmpfile" | xclip -selection clipboard
diff --git a/Scripts/.local/scripts/status/bluetooth-status b/Scripts/.local/scripts/status/bluetooth-status
index c34694c..6de5422 100755
--- a/Scripts/.local/scripts/status/bluetooth-status
+++ b/Scripts/.local/scripts/status/bluetooth-status
@@ -1,9 +1,15 @@
 #!/usr/bin/env sh
 
 name=$(bluetoothctl info | grep "Name" | sed 's/.*Name: //')
+battery=$(bluetoothctl info | grep "Battery" | sed 's/.*(//;s/)//')
 if [ ! "$name" ]
 then
     echo ""
 else
-    echo "" $name;
+    echo -n "" $name;
+    if [ "$battery" ]
+    then
+        echo -n " ($battery%)"
+    fi
+    echo ""
 fi
diff --git a/Scripts/.local/scripts/status/datetime b/Scripts/.local/scripts/status/datetime
index c688bb5..65ebe14 100755
--- a/Scripts/.local/scripts/status/datetime
+++ b/Scripts/.local/scripts/status/datetime
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-echo " $(date +'%A %d %b %R')"
+echo " $(date +'%A %d %b %R')"
diff --git a/Scripts/.local/scripts/status/memory b/Scripts/.local/scripts/status/memory
index fae4dea..2d1c328 100755
--- a/Scripts/.local/scripts/status/memory
+++ b/Scripts/.local/scripts/status/memory
@@ -11,4 +11,4 @@ then
     emacs="N/A"
 fi
 
-echo "⾎ $(printf "%dMB" $used) $value% ->  $emacs"
+echo "⾝ $(printf "%dMB" $used) $value% -> $emacs"
diff --git a/Scripts/.local/scripts/status/volume b/Scripts/.local/scripts/status/volume
index eedd657..4355094 100755
--- a/Scripts/.local/scripts/status/volume
+++ b/Scripts/.local/scripts/status/volume
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-echo "" $(pamixer --get-volume-human)
+echo "  $(pamixer --get-volume-human)"
diff --git a/Shell/.zprofile b/Shell/.zprofile
index 536b63d..b50ccfc 100644
--- a/Shell/.zprofile
+++ b/Shell/.zprofile
@@ -9,8 +9,8 @@ export XDG_RUNTIME_DIR=/run/user/`id -u`
 # Standard Variables
 export EDITOR='emacsclient -a "emacs" -c'
 export EA_EDITOR=$EDITOR
-export TERMINAL="alacritty"
 export BROWSER="firefox"
+export TERMINAL="st"
 export WEBKIT_FORCE_SANDBOX=0
 export PF_INFO="ascii title os memory uptime editor wm shell"
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin/vendor_perl/:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:$HOME/.local/bin/:$(find ~/.local/scripts/ -type d | tr '\n' ':')$HOME/.cargo/bin:$HOME/.sdkman/bin"
diff --git a/Shell/.zshrc b/Shell/.zshrc
index bb95636..a3539b1 100644
--- a/Shell/.zshrc
+++ b/Shell/.zshrc
@@ -1,5 +1,8 @@
 # zshrc -*- mode: sh; lexical-binding: t; -*-
 
+## Prompt
+~/.local/scripts/cowfortune
+
 ## Variables
 TERM=xterm-256color
 ## Aliases
@@ -133,3 +136,5 @@ export SDKMAN_DIR="/home/oreo/.sdkman"
 [[ -s "/home/oreo/.sdkman/bin/sdkman-init.sh" ]] && source "/home/oreo/.sdkman/bin/sdkman-init.sh"
 
 eval $(opam env)
+
+[ -f "/home/oreo/.ghcup/env" ] && . "/home/oreo/.ghcup/env" # ghcup-env
diff --git a/SystemD/.config/systemd/user/mail.service b/SystemD/.config/systemd/user/mail.service
index 16d87c5..d096a6f 100644
--- a/SystemD/.config/systemd/user/mail.service
+++ b/SystemD/.config/systemd/user/mail.service
@@ -4,3 +4,6 @@ Description=Syncing mail using mbsyncrc
 [Service]
 Type=simple
 ExecStart=%h/.local/scripts/mail_fetch
+
+[Install]
+WantedBy=default.target
diff --git a/SystemD/.config/systemd/user/mail.timer b/SystemD/.config/systemd/user/mail.timer
index 0d1b970..b166cba 100644
--- a/SystemD/.config/systemd/user/mail.timer
+++ b/SystemD/.config/systemd/user/mail.timer
@@ -1,9 +1,9 @@
 [Unit]
-Description=Run mail sync every 3 hours
+Description=Run mail sync every hour
 
 [Timer]
 OnBootSec=1min
-OnUnitActiveSec=10800
+OnUnitActiveSec=3600
 Unit=mail.service
 
 [Install]
diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml
new file mode 100644
index 0000000..c927498
--- /dev/null
+++ b/alacritty/.config/alacritty/alacritty.toml
@@ -0,0 +1,56 @@
+live_config_reload = true
+
+[colors.primary]
+background = "0x000000"
+foreground = "0xeaeaea"
+
+[cursor]
+style = "Beam"
+unfocused_hollow = true
+
+[font]
+normal = {family="IBM Plex Mono", style="Regular"}
+size = 12.0
+
+[[keyboard.bindings]]
+action = "Paste"
+key = "V"
+mods = "Alt"
+
+[[keyboard.bindings]]
+action = "Copy"
+key = "C"
+mods = "Alt"
+
+[[keyboard.bindings]]
+action = "PasteSelection"
+key = "Insert"
+mods = "Shift"
+
+[[keyboard.bindings]]
+action = "ResetFontSize"
+key = "Key0"
+mods = "Control"
+
+[[keyboard.bindings]]
+action = "IncreaseFontSize"
+key = "Equals"
+mods = "Control"
+
+[[keyboard.bindings]]
+action = "IncreaseFontSize"
+key = "Plus"
+mods = "Control"
+
+[[keyboard.bindings]]
+action = "DecreaseFontSize"
+key = "Minus"
+mods = "Control"
+
+[[keyboard.bindings]]
+action = "DecreaseFontSize"
+key = "Minus"
+mods = "Control"
+
+[shell]
+program = "/bin/zsh"
diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
deleted file mode 100644
index af28cd8..0000000
--- a/alacritty/.config/alacritty/alacritty.yml
+++ /dev/null
@@ -1,567 +0,0 @@
-# Configuration for Alacritty, the GPU enhanced terminal emulator.
-
-# Any items in the `env` entry below will be added as
-# environment variables. Some entries may override variables
-# set by alacritty itself.
-#env:
-  # TERM variable
-  #
-  # This value is used to set the `$TERM` environment variable for
-  # each instance of Alacritty. If it is not present, alacritty will
-  # check the local terminfo database and use `alacritty` if it is
-  # available, otherwise `xterm-256color` is used.
-  #TERM: xterm-256color
-
-window:
-  opacity: 0.7
-  # Window dimensions (changes require restart)
-  #
-  # Specified in number of columns/lines, not pixels.
-  # If both are `0`, this setting is ignored.
-  #dimensions:
-  #  columns: 0
-  #  lines: 0
-
-  # Window position (changes require restart)
-  #
-  # Specified in number of pixels.
-  # If the position is not set, the window manager will handle the placement.
-  #position:
-  #  x: 0
-  #  y: 0
-
-  # Window padding (changes require restart)
-  #
-  # Blank space added around the window in pixels. This padding is scaled
-  # by DPI and the specified value is always added at both opposing sides.
-  #padding:
-  #  x: 0
-  #  y: 0
-
-  # Spread additional padding evenly around the terminal content.
-  #dynamic_padding: false
-
-  # Window decorations
-  #
-  # Values for `decorations`:
-  #     - full: Borders and title bar
-  #     - none: Neither borders nor title bar
-  #
-  # Values for `decorations` (macOS only):
-  #     - transparent: Title bar, transparent background and title bar buttons
-  #     - buttonless: Title bar, transparent background, but no title bar buttons
-  decorations: none
-
-  # Startup Mode (changes require restart)
-  #
-  # Values for `startup_mode`:
-  #   - Windowed
-  #   - Maximized
-  #   - Fullscreen
-  #
-  # Values for `startup_mode` (macOS only):
-  #   - SimpleFullscreen
-  #startup_mode: Windowed
-
-  # Window title
-  title: Term
-
-  # Window class (Linux/BSD only):
-  #class:
-    # Application instance name
-    #instance: Alacritty
-    # General application class
-    #general: Alacritty
-
-  # GTK theme variant (Linux/BSD only)
-  #
-  # Override the variant of the GTK theme. Commonly supported values are `dark` and `light`.
-  # Set this to `None` to use the default theme variant.
-  window.decorations_theme_variant: dark
-
-  # Window opacity as a floating point number from `0.0` to `1.0`.
-  # The value `0.0` is completely transparent and `1.0` is opaque.
-  opacity: 0.7
-
-#scrolling:
-  # Maximum number of lines in the scrollback buffer.
-  # Specifying '0' will disable scrolling.
-  #history: 10000
-
-  # Number of lines the viewport will move for every line scrolled when
-  # scrollback is enabled (history > 0).
-  #multiplier: 3
-
-  # Scroll to the bottom when new text is written to the terminal.
-  #auto_scroll: false
-
-# Spaces per Tab (changes require restart)
-#
-# This setting defines the width of a tab in cells.
-#
-# Some applications, like Emacs, rely on knowing about the width of a tab.
-# To prevent unexpected behavior in these applications, it's also required to
-# change the `it` value in terminfo when altering this setting.
-#tabspaces: 8
-
-# Font configuration
-font:
-  # Normal (roman) font face
-  # normal:
-  #     Default:
-  #      - (macOS) Menlo
-  #      - (Linux/BSD) monospace
-  #      - (Windows) Consolas
-  family: IBM Plex
-  style: Regular
-
-  # Bold font face
-  #bold:
-    # Font family
-    #
-    # If the bold family is not specified, it will fall back to the
-    # value specified for the normal font.
-    #family: monospace
-
-    # The `style` can be specified to pick a specific face.
-    #style: Bold
-
-  # Italic font face
-  #italic:
-    # Font family
-    #
-    # If the italic family is not specified, it will fall back to the
-    # value specified for the normal font.
-    #family: monospace
-
-    # The `style` can be specified to pick a specific face.
-    #style: Italic
-
-  # Bold italic font face
-  #bold_italic:
-    # Font family
-    #
-    # If the bold italic family is not specified, it will fall back to the
-    # value specified for the normal font.
-    #family: monospace
-
-    # The `style` can be specified to pick a specific face.
-    #style: Bold Italic
-
-  # Point size
-  size: 15.0
-
-  # Offset is the extra space around each character. `offset.y` can be thought of
-  # as modifying the line spacing, and `offset.x` as modifying the letter spacing.
-  #offset:
-  #  x: 0
-  #  y: 0
-
-  # Glyph offset determines the locations of the glyphs within their cells with
-  # the default being at the bottom. Increasing `x` moves the glyph to the right,
-  # increasing `y` moves the glyph upwards.
-  #glyph_offset:
-  #  x: 0
-  #  y: 0
-
-  # Thin stroke font rendering (macOS only)
-  #
-  # Thin strokes are suitable for retina displays, but for non-retina screens
-  # it is recommended to set `use_thin_strokes` to `false`
-  #
-  # macOS >= 10.14.x:
-  #
-  # If the font quality on non-retina display looks bad then set
-  # `use_thin_strokes` to `true` and enable font smoothing by running the
-  # following command:
-  #   `defaults write -g CGFontRenderingFontSmoothingDisabled -bool NO`
-  #
-  # This is a global setting and will require a log out or restart to take
-  # effect.
-  #use_thin_strokes: true
-
-# If `true`, bold text is drawn using the bright color variants.
-#draw_bold_text_with_bright_colors: true
-
-# Colors (Tomorrow Night Bright)
-colors:
-  # Default colors
-  primary:
-    background: '0x000000'
-    foreground: '0xeaeaea'
-
-    # Bright and dim foreground colors
-    #
-    # The dimmed foreground color is calculated automatically if it is not present.
-    # If the bright foreground color is not set, or `draw_bold_text_with_bright_colors`
-    # is `false`, the normal foreground color will be used.
-    #dim_foreground: '0x9a9a9a'
-    #bright_foreground: '0xffffff'
-
-  # Cursor colors
-  #
-  # Colors which should be used to draw the terminal cursor. If these are unset,
-  # the cursor color will be the inverse of the cell color.
-  #cursor:
-  #  text: '0x000000'
-  #  cursor: '0xffffff'
-
-  # Selection colors
-  #
-  # Colors which should be used to draw the selection area. If selection
-  # background is unset, selection color will be the inverse of the cell colors.
-  # If only text is unset the cell text color will remain the same.
-  #selection:
-  #  text: '0xeaeaea'
-  #  background: '0x404040'
-
-  # Normal colors
-  #normal:
-  #  black:   '0x000000'
-  #  red:     '0xd54e53'
-  #  green:   '0xb9ca4a'
-  #  yellow:  '0xe6c547'
-  #  blue:    '0x7aa6da'
-  #  magenta: '0xc397d8'
-  #  cyan:    '0x70c0ba'
-  #  white:   '0xeaeaea'
-
-  # Bright colors
-  #bright:
-  #  black:   '0x666666'
-  #  red:     '0xff3334'
-  #  green:   '0x9ec400'
-  #  yellow:  '0xe7c547'
-  #  blue:    '0x7aa6da'
-  #  magenta: '0xb77ee0'
-  #  cyan:    '0x54ced6'
-  #  white:   '0xffffff'
-
-  # Dim colors
-  #
-  # If the dim colors are not set, they will be calculated automatically based
-  # on the `normal` colors.
-  #dim:
-  #  black:   '0x000000'
-  #  red:     '0x8c3336'
-  #  green:   '0x7a8530'
-  #  yellow:  '0x97822e'
-  #  blue:    '0x506d8f'
-  #  magenta: '0x80638e'
-  #  cyan:    '0x497e7a'
-  #  white:   '0x9a9a9a'
-
-  # Indexed Colors
-  #
-  # The indexed colors include all colors from 16 to 256.
-  # When these are not set, they're filled with sensible defaults.
-  #
-  # Example:
-  #   `- { index: 16, color: '0xff00ff' }`
-  #
-  #indexed_colors: []
-
-# Visual Bell
-#
-# Any time the BEL code is received, Alacritty "rings" the visual bell. Once
-# rung, the terminal background will be set to white and transition back to the
-# default background color. You can control the rate of this transition by
-# setting the `duration` property (represented in milliseconds). You can also
-# configure the transition function by setting the `animation` property.
-#
-# Values for `animation`:
-#   - Ease
-#   - EaseOut
-#   - EaseOutSine
-#   - EaseOutQuad
-#   - EaseOutCubic
-#   - EaseOutQuart
-#   - EaseOutQuint
-#   - EaseOutExpo
-#   - EaseOutCirc
-#   - Linear
-#
-# Specifying a `duration` of `0` will disable the visual bell.
-#visual_bell:
-#  animation: EaseOutExpo
-#  duration: 0
-#  color: '0xffffff'
-
-# Background opacity
-#
-# Window opacity as a floating point number from `0.0` to `1.0`.
-# The value `0.0` is completely transparent and `1.0` is opaque.
-
-#selection:
-  #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"
-
-  # When set to `true`, selected text will be copied to the primary clipboard.
-  #save_to_clipboard: false
-
-# Allow terminal applications to change Alacritty's window title.
-dynamic_title: true
-
-cursor:
-  # Cursor style
-  #
-  # Values for `style`:
-  #   - ▇ Block
-  #   - _ Underline
-  #   - | Beam
-  style: Beam
-
-  # If this is `true`, the cursor will be rendered as a hollow box when the
-  # window is not focused.
-  unfocused_hollow: true
-
-# Live config reload (changes require restart)
-live_config_reload: true
-
-# Shell
-#
-# You can set `shell.program` to the path of your favorite shell, e.g. `/bin/fish`.
-# Entries in `shell.args` are passed unmodified as arguments to the shell.
-#
-# Default:
-#   - (macOS) /bin/bash --login
-#   - (Linux/BSD) user login shell
-#   - (Windows) powershell
-shell:
-  program: /bin/zsh
-
-# Startup directory
-#
-# Directory the shell is started in. If this is unset, or `None`, the working
-# directory of the parent process will be used.
-#working_directory: None
-
-# WinPTY backend (Windows only)
-#
-# Alacritty defaults to using the newer ConPTY backend if it is available,
-# since it resolves a lot of bugs and is quite a bit faster. If it is not
-# available, the the WinPTY backend will be used instead.
-#
-# Setting this option to `true` makes Alacritty use the legacy WinPTY backend,
-# even if the ConPTY backend is available.
-#winpty_backend: false
-
-# Send ESC (\x1b) before characters when alt is pressed.
-#alt_send_esc: true
-
-#debug:
-  # Display the time it takes to redraw each frame.
-  #render_timer: false
-
-  # Keep the log file after quitting Alacritty.
-  #persistent_logging: false
-
-  # Log level
-  #
-  # Values for `log_level`:
-  #   - None
-  #   - Error
-  #   - Warn
-  #   - Info
-  #   - Debug
-  #   - Trace
-  #log_level: Warn
-
-  # Print all received window events.
-  #print_events: false
-
-  # Record all characters and escape sequences as test data.
-  #ref_test: false
-
-#mouse:
-  # Click settings
-  #
-  # The `double_click` and `triple_click` settings control the time
-  # alacritty should wait for accepting multiple clicks as one double
-  # or triple click.
-  #double_click: { threshold: 300 }
-  #triple_click: { threshold: 300 }
-
-  # If this is `true`, the cursor is temporarily hidden when typing.
-  #hide_when_typing: false
-
-  #url:
-    # URL launcher
-    #
-    # This program is executed when clicking on a text which is recognized as a URL.
-    # The URL is always added to the command as the last parameter.
-    #
-    # When set to `None`, URL launching will be disabled completely.
-    #
-    # Default:
-    #   - (macOS) open
-    #   - (Linux/BSD) xdg-open
-    #   - (Windows) explorer
-    #launcher:
-    #  program: xdg-open
-    #  args: []
-
-    # URL modifiers
-    #
-    # These are the modifiers that need to be held down for opening URLs when clicking
-    # on them. The available modifiers are documented in the key binding section.
-    #modifiers: None
-
-# Mouse bindings
-#
-# Mouse bindings are specified as a list of objects, much like the key
-# bindings further below.
-#
-# Each mouse binding will specify a:
-#
-# - `mouse`:
-#
-#   - Middle
-#   - Left
-#   - Right
-#   - Numeric identifier such as `5`
-#
-# - `action` (see key bindings)
-#
-# And optionally:
-#
-# - `mods` (see key bindings)
-#mouse_bindings:
-#  - { mouse: Middle, action: PasteSelection }
-
-# Key bindings
-#
-# Key bindings are specified as a list of objects. For example, this is the
-# default paste binding:
-#
-# `- { key: V, mods: Control|Shift, action: Paste }`
-#
-# Each key binding will specify a:
-#
-# - `key`: Identifier of the key pressed
-#
-#    - A-Z
-#    - F1-F24
-#    - Key0-Key9
-#
-#    A full list with available key codes can be found here:
-#    https://docs.rs/glutin/*/glutin/event/enum.VirtualKeyCode.html#variants
-#
-#    Instead of using the name of the keys, the `key` field also supports using
-#    the scancode of the desired key. Scancodes have to be specified as a
-#    decimal number. This command will allow you to display the hex scancodes
-#    for certain keys:
-#
-#       `showkey --scancodes`.
-#
-# Then exactly one of:
-#
-# - `chars`: Send a byte sequence to the running application
-#
-#    The `chars` field writes the specified string to the terminal. This makes
-#    it possible to pass escape sequences. To find escape codes for bindings
-#    like `PageUp` (`"\x1b[5~"`), you can run the command `showkey -a` outside
-#    of tmux. Note that applications use terminfo to map escape sequences back
-#    to keys. It is therefore required to update the terminfo when changing an
-#    escape sequence.
-#
-# - `action`: Execute a predefined action
-#
-#   - Copy
-#   - Paste
-#   - PasteSelection
-#   - IncreaseFontSize
-#   - DecreaseFontSize
-#   - ResetFontSize
-#   - ScrollPageUp
-#   - ScrollPageDown
-#   - ScrollLineUp
-#   - ScrollLineDown
-#   - ScrollToTop
-#   - ScrollToBottom
-#   - ClearHistory
-#   - Hide
-#   - Minimize
-#   - Quit
-#   - ToggleFullscreen
-#   - SpawnNewInstance
-#   - ClearLogNotice
-#   - ReceiveChar
-#   - None
-#
-#   (macOS only):
-#   - ToggleSimpleFullscreen: Enters fullscreen without occupying another space
-#
-# - `command`: Fork and execute a specified command plus arguments
-#
-#    The `command` field must be a map containing a `program` string and an
-#    `args` array of command line parameter strings. For example:
-#       `{ program: "alacritty", args: ["-e", "vttest"] }`
-#
-# And optionally:
-#
-# - `mods`: Key modifiers to filter binding actions
-#
-#    - Command
-#    - Control
-#    - Option
-#    - Super
-#    - Shift
-#    - Alt
-#
-#    Multiple `mods` can be combined using `|` like this:
-#       `mods: Control|Shift`.
-#    Whitespace and capitalization are relevant and must match the example.
-#
-# - `mode`: Indicate a binding for only specific terminal reported modes
-#
-#    This is mainly used to send applications the correct escape sequences
-#    when in different modes.
-#
-#    - AppCursor
-#    - AppKeypad
-#    - Alt
-#
-#    A `~` operator can be used before a mode to apply the binding whenever
-#    the mode is *not* active, e.g. `~Alt`.
-#
-# Bindings are always filled by default, but will be replaced when a new
-# binding with the same triggers is defined. To unset a default binding, it can
-# be mapped to the `ReceiveChar` action. Alternatively, you can use `None` for
-# a no-op if you do not wish to receive input characters for that binding.
-key_bindings:
-  # (Windows, Linux, and BSD only)
-  - { key: V,        mods: Alt,           action: Paste            }
-  - { key: C,        mods: Alt,           action: Copy             }
-  - { key: Insert,   mods: Shift,         action: PasteSelection   }
-  - { key: Key0,     mods: Control,       action: ResetFontSize    }
-  - { key: Equals,   mods: Control,       action: IncreaseFontSize }
-  - { key: Plus,      mods: Control,       action: IncreaseFontSize }
-  - { key: Minus, mods: Control,       action: DecreaseFontSize }
-  - { key: Minus,    mods: Control,       action: DecreaseFontSize }
-
-  # (Windows only)
-  #- { key: Return,   mods: Alt,           action: ToggleFullscreen }
-
-  # (macOS only)
-  #- { key: Key0,   mods: Command,         action: ResetFontSize    }
-  #- { key: Equals, mods: Command,         action: IncreaseFontSize }
-  #- { key: Add,    mods: Command,         action: IncreaseFontSize }
-  #- { key: Minus,  mods: Command,         action: DecreaseFontSize }
-  #- { key: K,      mods: Command,         action: ClearHistory     }
-  #- { key: K,      mods: Command,         chars: "\x0c"            }
-  #- { key: V,      mods: Command,         action: Paste            }
-  #- { key: C,      mods: Command,         action: Copy             }
-  #- { key: H,      mods: Command,         action: Hide             }
-  #- { key: M,      mods: Command,         action: Minimize         }
-  #- { key: Q,      mods: Command,         action: Quit             }
-  #- { key: W,      mods: Command,         action: Quit             }
-  #- { key: F,      mods: Command|Control, action: ToggleFullscreen }
-
-  #- { key: Paste,                    action: Paste                            }
-  #- { key: Copy,                     action: Copy                             }
-  #- { key: L,         mods: Control, action: ClearLogNotice                   }
-  #- { key: L,         mods: Control, chars: "\x0c"                            }
-  #- { key: PageUp,    mods: Shift,   action: ScrollPageUp,   mode: ~Alt       }
-  #- { key: PageDown,  mods: Shift,   action: ScrollPageDown, mode: ~Alt       }
-  #- { key: Home,      mods: Shift,   action: ScrollToTop,    mode: ~Alt       }
-  #- { key: End,       mods: Shift,   action: ScrollToBottom, mode: ~Alt       }
diff --git a/aspell/.aspell.en.pws b/aspell/.aspell.en.pws
index 5f64ef2..a66f284 100644
--- a/aspell/.aspell.en.pws
+++ b/aspell/.aspell.en.pws
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 115
+personal_ws-1.1 en 120 
 Aryadev
 Automorphism
 Automorphisms
@@ -61,6 +61,7 @@ deuteragonists
 diagonalisable
 distinguishment
 factorisations
+formalised
 homoiconicity
 homomorphic
 homomorphism
@@ -72,6 +73,8 @@ intuitionistic
 invariants
 irreducibles
 isomorphisms
+iteratively
+javascript
 lexeme
 lexemes
 lexing
@@ -90,6 +93,7 @@ nullspaces
 orthonormal
 parsers
 piecewise
+preprocesser
 prover
 semisimple
 subfield
@@ -111,6 +115,7 @@ uncountably
 undebatable
 undirected
 unipotent
+utilise
 verifier
 verifiers
 whitespace
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index 3a18d8f..54320d0 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -1,6 +1,6 @@
 font_family Hack
 font_size 15
-background_opacity 0.8
+background_opacity 1
 cursor #08d129
 cursor_shape beam
 cursor_beam_thickness 3
diff --git a/mpv/.config/mpv/input.conf b/mpv/.config/mpv/input.conf
index 79dc059..6666c93 100644
--- a/mpv/.config/mpv/input.conf
+++ b/mpv/.config/mpv/input.conf
@@ -1,4 +1,6 @@
 h seek -5
 l seek 5
 - add volume -5
-+ add volume 5 
++ add volume 5
+q quit-watch-later
+Q quit
diff --git a/programs b/programs
index 3940315..28aff5f 100644
--- a/programs
+++ b/programs
@@ -1,834 +1,1197 @@
-acl 2.3.1-2
-acme 2020.08.26-3
-adobe-source-code-pro-fonts 2.038ro+1.058it+1.018var-1
-adobe-source-han-sans-jp-fonts 2.004-1
-adobe-source-han-sans-kr-fonts 2.004-1
-adobe-source-han-serif-jp-fonts 2.001-2
-adobe-source-han-serif-kr-fonts 2.001-2
-adwaita-icon-theme 43-1
-alacritty 0.11.0-2
-alsa-card-profiles 1:0.3.61-1
-alsa-firmware 1.2.4-2
-alsa-lib 1.2.8-1
-alsa-oss 1.1.8-4
-alsa-plugins 1:1.2.7.1-1
-alsa-topology-conf 1.2.5.1-1
-alsa-ucm-conf 1.2.8-1
-alsa-utils 1.2.8-1
-aom 3.5.0-1
-arandr 0.1.10-7
-archlinux-keyring 20221123-1
-argon2 20190702-4
-aspell 0.60.8-3
+abseil-cpp 20240116.1-1
+acl 2.3.2-1
+acpi 1.7-3
+adobe-source-code-pro-fonts 2.042u+1.062i+1.026vf-1
+adobe-source-han-sans-kr-fonts 2.004-2
+adobe-source-han-serif-jp-fonts 2.002-2
+adobe-source-han-serif-kr-fonts 2.002-2
+adwaita-cursors 46.0-1
+adwaita-icon-theme 46.0-1
+alsa-card-profiles 1:1.0.5-1
+alsa-lib 1.2.11-1
+alsa-plugins 1:1.2.7.1-2
+alsa-topology-conf 1.2.5.1-3
+alsa-ucm-conf 1.2.11-1
+alsa-utils 1.2.11-1
+amdvlk 2024.Q1.3-2
+android-file-transfer 4.2-3
+android-udev 20231124-1
+aom 3.8.2-1
+appstream 1.0.2-1
+archlinux-keyring 20240313-1
+argon2 20190702-5
+aspell 0.60.8.1-2
 aspell-en 2020.12.07-1
-at-spi2-core 2.46.0-2
-atkmm 2.28.3-1
-attr 2.5.1-2
-audit 3.0.8-1
-autoconf 2.71-1
-automake 1.16.5-1
-avahi 0.8+22+gfd482a7-3
-base 3-1
-bash 5.1.016-1
+at-spi2-core 2.52.0-1
+atkmm 2.28.4-1
+attr 2.5.2-1
+aubio 0.4.9-16
+audit 4.0.1-2
+autoconf 2.72-1
+automake 1.16.5-2
+avahi 1:0.8+r194+g3f79789-1
+ayatana-ido 0.10.2-1
+base 3-2
+base-devel 1-1
+bash 5.2.026-2
 bc 1.07.1-4
-biber 1:2.17-2
-binutils 2.39-3
-bison 3.8.2-4
-blueman 2.3.5-1
-bluez 5.66-1
-bluez-libs 5.66-1
-bluez-utils 5.66-1
-boost 1.80.0-3
-boost-libs 1.80.0-3
-box2d 2.4.1-1
-brotli 1.0.9-9
-bubblewrap 0.7.0-1
-bzip2 1.0.8-5
-c-ares 1.18.1-1
+biber 1:2.19-2
+binutils 2.42-2
+bison 3.8.2-6
+blas 3.12.0-3
+bluedevil 1:6.0.4-1
+blueman 2.4.1-1
+bluez 5.75-1
+bluez-libs 5.75-1
+bluez-qt 6.1.0-1
+bluez-qt5 5.115.0-1
+bluez-utils 5.75-1
+bmake 20240309-1
+boost 1.83.0-5
+boost-libs 1.83.0-5
+box2d 2.4.1-2
+brotli 1.1.0-1
+btop 1.3.2-1
+btrfs-progs 6.8-2
+bubblewrap 0.9.0-1
+bzip2 1.0.8-6
+c-ares 1.28.1-1
 ca-certificates 20220905-1
-ca-certificates-mozilla 3.85-1
+ca-certificates-mozilla 3.99-1
 ca-certificates-utils 20220905-1
-cairo 1.17.6-2
-cairomm 1.14.4-1
-calf 0.90.3-5
+cairo 1.18.0-2
+cairomm 1.14.5-1
+calf 0.90.3-6
 cantarell-fonts 1:0.303.1-1
-clang 14.0.6-4
-clucene 2.3.3.4-12
-cmake 3.25.0-1
-compiler-rt 14.0.6-1
-coreutils 9.1-3
-cowsay 3.04-2
-cronie 1.6.1-1
-cryptsetup 2.6.0-1
-curl 7.86.0-4
-cython 0.29.32-2
-dash 0.5.11.5-1
-dav1d 1.0.0-1
-db 5.3.28-5
-dbus 1.14.4-1
-dbus-glib 0.112-2
-dbus-python 1.2.18-3
+cblas 3.12.0-3
+cdparanoia 10.2-9
+chromaprint 1.5.1-7
+chromium 124.0.6367.60-1
+clang 17.0.6-1
+clementine 1.4.0rc2-2
+clucene 2.3.3.4-14
+cmatrix 2.0-3
+compiler-rt 17.0.6-1
+coreutils 9.5-1
+cowsay 3.04-5
+crypto++ 8.9.0-1
+cryptsetup 2.7.2-1
+ctags 1:6.1.0-2
+curl 8.7.1-5
+dash 0.5.12-1
+dav1d 1.4.1-1
+db 6.2.32-1
+db5.3 5.3.28-4
+dbus 1.14.10-2
+dbus-broker 36-1
+dbus-broker-units 36-1
+dbus-glib 0.112-3
+dbus-python 1.3.2-2
+dcd 1:0.15.2-1
 dconf 0.40.0-2
-debuginfod 0.187-2
-desktop-file-utils 0.26-2
-device-mapper 2.03.17-1
-dhcpcd 9.4.1-1
-diffutils 3.8-1
-djvulibre 3.5.28-3
+debugedit 5.0-5
+debuginfod 0.191-1
+default-cursors 2-1
+desktop-file-utils 0.27-1
+device-mapper 2.03.23-3
+dfmt 0.15.1-1
+dhcp 4.4.3.P1-2
+dhcpcd 10.0.6-1
+diffutils 3.10-1
+djvulibre 3.5.28-6
+dmd 1:2.108.0-1
+dmd-docs 1:2.108.0-1
+dnsmasq 2.90-1
 dnssec-anchors 20190629-3
-double-conversion 3.2.1-1
-duktape 2.7.0-4
-dunst 1.9.0-1
-e2fsprogs 1.46.5-4
-easyeffects 7.0.0-1
-efibootmgr 18-1
-efivar 38-2
-electron 20.0.3-3
-enchant 2.3.3-2
+double-conversion 3.3.0-1
+dscanner 0.15.2-1
+dssi 1.1.1-12
+dtools 2.108.0-1
+dub 1.37.0-1
+duktape 2.7.0-6
+dunst 1.11.0-1
+dvisvgm 3.3-1
+e2fsprogs 1.47.0-2
+easyeffects 7.1.6-1
+efibootmgr 18-3
+efivar 39-1
+enchant 2.6.5-1
 espeak-ng 1.51.1-2
-expat 2.5.0-1
-fakeroot 1.30.1-1
-fd 8.5.3-1
-feh 3.9.1-2
+exiv2 0.28.2-3
+expat 2.6.2-1
+fakeroot 1.34-1
+feh 3.10.2-1
 ffcall 2.4-2
-ffmpeg 2:5.1.2-1
-fftw 3.3.10-3
-figlet 2.2.5-4
-file 5.43-1
-filesystem 2022.10.18-1
-findutils 4.9.0-1
-flac 1.4.2-1
-flex 2.6.4-3
-fluidsynth 2.3.0-2
-fmt 9.1.0-2
-fontconfig 2:2.14.1-2
-fontforge 20220308-1
-fortune-mod 3.14.1-2
-freetype2 2.12.1-1
-fribidi 1.0.12-1
-fzf 0.35.1-1
-gawk 5.2.1-1
-gc 8.2.2-1
-gcc 12.2.0-1
-gcc-libs 12.2.0-1
-gcr 3.41.1-3
-gcr-4 4.0.0-1
-gd 2.3.3-5
-gdb 12.1-2
-gdb-common 12.1-2
-gdbm 1.23-1
-gdk-pixbuf2 2.42.10-1
-geogebra 6.0.745.0-1
-gettext 0.21.1-2
-giflib 5.2.1-2
-girara 0.3.7-1
-git 2.38.1-2
-glib-networking 1:2.74.0-1
-glib2 2.74.2-1
-glibc 2.36-6
-glibmm 2.66.5-1
-glslang 11.11.0-1
-glu 9.0.2-3
-gmime3 3.2.13-1
-gmp 6.2.1-2
-gnupg 2.2.40-1
-gnutls 3.7.8-4
-gobject-introspection-runtime 1.74.0-1
-gotop 4.1.4-1
-gpgme 1.18.0-1
-gpm 1.20.7.r38.ge82d1a6-4
+ffmpeg 2:6.1.1-7
+fftw 3.3.10-6
+figlet 2.2.5-5
+file 5.45-1
+filesystem 2024.04.07-1
+findutils 4.9.0-3
+firefox 125.0.1-1
+flac 1.4.3-1
+flex 2.6.4-5
+fltk 1.3.9-1
+fluidsynth 2.3.5-1
+fmt 10.2.0-1
+fontconfig 2:2.15.0-2
+fortune-mod 3.20.0-1
+fprintd 1.94.3-1
+freeglut 3.4.0-1
+freetype2 2.13.2-1
+fribidi 1.0.13-2
+ftgl 2.4.0-2
+fuse-common 3.16.2-1
+fuse2 2.9.9-4
+fuse3 3.16.2-1
+fzf 0.48.1-1
+gawk 5.3.0-1
+gc 8.2.6-1
+gcc 13.2.1-5
+gcc-libs 13.2.1-5
+gcr 3.41.2-1
+gcr-4 4.2.1-2
+gd 2.3.3-7
+gdb 14.2-1
+gdb-common 14.2-1
+gdbm 1.23-2
+gdk-pixbuf2 2.42.10-2
+gettext 0.22.4-1
+ghostscript 10.03.0-2
+giflib 5.2.2-1
+gifsicle 1.95-1
+girara 0.4.3-3
+git 2.44.0-1
+glew 2.2.0-6
+glib-networking 1:2.80.0-1
+glib2 2.80.0-2
+glibc 2.39-2
+glibmm 2.66.7-1
+glm 1.0.0-3
+glslang 14.0.0-2
+glu 9.0.3-1
+gmime3 3.2.14-1
+gmp 6.3.0-2
+gnome-nettool 42.0-2
+gnupg 2.4.5-1
+gnutls 3.8.5-1
+gobject-introspection-runtime 1.80.1-1
+gperftools 2.15-1
+gpgme 1.23.2-1
+gpm 1.20.7.r38.ge82d1a6-5
+gptfdisk 1.0.10-1
 graphene 1.10.8-1
-graphite 1:1.3.14-2
-grep 3.8-2
-groff 1.22.4-7
-grub 2:2.06.r380.g151467888-1
-gsettings-desktop-schemas 43.0-1
-gsl 2.7.1-1
+graphite 1:1.3.14-3
+grep 3.11-1
+groff 1.23.0-5
+grub 2:2.12-2
+gsettings-desktop-schemas 46.0-1
+gsl 2.7.1-3
 gsm 1.0.22-1
-gst-plugins-bad-libs 1.20.4-3
-gst-plugins-base-libs 1.20.4-3
-gstreamer 1.20.4-3
-gtk-update-icon-cache 1:4.8.2-1
-gtk2 2.24.33-2
-gtk3 1:3.24.35-2
-gtk4 1:4.8.2-1
-gtkmm3 3.24.7-1
-guile 3.0.8-3
-gzip 1.12-1
-harfbuzz 5.3.1-3
-harfbuzz-icu 5.3.1-3
+gssdp 1.6.3-1
+gst-plugins-bad-libs 1.24.1-2
+gst-plugins-base 1.24.1-2
+gst-plugins-base-libs 1.24.1-2
+gstreamer 1.24.1-2
+gtk-update-icon-cache 1:4.14.2-1
+gtk2 2.24.33-3
+gtk3 1:3.24.41-1
+gtk4 1:4.14.2-1
+gtkmm3 3.24.9-1
+guile 3.0.9-1
+gumbo-parser 0.12.1-1
+gupnp 1:1.6.6-1
+gupnp-igd 1.6.0-1
+gvfs 1.54.0-2
+gvfs-goa 1.54.0-2
+gvfs-google 1.54.0-2
+gzip 1.13-2
+harfbuzz 8.4.0-1
+harfbuzz-icu 8.4.0-1
+haveged 1.9.18-1
 hdparm 9.65-1
-hicolor-icon-theme 0.17-2
-hidapi 0.12.0-1
-htop 3.2.1-1
-hugo 0.105.0-1
-hunspell 1.7.1-1
-hwdata 0.364-1
-hwloc 2.8.0-1
+hicolor-icon-theme 0.17-3
+hidapi 0.14.0-2
+highway 1.1.0-1
+hostapd 2.10-4
+htop 3.3.0-1
+http-parser 2.9.4-2
+hugo 0.125.1-1
+hunspell 1.7.2-1
+hwdata 0.381-1
+hwloc 2.10.0-1
 hyphen 2.8.8-5
 i3lock 2.14.1-1
-iana-etc 20221107-1
-icu 72.1-2
-imagemagick 7.1.0.52-1
-imlib2 1.9.1-2
-intel-ucode 20221108-1
-iproute2 6.0.0-1
-iptables 1:1.8.8-2
-iputils 20221126-1
-ipython 8.7.0-1
-iso-codes 4.12.0-1
-isync 1.4.4-3
-iw 5.19-1
-jansson 2.14-2
-json-c 0.16-1
-json-glib 1.6.6-2
+iana-etc 20240412-1
+icu 74.2-2
+ijs 0.35-6
+imagemagick 7.1.1.30-2
+imath 3.1.11-1
+imlib2 1.12.2-2
+inetutils 2.5-1
+intel-ucode 20240312-1
+iproute2 6.8.0-1
+iptables 1:1.8.10-1
+iputils 20240117-1
+ipython 8.22.2-1
+iso-codes 4.16.0-1
+isync 1.4.4-4
+iw 6.7-1
+jansson 2.14-3
+jasper 4.2.1-1
+jbig2dec 0.20-1
+jbigkit 2.1-7
+json-c 0.17-1
+json-glib 1.8.0-1
 jsoncpp 1.9.5-2
-kbd 2.5.1-1
-keyutils 1.6.3-1
-kmod 30-3
-krb5 1.20-3
-l-smash 2.14.5-2
+karchive 6.1.0-1
+karchive5 5.115.0-1
+kauth 6.1.0-1
+kauth5 5.115.0-1
+kbd 2.6.4-1
+kbookmarks 6.1.0-1
+kbookmarks5 5.115.0-1
+kcmutils 6.1.0-1
+kcmutils5 5.115.0-1
+kcodecs 6.1.0-1
+kcodecs5 5.115.0-1
+kcolorscheme 6.1.0-1
+kcompletion 6.1.0-1
+kcompletion5 5.115.0-1
+kconfig 6.1.0-1
+kconfig5 5.115.0-1
+kconfigwidgets 6.1.0-1
+kconfigwidgets5 5.115.0-1
+kcontacts 1:6.1.0-1
+kcontacts5 5.115.0-1
+kcoreaddons 6.1.0-1
+kcoreaddons5 5.115.0-1
+kcrash 6.1.0-1
+kcrash5 5.115.0-1
+kdbusaddons 6.1.0-1
+kdbusaddons5 5.115.0-1
+kdeclarative 6.1.0-1
+kdeclarative5 5.115.0-1
+kdeconnect 24.02.2-1
+kded5 5.115.0-1
+keyutils 1.6.3-2
+kglobalaccel 6.1.0-1
+kglobalaccel5 5.115.0-3
+kguiaddons 6.1.0-1
+kguiaddons5 5.115.0-2
+ki18n 6.1.0-1
+ki18n5 5.115.1-1
+kiconthemes 6.1.0-1
+kiconthemes5 5.115.0-1
+kio 6.1.0-1
+kio5 5.115.0-3
+kirigami 6.1.0-1
+kirigami-addons 1.1.0-1
+kirigami-addons5 0.11.0-7
+kirigami2 5.115.0-1
+kitemmodels 6.1.0-1
+kitemmodels5 5.115.0-1
+kitemviews 6.1.0-1
+kitemviews5 5.115.0-1
+kjobwidgets 6.1.0-1
+kjobwidgets5 5.115.0-1
+kmod 32-1
+knotifications 6.1.0-1
+knotifications5 5.115.0-1
+kpackage 6.1.0-1
+kpackage5 5.115.0-1
+kpeople 6.1.0-1
+kpeople5 5.115.0-1
+kpeoplevcard 0.1-2
+krb5 1.21.2-2
+krita 5.2.2-8
+kservice 6.1.0-1
+kservice5 5.115.0-1
+kstatusnotifieritem 6.1.0-1
+ksvg 6.1.0-1
+ktextwidgets5 5.115.0-1
+kwallet 6.1.0-1
+kwallet5 5.115.0-2
+kwidgetsaddons 6.1.0-1
+kwidgetsaddons5 5.115.0-1
+kwindowsystem 6.1.0-1
+kwindowsystem5 5.115.0-1
+kxmlgui 6.1.0-1
+kxmlgui5 5.115.0-1
+l-smash 2.14.5-3
+ladspa 1.17-4
 lame 3.100-4
-lcms2 2.14-1
+lcms2 2.16-1
+ldc 3:1.37.0-1
 ldns 1.8.3-2
-less 1:608-1
+leptonica 1.84.1-2
+less 1:643-2
+lib32-alsa-lib 1.2.11-1
+lib32-alsa-plugins 1.2.7.1-2
+lib32-amdvlk 2024.Q1.3-2
+lib32-brotli 1.1.0-1
+lib32-bzip2 1.0.8-3
+lib32-curl 8.7.1-4
+lib32-e2fsprogs 1.47.0-1
+lib32-expat 2.6.2-1
+lib32-gcc-libs 13.2.1-5
+lib32-glibc 2.39-2
+lib32-icu 74.2-1
+lib32-keyutils 1.6.3-2
+lib32-krb5 1.21.2-1
+lib32-libdrm 2.4.120-1
+lib32-libelf 0.191-1
+lib32-libffi 3.4.6-1
+lib32-libglvnd 1.7.0-1
+lib32-libgpg-error 1.48-1
+lib32-libidn2 2.3.7-1
+lib32-libldap 2.6.7-1
+lib32-libnghttp2 1.61.0-1
+lib32-libnghttp3 1.2.0-1
+lib32-libpciaccess 0.18-1
+lib32-libpsl 0.21.2-1
+lib32-libssh2 1.11.0-1
+lib32-libtasn1 4.19.0-1
+lib32-libunistring 1.2-1
+lib32-libunwind 1.8.1-1
+lib32-libx11 1.8.7-1
+lib32-libxau 1.0.11-1
+lib32-libxcb 1.16.1-1
+lib32-libxcrypt 4.4.36-1
+lib32-libxcrypt-compat 4.4.36-1
+lib32-libxdamage 1.1.6-1
+lib32-libxdmcp 1.1.5-1
+lib32-libxext 1.3.6-1
+lib32-libxfixes 6.0.1-1
+lib32-libxml2 2.12.6-1
+lib32-libxshmfence 1.3.2-1
+lib32-libxss 1.2.4-1
+lib32-libxxf86vm 1.1.5-1
+lib32-llvm-libs 17.0.6-2
+lib32-lm_sensors 1:3.6.0.r41.g31d1f125-2
+lib32-mesa 1:24.0.5-1
+lib32-ncurses 6.4_20230520-1
+lib32-nspr 4.35-2
+lib32-nss 3.99-1
+lib32-openssl 1:3.2.1-1
+lib32-p11-kit 0.25.3-1
+lib32-sqlite 3.45.2-1
+lib32-vulkan-icd-loader 1.3.279-1
+lib32-wayland 1.22.0-1
+lib32-xz 5.6.1-3
+lib32-zlib 1.3.1-1
+lib32-zstd 1.5.5-1
 libabw 0.1.3-3
-libadwaita 1:1.2.0-1
-libarchive 3.6.1-5
-libass 0.16.0-1
-libassuan 2.5.5-1
+libadwaita 1:1.5.0-1
+libaio 0.3.113-3
+libappindicator-gtk3 12.10.0.r298-3
+libarchive 3.7.3-1
+libass 0.17.1-4
+libassuan 2.5.7-2
 libasyncns 1:0.8+r3+g68cd5af-2
-libatomic_ops 7.6.14-1
-libavc1394 0.5.4-4
-libavif 0.11.1-1
+libatasmart 0.19-6
+libatomic_ops 7.8.0-1
+libavc1394 0.5.4-6
+libavif 1.0.4-2
+libayatana-appindicator 0.5.93-1
+libayatana-indicator 0.9.4-1
 libb2 0.98.1-2
-libbluray 1.3.3-1
-libbpf 1.0.1-1
+libblockdev 3.1.1-1
+libblockdev-crypto 3.1.1-1
+libblockdev-fs 3.1.1-1
+libblockdev-loop 3.1.1-1
+libblockdev-mdraid 3.1.1-1
+libblockdev-nvme 3.1.1-1
+libblockdev-part 3.1.1-1
+libblockdev-swap 3.1.1-1
+libbluray 1.3.4-1
+libbpf 1.3.0-1
 libbs2b 3.1.0-8
-libbsd 0.11.7-1
-libcamera 0.0.2-1
-libcanberra 1:0.30+r2+gc0620e4-2
-libcap 2.66-1
-libcap-ng 0.8.3-1
-libcddb 1.3.2-6
+libbsd 0.12.2-1
+libbytesize 2.8-2
+libcamera 0.2.0-1
+libcamera-ipa 0.2.0-1
+libcanberra 1:0.30+r2+gc0620e4-3
+libcap 2.69-4
+libcap-ng 0.8.5-1
+libcddb 1.3.2-7
 libcdio 2.1.0-3
-libcdio-paranoia 10.2+2.0.1-2
-libcdr 0.1.7-5
-libcloudproviders 0.3.1+r8+g3a229ee-1
-libcolord 1.4.6-1
-libconfig 1.7.3-1
-libcups 1:2.4.2-3
-libcurl-gnutls 7.86.0-4
+libcdio-paranoia 10.2+2.0.1-3
+libcdr 0.1.7-7
+libcloudproviders 0.3.6-1
+libcmis 0.6.2-1
+libcolord 1.4.7-2
+libconfig 1.7.3-2
+libcups 1:2.4.7-2
+libcurl-gnutls 8.7.1-5
 libdaemon 0.14-5
-libdatrie 0.2.13-2
-libde265 1.0.9-1
-libdrm 2.4.114-1
-libdvdnav 6.1.1-1
-libdvdread 6.1.3-1
-libe-book 0.1.3-13
+libdatrie 0.2.13-4
+libdbusmenu-glib 16.04.0.r498-2
+libdbusmenu-gtk3 16.04.0.r498-2
+libdbusmenu-qt5 0.9.3+16.04.20160218-7
+libde265 1.0.15-1
+libdeflate 1.20-1
+libdovi 3.3.0-1
+libdrm 2.4.120-1
+libdvdnav 6.1.1-2
+libdvdread 6.1.3-2
+libe-book 0.1.3-15
 libebur128 1.2.6-1
-libedit 20210910_3.1-2
-libelf 0.187-2
-libepoxy 1.5.10-1
+libedit 20230828_3.1-1
+libei 1.2.1-1
+libelf 0.191-1
+libepoxy 1.5.10-2
 libepubgen 0.1.1-4
-libetonyek 0.1.10-2
+libetonyek 0.1.10-3
 libev 4.33-2
-libevdev 1.13.0-1
+libevdev 1.13.1-1
 libevent 2.1.12-4
-libexif 0.6.24-1
-libexttextcat 3.4.6-1
-libfdk-aac 2.0.2-1
-libffi 3.4.4-1
-libfontenc 1.1.6-1
+libexif 0.6.24-2
+libexttextcat 3.4.7-1
+libfabric 1.21.0-1
+libfakekey 0.3-2
+libfdk-aac 2.0.3-1
+libffi 3.4.6-1
+libfm 1.3.2-1
+libfm-extra 1.3.2-1
+libfm-gtk2 1.3.2-1
+libfontenc 1.1.8-1
+libfprint 1.94.7-2
 libfreeaptx 0.1.1-1
 libfreehand 0.1.2-4
-libgccjit 12.2.0-1
-libgcrypt 1.10.1-2
-libglvnd 1.5.0-1
-libgpg-error 1.46-2
-libgudev 237-2
-libheif 1.14.0-1
-libical 3.0.16-2
-libice 1.0.10-4
-libidn2 2.3.4-3
-libiec61883 1.2.0-6
-libimobiledevice 1.3.0-5
-libinput 1.22.0-1
-libinstpatch 1.1.6-1
-libisl 0.25-1
-libixion 0.17.0-3
-libjpeg-turbo 2.1.4-2
-libksba 1.6.2-1
-liblangtag 0.6.4-1
+libgccjit 13.2.1-5
+libgcrypt 1.10.3-1
+libgdata 0.18.1-3
+libgig 4.4.1-1
+libgirepository 1.80.1-1
+libgit2 1:1.7.2-1
+libglvnd 1.7.0-1
+libgoa 3.50.1-1
+libgpg-error 1.48-1
+libgpod 0.8.3-15
+libgtop 2.41.3-1
+libgudev 238-1
+libgusb 0.4.8-1
+libheif 1.17.6-5
+libical 3.0.18-1
+libice 1.1.1-2
+libid3tag 0.16.3-2
+libidn 1.42-1
+libidn2 2.3.7-1
+libiec61883 1.2.0-7
+libimobiledevice 1.3.0-11
+libimobiledevice-glue 1.2.0-1
+libinih 58-1
+libinput 1.25.0-1
+libinstpatch 1.1.6-2
+libisl 0.26-1
+libixion 0.19.0-1
+libjpeg-turbo 3.0.2-2
+libjxl 0.10.2-1
+libkdcraw5 24.02.2-1
+libksba 1.6.6-1
+liblangtag 0.6.7-1
+liblastfm-qt5 1.1.0-1
+liblc3 1.1.0-1
 libldac 2.0.2.3-1
-libldap 2.6.3-2
+libldap 2.6.7-1
+liblo 1:0.32-1
+liblphobos 3:1.37.0-1
 liblqr 0.4.2-3
-libluv 1.44.2_1-2
-libmanette 0.2.6-3
-libmd 1.0.4-1
-libmfx 22.4.4-1
-libmicrohttpd 0.9.75-1
-libmm-glib 1.20.2-1
-libmnl 1.0.5-1
-libmodplug 0.8.9.0-3
-libmpc 1.2.1-2
-libmspub 0.1.4-13
-libmwaw 0.3.21-3
+liblsp-r3d-glx-lib 1.2.15-1
+libluv 1.48.0_2-1
+libmad 0.15.1b-10
+libmanette 0.2.7-1
+libmbim 1.30.0-1
+libmd 1.1.0-1
+libmfx 23.2.2-2
+libmicrohttpd 1.0.1-1
+libmm-glib 1.22.0-1
+libmnl 1.0.5-2
+libmodplug 0.8.9.0-5
+libmpc 1.3.1-1
+libmspub 0.1.4-15
+libmtp 1.1.21-1
+libmupdf 1.24.1-1
+libmwaw 0.3.22-1
+libmygpo-qt5 1.1.0-3
+libmysofa 1.3.2-1
 libndp 1.8-1
-libnetfilter_conntrack 1.0.9-1
-libnewt 0.52.23-1
-libnfnetlink 1.0.2-1
-libnftnl 1.2.3-1
-libnghttp2 1.51.0-1
-libnl 3.7.0-1
-libnm 1.40.4-1
-libnma 1.10.4-3
-libnma-common 1.10.4-3
-libnotify 0.8.1-1
-libnsl 2.0.0-2
+libnetfilter_conntrack 1.0.9-2
+libnewt 0.52.24-1
+libnfnetlink 1.0.2-2
+libnftnl 1.2.6-1
+libnghttp2 1.61.0-1
+libnghttp3 1.2.0-1
+libngtcp2 1.4.0-1
+libnice 0.1.22-1
+libnl 3.9.0-1
+libnm 1.46.0-2
+libnma 1.10.6-2
+libnma-common 1.10.6-2
+libnotify 0.8.3-1
+libnsl 2.0.1-1
 libnumbertext 1.0.11-1
+libnvme 1.8-1
 libodfgen 0.1.8-2
 libogg 1.3.5-1
-libomxil-bellagio 0.9.3-3
-liborcus 0.17.2-3
-libp11-kit 0.24.1-1
+libomxil-bellagio 0.9.3-4
+libopenmpt 0.7.6-2
+liborcus 0.19.2-1
+libp11-kit 0.25.3-1
 libpagemaker 0.0.4-3
-libpaper 1.1.28-2
-libpcap 1.10.1-2
-libpciaccess 0.17-1
-libpgm 5.3.128-2
-libpipeline 1.5.7-1
-libplacebo 4.208.0-1
-libplist 2.2.0-5
-libpng 1.6.39-1
-libproxy 0.4.18-1
-libpsl 0.21.1-3
-libpulse 16.1-3
-libqxp 0.0.2-9
-libraqm 0.9.0-1
+libpaper 2.2.5-1
+libpcap 1.10.4-1
+libpciaccess 0.18.1-2
+libpgm 5.3.128-3
+libphobos 1:2.108.0-1
+libpipeline 1.5.7-2
+libpipewire 1:1.0.5-1
+libplacebo 6.338.2-4
+libplasma 6.0.4-1
+libplist 2.4.0-1
+libpng 1.6.43-1
+libproxy 0.5.5-1
+libpsl 0.21.2-1
+libpulse 17.0-3
+libqmi 1.34.0-1
+libqrtr-glib 1.2.2-2
+libqxp 0.0.2-11
+libraqm 0.10.1-1
+libraw 0.21.2-1
 libraw1394 2.1.2-3
-libreoffice-still 7.3.7-1
-librevenge 0.0.4-5
-librsvg 2:2.55.1-1
-libsamplerate 0.2.2-1
-libsasl 2.1.28-3
-libseccomp 2.5.4-1
-libsecret 0.20.5-2
-libsigc++ 2.10.8-1
-libsigc++-3.0 3.2.0-1
-libsigsegv 2.14-1
-libsm 1.2.3-3
-libsndfile 1.1.0-3
-libsodium 1.0.18-2
+libreoffice-fresh 24.2.2-2
+librevenge 0.0.5-2
+librsvg 2:2.58.0-1
+libsamplerate 0.2.2-2
+libsasl 2.1.28-4
+libseccomp 2.5.5-2
+libsecret 0.21.4-1
+libsigc++ 2.12.1-1
+libsigc++-3.0 3.6.0-1
+libsigsegv 2.14-2
+libsixel 1.10.3-5
+libsm 1.2.4-1
+libsndfile 1.2.2-2
+libsodium 1.0.19-3
 libsonic 0.2.0-1
 libsoup 2.74.3-1
-libsoup3 3.2.2-1
-libsoxr 0.1.3-2
-libspiro 1:20221101-1
-libssh 0.10.4-3
-libssh2 1.10.0-3
+libsoup3 3.4.4-1
+libsoxr 0.1.3-3
+libssh 0.10.6-2
+libssh2 1.11.0-1
 libstaroffice 0.0.7-2
 libstemmer 2.2.0-2
-libsynctex 2022.62885-3
-libsysprof-capture 3.46.0-1
+libsynctex 2024.2-1
+libsysprof-capture 46.0-1
 libtasn1 4.19.0-1
-libteam 1.31-5
-libtermkey 0.22-2
-libthai 0.1.29-2
-libtheora 1.1.1-5
-libtiff 4.4.0-4
-libtirpc 1.3.3-2
-libtommath 1.2.0-3
-libtool 2.4.7-5
-libtorrent-rasterbar 1:2.0.8-2
-libuninameslist 20221022-1
-libunistring 1.1-2
-libunwind 1.6.2-2
-libusb 1.0.26-1
-libusbmuxd 2.0.2-1
-libutempter 1.2.1-3
-libuv 1.44.2-1
-libva 2.16.0-1
-libvdpau 1.5-1
-libvdpau-va-gl 0.4.2-3
-libverto 0.3.2-4
-libvisio 0.1.7-8
+libteam 1.32-1
+libtermkey 0.22-3
+libthai 0.1.29-3
+libtheora 1.1.1-6
+libtiff 4.6.0-4
+libtirpc 1.3.4-1
+libtommath 1.3.0-1
+libtool 2.4.7+4+g1ec8fa28-7
+libunibreak 6.1-1
+libunistring 1.2-1
+libunwind 1.8.1-2
+libusb 1.0.27-1
+libusbmuxd 2.1.0-1
+libutempter 1.2.1-4
+libuv 1.48.0-2
+libva 2.21.0-1
+libvdpau 1.5-2
+libverto 0.3.2-5
+libvisio 0.1.7-10
 libvorbis 1.3.7-3
-libvpx 1.12.0-2
-libvterm 0.3-1
+libvpl 2.10.2-1
+libvpx 1.14.0-1
+libvterm 0.3.3-1
 libvterm01 0.1.4-2
-libwacom 2.5.0-1
-libwebp 1.2.4-1
-libwireplumber 0.4.12-2
+libwacom 2.11.0-1
+libwebp 1.4.0-1
+libwireplumber 0.5.1-2
 libwpd 0.10.3-4
-libwpe 1.14.0-1
-libwpg 0.3.3-4
-libwps 0.4.13-1
-libx11 1.8.2-2
-libxau 1.0.10-2
-libxaw 1.0.14-1
-libxcb 1.15-2
-libxcomposite 0.4.5-4
-libxcrypt 4.4.33-1
-libxcursor 1.2.1-2
+libwpe 1.16.0-1
+libwpg 0.3.4-1
+libwps 0.4.14-1
+libx11 1.8.9-1
+libxau 1.0.11-2
+libxaw 1.0.16-1
+libxcb 1.17.0-1
+libxcomposite 0.4.6-1
+libxcrypt 4.4.36-1
+libxcrypt-compat 4.4.36-1
+libxcursor 1.2.2-1
 libxcvt 0.1.2-1
-libxdamage 1.1.5-5
-libxdmcp 1.1.4-1
-libxext 1.3.5-1
-libxfixes 6.0.0-2
-libxfont2 2.0.6-1
-libxft 2.3.7-1
-libxi 1.8-2
+libxdamage 1.1.6-1
+libxdmcp 1.1.5-1
+libxext 1.3.6-1
+libxfixes 6.0.1-1
+libxfont2 2.0.6-2
+libxft 2.3.8-1
+libxi 1.8.1-1
 libxinerama 1.1.5-1
-libxkbcommon 1.4.1-2
-libxkbcommon-x11 1.4.1-2
-libxkbfile 1.1.1-1
-libxml2 2.10.3-2
-libxmu 1.1.4-1
-libxpm 3.5.14-1
+libxkbcommon 1.7.0-2
+libxkbcommon-x11 1.7.0-2
+libxkbfile 1.1.3-1
+libxml2 2.12.6-1
+libxmlb 0.3.18-1
+libxmu 1.2.1-1
+libxpm 3.5.17-1
 libxpresent 1.0.1-1
-libxrandr 1.5.3-1
+libxrandr 1.5.4-1
 libxrender 0.9.11-1
-libxshmfence 1.3.1-1
-libxslt 1.1.37-2
-libxss 1.2.3-4
-libxt 1.2.1-1
+libxshmfence 1.3.2-1
+libxslt 1.1.39-1
+libxss 1.2.4-1
+libxt 1.3.0-1
 libxtst 1.2.4-1
-libxv 1.0.11-5
-libxvmc 1.0.13-1
+libxv 1.0.12-1
+libxvmc 1.0.14-1
 libxxf86vm 1.1.5-1
-libyaml 0.2.5-1
-libyuv r2322+3aebf69d-1
-libzip 1.9.2-1
-libzmf 0.0.2-13
-licenses 20220125-1
-lilv 0.24.20-1
-linux 6.0.10.arch2-1
-linux-api-headers 5.18.15-1
-linux-firmware 20221109.60310c2-2
-linux-firmware-whence 20221109.60310c2-2
-lld 14.0.6-1
-llvm 14.0.6-4
-llvm-libs 14.0.6-4
+libyaml 0.2.5-2
+libyuv r2426+464c51a0-1
+libzip 1.10.1-1
+libzmf 0.0.2-15
+licenses 20240206-1
+lilv 0.24.24-1
+linux 6.8.7.arch1-1
+linux-api-headers 6.7-1
+linux-firmware 20240409.1addd7dc-1
+linux-firmware-whence 20240409.1addd7dc-1
+linux-wifi-hotspot 4.5.0-1
+lld 17.0.6-1
+llvm 17.0.6-2
+llvm-libs 17.0.6-2
 lm_sensors 1:3.6.0.r41.g31d1f125-2
+lmms 1.2.2-22
 lpsolve 5.5.2.11-2
-lsp-plugins 1.2.3-1
-lua 5.4.4-2
-luajit 2.1.0.beta3.r457.g637721d0-1
+lsb-release 2.0.r53.a86f885-1
+lsof 4.99.3-2
+lsp-plugins 1.2.15-1
+lsp-plugins-clap 1.2.15-1
+lsp-plugins-ladspa 1.2.15-1
+lsp-plugins-lv2 1.2.15-1
+lsp-plugins-standalone 1.2.15-1
+lsp-plugins-vst 1.2.15-1
+lua 5.4.6-3
+luajit 2.1.1710088188-1
+lurk 0.3.4-1
 lv2 1.18.10-1
-lz4 1:1.9.4-1
-lzo 2.10-4
-m4 1.4.19-1
-make 4.3-5
-man-db 2.11.1-1
-man-pages 6.01-1
-md4c 0.4.8-1
-mesa 22.2.3-1
-minizip 1:1.2.13-2
-mkinitcpio 33-1
-mkinitcpio-busybox 1.35.0-1
-mobile-broadband-provider-info 20221107-1
-mpfr 4.1.1.p1-1
-mpv 1:0.35.0-2
-msgpack-c 4.0.0-1
+lvm2 2.03.23-3
+lxmenu-data 0.1.5-3
+lz4 1:1.9.4-3
+lzo 2.10-5
+m4 1.4.19-3
+macchanger 1.7.0-5
+mailcap 2.1.54-1
+make 4.4.1-2
+man-db 2.12.1-1
+man-pages 6.7-1
+md4c 0.5.2-1
+mdadm 4.3-2
+media-player-info 24-2
+menu-cache 1.1.0-4
+mesa 1:24.0.5-1
+minizip 1:1.3.1-1
+minizip-ng 4.0.5-1
+mkinitcpio 38.1-1
+mkinitcpio-busybox 1.36.1-1
+mlt 7.22.0-3
+mobile-broadband-provider-info 20230416-1
+modemmanager 1.22.0-1
+modemmanager-qt 6.1.0-1
+modemmanager-qt5 5.115.0-1
+mpfr 4.2.1-2
+mpg123 1.32.5-1
+mpv 1:0.38.0-2
+msgpack-c 5.0.0-2
 mtdev 1.1.6-2
-mujs 1.3.1-1
-nasm 2.15.05-1
-ncurses 6.3-3
-neon 0.32.4-2
-neovim 0.8.1-2
-nettle 3.8.1-1
-networkmanager 1.40.4-1
-nm-connection-editor 1.30.0-1
-node-gyp 9.3.0-1
-nodejs 19.2.0-1
-nodejs-nopt 7.0.0-1
-notmuch 0.37-2
-notmuch-runtime 0.37-2
-noto-fonts 20220810-1
-noto-fonts-emoji 20220920-1
-noto-fonts-extra 20220810-1
-npm 8.19.2-1
-npth 1.6-3
-nspr 4.35-1
-nss 3.85-1
-ocaml 4.14.0-1
-ocaml-compiler-libs 4.14.0-1
-ocl-icd 2.3.1-1
-opam 2.1.3-1
+mujs 1.3.4-1
+mxml 3.3.1-1
+nasm 2.16.01-1
+ncurses 6.4_20230520-1
+neon 0.33.0-1
+neovim 0.9.5-5
+nettle 3.9.1-1
+network-manager-applet 1.36.0-1
+networkmanager 1.46.0-2
+nftables 1:1.0.9-1
+nm-connection-editor 1.36.0-1
+nmap 7.94-2
+node-gyp 10.1.0-2
+nodejs 21.7.2-1
+nodejs-nopt 7.2.0-1
+notmuch 0.38.3-1
+notmuch-runtime 0.38.3-1
+noto-fonts 1:24.4.1-1
+noto-fonts-emoji 1:2.042-1
+noto-fonts-extra 1:24.4.1-1
+npm 10.5.2-1
+npth 1.7-1
+nspr 4.35-2
+nss 3.99-1
+numactl 2.0.18-1
+ocaml 5.1.1-1
+ocaml-compiler-libs 5.1.1-1
+ocl-icd 2.3.2-1
+onboard 1.4.1-8
+onetbb 2021.12.0-1
+opam 2.1.5-3
+openal 1.23.1-1
+opencolorio 2.3.2-1
 opencore-amr 0.1.6-1
-opendoas 6.8.2-1
-openjpeg2 2.5.0-1
-openmpi 4.1.4-4
-openpmix 4.2.2-1
-openssh 9.1p1-3
-openssl 3.0.7-2
-opus 1.3.1-3
-orc 0.4.33-1
-p11-kit 0.24.1-1
-pacman 6.0.2-5
-pacman-mirrorlist 20221016-1
-pam 1.5.2-1
-pambase 20221020-1
-pamixer 1.6-2
-pango 1:1.50.12-1
-pangomm 2.46.3-1
-pass 1.7.4-3
-patch 2.7.6-8
-pavucontrol 1:5.0+r61+gee77d86-2
+opendoas 6.8.2-2
+openexr 3.2.4-1
+openjpeg2 2.5.2-1
+openmpi 5.0.2-8
+openpmix 4.2.9-1
+openssh 9.7p1-1
+openssl 3.2.1-1
+openucx 1.15.0-2
+opus 1.5.2-1
+orc 0.4.38-1
+p11-kit 0.25.3-1
+pacman 6.1.0-3
+pacman-mirrorlist 20231001-1
+pam 1.6.1-2
+pambase 20230918-1
+pamixer 1.6-3
+pango 1:1.52.2-1
+pangomm 2.46.4-1
+parted 3.6-1
+pass 1.7.4-5
+patch 2.7.6-10
+pavucontrol 1:5.0+r66+gc330506-1
 pcaudiolib 1.2-2
-pciutils 3.9.0-1
-pcre 8.45-3
-pcre2 10.40-3
-pdfgrep 2.1.2-2
-perl 5.36.0-1
-perl-alien-build 2.72-1
-perl-alien-libxml2 0.19-1
-perl-autovivification 0.18-8
-perl-b-hooks-endofscope 0.26-1
-perl-business-isbn 3.007-1
-perl-business-isbn-data 20210112.006-1
-perl-business-ismn 1.202-1
-perl-business-issn 1.005-1
-perl-capture-tiny 0.48-6
-perl-class-accessor 0.51-2
-perl-class-data-inheritable 0.09-2
-perl-class-inspector 1.36-5
-perl-class-load 0.25-2
-perl-class-singleton 1.6-1
-perl-clone 0.45-4
-perl-data-compare 1.27-2
-perl-data-dump 1.25-3
-perl-data-optlist 0.112-2
-perl-data-uniqid 0.12-10
-perl-datetime 1.59-1
-perl-datetime-calendar-julian 0.107-1
-perl-datetime-format-builder 1:0.83-3
-perl-datetime-format-strptime 1.79-1
-perl-datetime-locale 1.37-1
-perl-datetime-timezone 2.56-1
-perl-devel-stacktrace 2.04-2
-perl-dist-checkconflicts 0.11-8
-perl-encode-locale 1.05-9
-perl-error 0.17029-4
-perl-eval-closure 0.14-8
-perl-exception-class 1.45-2
-perl-exporter-tiny 1.006000-1
-perl-ffi-checklib 0.31-2
-perl-file-chdir 0.1011-4
-perl-file-find-rule 0.34-9
-perl-file-listing 6.15-2
-perl-file-sharedir 1.118-2
-perl-file-sharedir-install 0.14-1
-perl-file-slurp-tiny 0.004-8
-perl-file-slurper 0.013-1
-perl-file-which 1.27-2
-perl-html-parser 3.80-1
-perl-html-tagset 3.20-12
-perl-http-cookies 6.10-3
-perl-http-daemon 6.14-2
-perl-http-date 6.05-5
-perl-http-message 6.44-1
-perl-http-negotiate 6.01-10
-perl-inc-latest 0.500-9
-perl-io-html 1.004-3
-perl-io-socket-ssl 2.077-1
+pciutils 3.12.0-1
+pcmanfm 1.3.2-1
+pcre 8.45-4
+pcre2 10.43-3
+pcsclite 2.1.0-2
+pd 0.54.1-1
+perl 5.38.2-1
+perl-alien-build 2.80-2
+perl-alien-libxml2 0.19-2
+perl-autovivification 0.18-9
+perl-b-hooks-endofscope 0.28-1
+perl-business-isbn 3.009-1
+perl-business-isbn-data 20240206.001-1
+perl-business-ismn 1.204-1
+perl-business-issn 1.005-2
+perl-capture-tiny 0.48-7
+perl-class-accessor 0.51-3
+perl-class-data-inheritable 0.09-4
+perl-class-inspector 1.36-6
+perl-class-load 0.25-3
+perl-class-singleton 1.6-2
+perl-clone 0.46-2
+perl-data-compare 1.29-2
+perl-data-dump 1.25-4
+perl-data-optlist 0.114-2
+perl-data-uniqid 0.12-11
+perl-datetime 1.65-1
+perl-datetime-calendar-julian 0.107-2
+perl-datetime-format-builder 1:0.83-4
+perl-datetime-format-strptime 1.79-2
+perl-datetime-locale 1.41-1
+perl-datetime-timezone 2.62-1
+perl-devel-stacktrace 2.04-3
+perl-dist-checkconflicts 0.11-9
+perl-encode-locale 1.05-11
+perl-error 0.17029-5
+perl-eval-closure 0.14-9
+perl-exception-class 1.45-3
+perl-exporter-tiny 1.006002-2
+perl-ffi-checklib 0.31-3
+perl-file-chdir 0.1011-5
+perl-file-find-rule 0.34-10
+perl-file-listing 6.16-2
+perl-file-sharedir 1.118-3
+perl-file-sharedir-install 0.14-2
+perl-file-slurp-tiny 0.004-9
+perl-file-slurper 0.014-2
+perl-file-which 1.27-3
+perl-html-parser 3.81-2
+perl-html-tagset 3.20-14
+perl-http-cookiejar 0.014-1
+perl-http-cookies 6.11-1
+perl-http-daemon 6.16-2
+perl-http-date 6.06-1
+perl-http-message 6.45-1
+perl-http-negotiate 6.01-12
+perl-io-html 1.004-4
+perl-io-socket-ssl 2.085-1
 perl-io-string 1.08-12
-perl-ipc-run3 0.048-10
-perl-libwww 6.67-1
-perl-lingua-translit 0.28-7
-perl-list-allutils 0.19-1
-perl-list-moreutils 0.430-3
-perl-list-moreutils-xs 0.430-3
-perl-list-someutils 0.58-1
-perl-list-utilsby 0.12-1
-perl-log-log4perl 1.57-1
-perl-lwp-mediatypes 6.04-2
-perl-lwp-protocol-https 6.10-4
-perl-mailtools 2.21-6
-perl-math-round 0.07-4
-perl-mime-charset 1.013.1-1
-perl-module-build 0.4231-7
-perl-module-implementation 0.09-8
-perl-module-runtime 0.016-2
-perl-mozilla-ca 20211001-1
-perl-mro-compat 0.15-1
-perl-namespace-autoclean 0.29-4
-perl-namespace-clean 0.27-8
-perl-net-http 6.22-2
-perl-net-ssleay 1.92-2
-perl-number-compare 0.03-12
-perl-package-deprecationmanager 0.17-8
-perl-package-stash 0.40-2
-perl-package-stash-xs 0.30-1
-perl-params-util 1.102-3
-perl-params-validate 1.31-1
-perl-params-validationcompiler 0.30-5
-perl-parse-recdescent 1.967015-2
-perl-path-tiny 0.142-1
-perl-perlio-utf8-strict 0.009-1
-perl-regexp-common 2017060201-5
-perl-role-tiny 2.002004-3
-perl-sort-key 1.33-11
+perl-ipc-run3 0.049-1
+perl-libwww 6.72-1
+perl-lingua-translit 0.29-2
+perl-list-allutils 0.19-2
+perl-list-moreutils 0.430-4
+perl-list-moreutils-xs 0.430-4
+perl-list-someutils 0.59-2
+perl-list-utilsby 0.12-2
+perl-log-log4perl 1.57-2
+perl-lwp-mediatypes 6.04-4
+perl-lwp-protocol-https 6.11-1
+perl-mailtools 2.21-7
+perl-math-round 0.07-5
+perl-mime-charset 1.013.1-2
+perl-module-implementation 0.09-9
+perl-module-runtime 0.016-3
+perl-mozilla-ca 20231213-1
+perl-mro-compat 0.15-2
+perl-namespace-autoclean 0.29-5
+perl-namespace-clean 0.27-9
+perl-net-http 6.23-2
+perl-net-ssleay 1.92-3
+perl-number-compare 0.03-13
+perl-package-deprecationmanager 0.18-2
+perl-package-stash 0.40-3
+perl-package-stash-xs 0.30-2
+perl-params-util 1.102-4
+perl-params-validate 1.31-2
+perl-params-validationcompiler 0.31-2
+perl-parse-recdescent 1.967015-3
+perl-path-tiny 0.144-2
+perl-perlio-utf8-strict 0.010-2
+perl-regexp-common 2017060201-6
+perl-role-tiny 2.002004-4
+perl-sort-key 1.33-12
 perl-specio 0.48-1
-perl-sub-exporter 0.988-2
-perl-sub-exporter-progressive 0.001013-8
-perl-sub-identify 0.14-10
-perl-sub-install 0.928-8
-perl-sub-name 0.26-4
-perl-test-fatal 0.016-3
-perl-text-bibtex 0.88-1
-perl-text-csv 2.02-1
-perl-text-glob 0.11-9
-perl-text-roman 3.5-9
-perl-tie-cycle 1.225-7
-perl-timedate 2.33-4
-perl-try-tiny 0.31-2
-perl-unicode-linebreak 2019.001-5
-perl-uri 5.17-1
-perl-variable-magic 0.63-1
-perl-www-robotrules 6.02-10
-perl-xml-libxml 2.0208-1
-perl-xml-libxml-simple 1.01-1
-perl-xml-libxslt 2.002000-1
-perl-xml-namespacesupport 1.12-4
+perl-sub-exporter 0.991-1
+perl-sub-exporter-progressive 0.001013-9
+perl-sub-identify 0.14-11
+perl-sub-install 0.928-9
+perl-test-fatal 0.017-2
+perl-text-bibtex 0.89-2
+perl-text-csv 2.04-1
+perl-text-glob 0.11-10
+perl-text-roman 3.5-10
+perl-tie-cycle 1.227-2
+perl-timedate 2.33-5
+perl-try-tiny 0.31-3
+perl-unicode-linebreak 2019.001-6
+perl-uri 5.21-1
+perl-variable-magic 0.64-1
+perl-www-robotrules 6.02-12
+perl-xml-libxml 2.0209-1
+perl-xml-libxml-simple 1.01-2
+perl-xml-libxslt 2.002001-2
+perl-xml-namespacesupport 1.12-5
 perl-xml-sax 1.02-1
-perl-xml-sax-base 1.09-4
-perl-xml-writer 0.900-1
-picom 10.1-1
-pinentry 1.2.1-1
-pipewire 1:0.3.61-1
-pipewire-alsa 1:0.3.61-1
-pipewire-audio 1:0.3.61-1
-pipewire-jack 1:0.3.61-1
-pipewire-pulse 1:0.3.61-1
-pixman 0.42.2-1
-pkgconf 1.8.0-1
+perl-xml-sax-base 1.09-5
+perl-xml-writer 0.900-2
+picom 11.2-1
+pigz 2.8-1
+pinentry 1.3.0-1
+pipewire 1:1.0.5-1
+pipewire-audio 1:1.0.5-1
+pipewire-jack 1:1.0.5-1
+pipewire-pulse 1:1.0.5-1
+pixman 0.43.4-1
+pkgconf 2.1.1-1
+plasma-activities 6.0.4-1
 playerctl 2.4.1-3
-polkit 122-1
-poppler 22.11.0-1
-poppler-data 0.4.11-3
-poppler-glib 22.11.0-1
+polkit 124-2
+polkit-qt5 0.200.0-1
+polkit-qt6 0.200.0-1
+poppler 24.03.0-1
+poppler-data 0.4.12-1
+poppler-glib 24.03.0-1
 popt 1.19-1
-portaudio 1:19.7.0-1
-potrace 1.16-2
-procps-ng 3.3.17-1
-psmisc 23.5-1
-pulsemixer 1.5.1-3
-python 3.10.8-3
-python-appdirs 1.4.4-7
-python-asttokens 2.2.0-1
-python-attrs 22.1.0-1
-python-autocommand 2.2.2-1
-python-backcall 0.2.0-7
-python-cairo 1.22.0-1
-python-cffi 1.15.1-1
-python-cryptography 38.0.3-1
-python-decorator 5.1.1-2
-python-executing 1.2.0-1
-python-gobject 3.42.2-1
-python-inflect 6.0.2-1
-python-jaraco.context 4.2.0-1
-python-jaraco.functools 3.5.2-1
-python-jaraco.text 3.11.0-1
-python-jedi 0.18.1-1
-python-matplotlib-inline 0.1.6-2
-python-more-itertools 9.0.0-1
-python-nspektr 0.4.0-2
-python-ordered-set 4.1.0-1
-python-packaging 21.3-1
-python-parso 1:0.8.3-1
-python-pexpect 4.8.0-6
-python-pickleshare 0.7.5-8
-python-pip 22.3.1-1
-python-ply 3.11-10
-python-prompt_toolkit 3.0.33-1
-python-ptyprocess 0.7.0-4
-python-pure-eval 0.2.2-2
-python-pycparser 2.21-3
-python-pydantic 1.10.2-1
-python-pygments 2.13.0-1
-python-pyparsing 3.0.9-1
-python-setuptools 1:65.6.3-1
-python-six 1.16.0-6
-python-stack-data 0.6.2-1
-python-tomli 2.0.1-1
-python-traitlets 5.6.0-1
-python-trove-classifiers 2022.10.19-1
-python-typing_extensions 4.4.0-1
-python-validate-pyproject 0.10.1-1
-python-wcwidth 0.2.5-6
-python-wheel 0.38.4-1
-qbittorrent 4.5.0-1
-qt5-base 5.15.7+kde+r176-1
-qt5-translations 5.15.7-1
-qt5-x11extras 5.15.7-1
-qt6-base 6.4.1-1
-qt6-svg 6.4.1-1
-qt6-translations 6.4.1-1
-raptor 2.0.15-21
-rasqal 1:0.9.33-5
-rav1e 0.5.1-2
-re2 1:20220601-1
-readline 8.2.001-1
-recode 3.7.12-1
-redland 1:1.0.17-8
+portaudio 1:19.7.0-2
+portmidi 1:2.0.4-1
+potrace 1.16-3
+powertop 2.15-1
+ppp 2.5.0-3
+procps-ng 4.0.4-3
+projectm 3.1.12-4
+protobuf 25.3-3
+prrte 3.0.5-2
+psmisc 23.7-1
+pulseaudio-qt 1.4.0-3
+pystring 1.1.4-1
+python 3.11.8-1
+python-argcomplete 3.1.1-1
+python-asttokens 2.4.1-1
+python-attrs 23.2.0-1
+python-backcall 0.2.0-8
+python-cairo 1.26.0-1
+python-certifi 2024.02.02-1
+python-cffi 1.16.0-1
+python-chardet 5.2.0-1
+python-charset-normalizer 3.3.2-1
+python-cryptography 42.0.5-1
+python-decorator 5.1.1-3
+python-executing 2.0.0-1
+python-gobject 3.48.1-2
+python-idna 3.6-1
+python-jedi 0.19.1-1
+python-matplotlib-inline 0.1.6-4
+python-packaging 23.2-1
+python-parso 1:0.8.4-1
+python-pexpect 4.9.0-1
+python-pickleshare 0.7.5-9
+python-pip 24.0-1
+python-ply 3.11-12
+python-prompt_toolkit 3.0.43-1
+python-ptyprocess 0.7.0-5
+python-pure-eval 0.2.2-3
+python-pycparser 2.22-1
+python-pygments 2.17.2-1
+python-pyparsing 3.1.2-1
+python-requests 2.31.0-1
+python-six 1.16.0-8
+python-stack-data 0.6.3-1
+python-traitlets 5.14.2-1
+python-typing_extensions 4.10.0-1
+python-urllib3 1.26.18-1
+python-wcwidth 0.2.13-1
+python-wheel 0.43.0-1
+qca-qt5 2.3.8-3
+qca-qt6 2.3.8-3
+qpwgraph 0.6.3-1
+qqc2-desktop-style 6.1.0-1
+qqc2-desktop-style5 5.115.0-1
+qrencode 4.1.1-2
+qt5-base 5.15.13+kde+r145-1
+qt5-declarative 5.15.13+kde+r30-1
+qt5-graphicaleffects 5.15.13-1
+qt5-multimedia 5.15.13+kde+r2-1
+qt5-quickcontrols 5.15.13-1
+qt5-quickcontrols2 5.15.13+kde+r5-1
+qt5-speech 5.15.13+kde+r1-1
+qt5-svg 5.15.13+kde+r6-1
+qt5-translations 5.15.13-1
+qt5-wayland 5.15.13+kde+r60-1
+qt5-x11extras 5.15.13-1
+qt6-5compat 6.7.0-1
+qt6-base 6.7.0-2
+qt6-declarative 6.7.0-1
+qt6-multimedia 6.7.0-1
+qt6-multimedia-ffmpeg 6.7.0-1
+qt6-shadertools 6.7.0-1
+qt6-svg 6.7.0-1
+qt6-translations 6.7.0-1
+qt6-wayland 6.7.0-1
+qtractor 0.9.39-3
+quazip-qt5 1.4-1
+racket 8.11.1-1
+raptor 2.0.16-4
+rasqal 1:0.9.33-7
+rav1e 0.7.1-1
+re2 1:20240401-1
+readline 8.2.010-1
+recode 3.7.14-1
+redland 1:1.0.17-9
 rest 0.8.1+r4+ge5ee6ef-1
-rhash 1.4.3-1
-rlwrap 0.46.1-1
-rnnoise 0.4.1-1
-rubberband 3.1.1-1
-run-parts 5.5-1
-rustup 1.25.1-2
+rnnoise 1:0.2-1
+rsync 3.3.0-1
+rtosc 0.3.1-2
+rubberband 3.3.0-1
+run-parts 5.17-1
+rustup 1.27.0-1
 sbc 2.0-1
-sbcl 2.2.11-1
-scons 4.4.0-1
-scrot 1.7-1
-sdl2 2.26.0-1
-sed 4.9-1
-semver 7.3.8-1
-serd 0.30.16-1
-sfsexp 1.4.0-1
-shaderc 2022.1-4
-shadow 4.12.3-2
-shared-mime-info 2.0+155+gf4e7cbc-1
-simplescreenrecorder 0.4.4-1
-slang 2.3.3-1
-slock 1.5-1
-snappy 1.1.9-2
-sord 0.16.14-1
+sbcl 2.4.1-1
+scons 4.7.0-1
+scrot 1.10-2
+sdl12-compat 1.2.68-1
+sdl2 2.30.2-1
+sed 4.9-3
+semver 7.6.0-1
+sequoia-sqv 1.1.0-1
+serd 0.32.2-1
+sfsexp 1.4.1-1
+sg3_utils 1.47-1
+shaderc 2023.8-1
+shadow 4.15.1-2
+shared-mime-info 2.4-1
+slang 2.3.3-2
+smartmontools 7.4-1
+snappy 1.1.10-1
+sndio 1.9.0-1
+solid 6.1.0-2
+solid5 5.115.0-1
+sonnet 6.1.0-1
+sonnet5 5.115.0-1
+sord 0.16.16-1
 sound-theme-freedesktop 0.8-5
-source-highlight 3.1.9-9
+soundtouch 2.3.3-1
+source-highlight 3.1.9-11
+sox 14.4.2+r182+g42b3557e-4
 speex 1.2.1-1
 speexdsp 1.2.1-1
-spirv-tools 2022.1-1
-spotify 1:1.1.84.716-2
-sqlite 3.40.0-1
-sratom 0.6.14-1
-srt 1.5.1-3
-stow 2.3.1-3
-sudo 1.9.12.p1-1
-svt-av1 1.3.0-1
-sxhkd 0.6.2-2
+spirv-tools 2023.6-1
+spotify-launcher 0.5.4-1
+sqlite 3.45.3-1
+sratom 0.6.16-1
+srt 1.5.3-1
+stb r2173.ae721c5-1
+steam 1.0.0.79-1
+stk 5.0.1-3
+stow 2.4.0-1
+strace 6.8-1
+sudo 1.9.15.p5-1
+svt-av1 2.0.0-1
+swig 4.2.1-1
+sxhkd 0.6.2-3
 sysfsutils 2.1.1-1
-systemd 252.2-2
-systemd-libs 252.2-2
-systemd-sysvcompat 252.2-2
+systemd 255.4-2
+systemd-libs 255.4-2
+systemd-sysvcompat 255.4-2
 t1lib 5.1.2-8
-talloc 2.3.4-1
-tar 1.34-1
-tbb 2021.5.0-2
-tdb 1.4.7-1
-teams 1.5.00.10453-1
-texinfo 7.0-1
-texlive-bibtexextra 2022.63023-1
-texlive-bin 2022.62885-3
-texlive-core 2022.63035-1
-texlive-formatsextra 2022.62529-1
-texlive-langchinese 2022.62922-1
-texlive-langcyrillic 2022.62517-1
-texlive-langextra 2022.62837-1
-texlive-langgreek 2022.61820-1
-texlive-langjapanese 2022.63011-1
-texlive-langkorean 2022.63005-1
-texlive-latexextra 2022.63034-1
-texlive-music 2022.62533-1
-texlive-pictures 2022.62992-1
-texlive-publishers 2022.63013-1
-texlive-science 2022.62977-1
-tlp 1.5.0-5
-tmux 3.3_a-2
-tpm2-tss 3.2.0-3
-tracker3 3.4.1-1
-tree 2.0.4-1
-tree-sitter 0.20.7-1
-tslib 1.22-1
-ttf-dejavu 2.37+18+g9b5d1b2f-3
+taglib 2.0.1-1
+talloc 2.4.2-1
+tar 1.35-2
+tcl 8.6.14-3
+tdb 1.4.10-2
+tesseract 5.3.4-1
+tesseract-data-afr 2:4.1.0-4
+tesseract-data-osd 2:4.1.0-4
+texinfo 7.1-2
+texlive-basic 2024.2-1
+texlive-bibtexextra 2024.2-1
+texlive-bin 2024.2-1
+texlive-binextra 2024.2-1
+texlive-fontsextra 2024.2-1
+texlive-fontsrecommended 2024.2-1
+texlive-formatsextra 2024.2-1
+texlive-latex 2024.2-1
+texlive-latexextra 2024.2-1
+texlive-latexrecommended 2024.2-1
+texlive-mathscience 2024.2-1
+texlive-pictures 2024.2-1
+texlive-plaingeneric 2024.2-1
+texlive-publishers 2024.2-1
+thin-provisioning-tools 1.0.12-1
+throttled 0.10.0-2
+tinycompress 1.2.11-1
+tinyxml 2.6.2-10
+tk 8.6.14-2
+tlp 1.6.1-1
+tmux 3.4-6
+tpm2-tss 4.0.1-1
+tracker3 3.7.1-2
+tree 2.1.1-1
+tree-sitter 0.22.5-1
+tree-sitter-bash 0.21.0-2
+tree-sitter-c 0.21.0-2
+tree-sitter-lua 0.1.0-2
+tree-sitter-markdown 0.2.3-2
+tree-sitter-python 0.21.0-2
+tree-sitter-query 0.2.1-2
+tree-sitter-vimdoc 2.5.1-2
+tslib 1.23-1
+ttf-dejavu 2.37+18+g9b5d1b2f-7
 ttf-fira-code 6.2-2
-ttf-hack 3.003-3
+ttf-hack 3.003-6
+ttf-ibm-plex 6.4.0-1
 ttf-indic-otf 0.2-11
+ttf-joypixels 8.0.0-1
 ttf-liberation 2.1.5-1
-tzdata 2022g-1
-uchardet 0.0.7-1
-ungoogled-chromium-bin 106.0.5249.119-2
-ungoogled-chromium-debug 105.0.5195.125-1
-unibilium 2.1.1-1
-unzip 6.0-19
-upower 1.90.0-1
-usbmuxd 1.1.1-1
-usbutils 015-1
-util-linux 2.38.1-1
-util-linux-libs 2.38.1-1
-v4l-utils 1.22.1-1
-valgrind 3.19.0-5
+ttf-roboto 2.138-4
+ttf-sourcecodepro-nerd 3.2.1-1
+turbostat 6.7-2
+tzdata 2024a-1
+uchardet 0.0.8-2
+udisks2 2.10.1-4
+unibilium 2.1.1-2
+unzip 6.0-20
+upower 1.90.4-1
+usbmuxd 1.1.1-3
+usbutils 017-1
+util-linux 2.40-2
+util-linux-libs 2.40-2
+v4l-utils 1.26.1-1
+valgrind 3.22.0-3
+vapoursynth R66-1
 vi 1:070224-6
-vid.stab 1.1-3
-vim 9.0.0910-1
-vim-runtime 9.0.0910-1
-vmaf 2.3.1-1
-vulkan-headers 1:1.3.235-1
-vulkan-icd-loader 1.3.235-1
-wayland 1.21.0-1
-webkit2gtk 2.38.2-1
-webrtc-audio-processing 0.3.1-3
-wget 1.21.3-1
-which 2.21-5
-wireplumber 0.4.12-2
+vid.stab 1.1.1-1
+vmaf 3.0.0-1
+volume_key 0.3.12-8
+vulkan-headers 1:1.3.279-1
+vulkan-icd-loader 1.3.279-1
+wayland 1.22.0-1
+wayland-protocols 1.34-1
+webkit2gtk 2.44.1-1
+webrtc-audio-processing 0.3.1-4
+webrtc-audio-processing-1 1.3-2
+wget 1.24.5-1
+which 2.21-6
+whois 5.5.22-1
+wireplumber 0.5.1-2
+woff-fira-code 6.2-2
 woff2 1.0.2-4
-wpa_supplicant 2:2.10-7
-wpebackend-fdo 1.14.0-1
-x264 3:0.164.r3095.baee400-4
+wpa_supplicant 2:2.10-8
+wpebackend-fdo 1.14.2-1
+x264 3:0.164.r3108.31e19f9-1
 x265 3.5-3
-xapian-core 1:1.4.21-1
+xapian-core 1:1.4.25-1
 xboxdrv 0.8.8-7
-xcb-proto 1.15.2-2
-xcb-util 0.4.0-4
-xcb-util-cursor 0.1.4-1
+xcb-proto 1.17.0-1
+xcb-util 0.4.1-1
+xcb-util-cursor 0.1.5-1
 xcb-util-image 0.4.1-2
 xcb-util-keysyms 0.4.1-4
 xcb-util-renderutil 0.3.10-1
 xcb-util-wm 0.4.2-1
 xcb-util-xrm 1.3-2
-xclip 0.13-3
-xdg-dbus-proxy 0.1.4-1
-xdg-utils 1.1.3+25+g8ae0263-1
-xdotool 3.20211022.1-1
-xf86-input-libinput 1.2.1-1
-xf86-video-intel 1:2.99.917+916+g31486f40-2
-xkeyboard-config 2.37-1
-xmlsec 1.2.37-1
-xorg-fonts-encodings 1.0.6-1
-xorg-server 21.1.4-1
-xorg-server-common 21.1.4-1
-xorg-setxkbmap 1.3.3-1
-xorg-xauth 1.1.2-1
-xorg-xev 1.2.5-1
-xorg-xinit 1.4.1-3
-xorg-xinput 1.6.3-3
-xorg-xkbcomp 1.4.5-1
-xorg-xmessage 1.0.6-1
+xclip 0.13-4
+xdg-dbus-proxy 0.1.5-1
+xdg-user-dirs 0.18-1
+xdg-utils 1.2.1-1
+xf86-input-libinput 1.4.0-1
+xf86-video-intel 1:2.99.917+923+gb74b67f0-2
+xkeyboard-config 2.41-1
+xmlsec 1.3.4-1
+xorg-fonts-encodings 1.1.0-1
+xorg-server 21.1.13-1
+xorg-server-common 21.1.13-1
+xorg-setxkbmap 1.3.4-1
+xorg-util-macros 1.20.1-1
+xorg-xauth 1.1.3-1
+xorg-xbacklight 1.2.3-3
+xorg-xev 1.2.6-1
+xorg-xinit 1.4.2-1
+xorg-xinput 1.6.4-1
+xorg-xkbcomp 1.4.7-1
+xorg-xmessage 1.0.7-1
 xorg-xmodmap 1.0.11-1
-xorg-xprop 1.2.5-1
-xorg-xrandr 1.5.1-2
-xorg-xrdb 1.2.1-1
-xorg-xset 1.2.4-3
-xorg-xwininfo 1.1.5-3
-xorgproto 2022.2-1
-xournalpp 1.1.3-1
+xorg-xprop 1.2.7-1
+xorg-xrandr 1.5.2-1
+xorg-xrdb 1.2.2-1
+xorg-xset 1.2.5-1
+xorg-xsetroot 1.1.3-1
+xorg-xwininfo 1.1.6-1
+xorgproto 2024.1-2
+xournalpp 1.2.2-1
 xss-lock 0.3.0.g1e158fb20108-4
+xtrlock 2.15-1
 xvidcore 1.3.7-2
-xz 5.2.8-1
-youtube-dl 2021.12.17-1
-zathura 0.5.1-1
-zathura-djvu 0.2.9-1
-zathura-pdf-poppler 0.3.0-1
-zeromq 4.3.4-2
-zimg 3.0.4-1
-zita-convolver 4.0.3-2
-zlib 1:1.2.13-2
-zsh 5.9-1
-zsh-autosuggestions 0.7.0-1
-zsh-history-substring-search 1.0.2-1
-zsh-syntax-highlighting 0.7.1-1
-zstd 1.5.2-7
-zziplib 0.13.72-1
+xxhash 0.8.2-1
+xz 5.6.1-3
+yaml-cpp 0.8.0-1
+yay 12.3.5-1
+yay-debug 12.3.5-1
+yt-dlp 2024.04.09-1
+zathura 0.5.5-2
+zathura-djvu 0.2.9-6
+zathura-pdf-mupdf 0.4.1-19
+zenity 4.0.1-1
+zeromq 4.3.5-2
+zimg 3.0.5-1
+zita-convolver 4.0.3-3
+zix 0.4.2-2
+zlib 1:1.3.1-1
+zsh 5.9-5
+zsh-autosuggestions 0.7.0-2
+zsh-completions 0.35.0-1
+zsh-history-substring-search 1.1.0-1
+zsh-syntax-highlighting 0.8.0-1
+zstd 1.5.5-1
+zxing-cpp 2.2.1-1
+zynaddsubfx 3.0.6-6
+zziplib 0.13.74-1
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 78507c4..874b972 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -5,7 +5,6 @@ set -g default-command /usr/bin/zsh
 set-option -g prefix C-a
 set-window-option -g mode-keys vi
 
-set -goq @themepack-status-right-area-right-format "localhost"
 set -g @themepack 'powerline/double/blue'
 
 bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-h) || tmux select-pane -L"