diff --git a/README.md b/README.md
index 7522272..948580a 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@
   - **Shell:** [fish](https://github.com/fish-shell/fish-shell)
   - **Shell prompt:** [starship](https://starship.rs/)
   - **Anime/Manga/Wallpaper:** [gallery-dl](https://github.com/mikf/gallery-dl) / [mangadl-bash](https://github.com/Akianonymus/mangadl-bash), [anime-downloader](https://github.com/anime-dl/anime-downloader) + [trackma](https://github.com/z411/trackma) + [adl](https://github.com/RaitaroH/adl) / [anigrab](https://github.com/ngomile/anigrab)
-  - **CLI/TUI tools for the Internet:** [translate-shell](https://github.com/soimort/translate-shell), [ddgr](https://github.com/jarun/ddgr), [howdoi](https://github.com/gleitz/howdoi), [tuxi](https://github.com/Bugswriter/tuxi), [amfora](https://github.com/makeworld-the-better-one/amfora), [cointop](https://github.com/miguelmota/cointop), [newsboat](https://github.com/newsboat/newsboat), [youtube-dl](https://github.com/ytdl-org/youtube-dl) + [ytmdl](https://github.com/deepjyoti30/ytmdl), [github-cli](https://github.com/cli/cli), [pup](https://github.com/ericchiang/pup), [tmpsms](https://github.com/sdushantha/tmpsms), [tmpmail](https://github.com/sdushantha/tmpmail), [weechat](https://github.com/weechat/weechat), [curl](https://curl.haxx.se) / [wget](https://www.gnu.org/software/wget/wget.html) / [aria2](https://github.com/aria2/aria2), [tremc](https://github.com/tremc/tremc) + [transmission](https://github.com/transmission/transmission) / [rtorrent](https://github.com/rakshasa/rtorrent)
+  - **CLI/TUI tools for the Internet:** [translate-shell](https://github.com/soimort/translate-shell), [ddgr](https://github.com/jarun/ddgr), [howdoi](https://github.com/gleitz/howdoi), [tuxi](https://github.com/Bugswriter/tuxi), [amfora](https://github.com/makeworld-the-better-one/amfora), [cointop](https://github.com/miguelmota/cointop), [newsboat](https://github.com/newsboat/newsboat), [youtube-dl](https://github.com/ytdl-org/youtube-dl) + [ytmdl](https://github.com/deepjyoti30/ytmdl), [github-cli](https://github.com/cli/cli), [pup](https://github.com/ericchiang/pup), [tmpsms](https://github.com/sdushantha/tmpsms), [tmpmail](https://github.com/sdushantha/tmpmail), [weechat](https://github.com/weechat/weechat), [curl](https://curl.haxx.se) / [wget](https://www.gnu.org/software/wget/wget.html) / [aria2](https://github.com/aria2/aria2), [tremc](https://github.com/tremc/tremc) + [transmission](https://github.com/transmission/transmission) / [rtorrent](https://github.com/rakshasa/rtorrent), [goaccess](https://github.com/allinurl/goaccess)
   - **CLI/TUI tools for other things:** [farge](https://github.com/sdushantha/farge), [tt](https://github.com/runrin/tt), [forgit](https://github.com/wfxr/forgit), [borg](https://github.com/borgbackup/borg), [wendy](https://git.z3bra.org/wendy/log.html), [tokei](https://github.com/XAMPPRocky/tokei), [onefetch](https://github.com/o2sh/onefetch), [calcurse](https://github.com/lfos/calcurse), [qalculate](https://github.com/Qalculate/libqalculate), [fzf](https://github.com/junegunn/fzf), [fd](https://github.com/sharkdp/fd), [ripgrep](https://github.com/BurntSushi/ripgrep), [atool](http://www.nongnu.org/atool/), [rsync](https://rsync.samba.org/), [bottom](https://github.com/clementtsang/bottom), [hyperfine](https://github.com/sharkdp/hyperfine), [delta](https://github.com/dandavison/delta), [bat](https://github.com/sharkdp/bat), [glow](https://github.com/charmbracelet/glow) / [mdcat](https://github.com/lunaryorn/mdcat) / [mdr](https://github.com/MichaelMure/mdr), [exa](https://github.com/ogham/exa), [pandoc](https://github.com/jgm/pandoc), [csview](https://github.com/wfxr/csview), [libsixel](https://github.com/saitoha/libsixel), [buku](https://github.com/jarun/buku), [jq](https://github.com/stedolan/jq), sysstat, psmisc, wireless_tools, tree
 
 > `Emacs` deserves its own set of dependencies listed, but I'm lazy. Check Doom config for details
diff --git a/home/.config/doom/config.el b/home/.config/doom/config.el
index 4a3e447..354e478 100644
--- a/home/.config/doom/config.el
+++ b/home/.config/doom/config.el
@@ -75,7 +75,15 @@
   (setq projectile-project-search-path '("~/Code/")
         projectile-auto-discover nil))
 
-;; Counsel
+;; Ivy / Counsel
+(after! ivy
+  (use-package! all-the-icons-ivy-rich
+    :defer-incrementally counsel-projectile
+    :init (all-the-icons-ivy-rich-mode 1)
+    :config
+    (setq all-the-icons-ivy-rich-icon-size 1.0))
+  (use-package! ivy-rich
+    :defer-incrementally all-the-icons-ivy-rich))
 (after! counsel
   (setq counsel-linux-app-format-function #'counsel-linux-app-format-function-name-only))
 (map! "C-M-j" 'counsel-switch-buffer)
@@ -85,8 +93,8 @@
 ;; Completion + lsp
 (after! company
   (setq company-idle-delay 0.5
-        company-minimum-prefix-length 2)
-  (setq company-show-numbers nil))
+        company-minimum-prefix-length 2
+        company-show-numbers nil))
 (setq lsp-clients-clangd-args '("-j=2"
                                 "--background-index"
                                 "--clang-tidy"
@@ -113,7 +121,7 @@
 
 ;; Asynchronous bytecode compilation
 (use-package! async
-  :defer t
+  :defer-incrementally t
   :init
   (dired-async-mode 1)
   (async-bytecomp-package-mode 1)
diff --git a/home/.config/doom/exwm.el b/home/.config/doom/exwm.el
index 9f54da7..ca398c2 100644
--- a/home/.config/doom/exwm.el
+++ b/home/.config/doom/exwm.el
@@ -113,17 +113,26 @@
         ;; Reset to line-mode (C-c C-k switches to char-mode via exwm-input-release-keyboard)
         ([?\s-r] . exwm-reset)
 
-        ;; Move between windows with arrow keys
+        ;; Move between windows
         ([s-left] . windmove-left)
         ([s-right] . windmove-right)
         ([s-up] . windmove-up)
         ([s-down] . windmove-down)
-        ;; or with vim keys
         ([?\s-h] . windmove-left)
         ([?\s-l] . windmove-right)
         ([?\s-k] . windmove-up)
         ([?\s-j] . windmove-down)
 
+        ;; Swap window position
+        ([s-S-left] . windmove-swap-states-left)
+        ([s-S-right] . windmove-swap-states-right)
+        ([s-S-up] . windmove-swap-states-up)
+        ([s-S-down] . windmove-swap-states-down)
+        ([?\s-H] . windmove-swap-states-left)
+        ([?\s-L] . windmove-swap-states-right)
+        ([?\s-K] . windmove-swap-states-up)
+        ([?\s-J] . windmove-swap-states-down)
+
         ;; Launch applications via shell command
         ([?\s-&] . (lambda (command)
                 (interactive (list (read-shell-command "$ ")))
@@ -140,6 +149,8 @@
                         (interactive)
                         (exwm-workspace-switch-create ,i))))
                 (number-sequence 0 9))))
+  ;; Additional bindings for convenience
+  (exwm-input-set-key (kbd "s-s") 'eshell)
   (exwm-input-set-key (kbd "s-SPC") 'counsel-linux-app)
   (exwm-input-set-key (kbd "s-t") 'exwm-floating-toggle-floating)
   (exwm-input-set-key (kbd "s-f") 'exwm-layout-toggle-fullscreen)
@@ -166,8 +177,37 @@
 (setq rmh-elfeed-org-files (list (expand-file-name "elfeed.org" doom-private-dir)))
 ;;(add-hook! 'elfeed-search-mode-hook 'elfeed-update)
 
+;; Mapping for built-in mpc-mode
+(map! :leader :desc "music" "e" nil
+      :leader :desc "MPC play track"
+      "e RET" #'mpc-play-at-point
+      :leader :desc "MPC select track"
+      "e v" #'mpc-select-toggle
+      :leader :desc "MPC next track"
+      "e >" #'mpc-next
+      :leader :desc "MPC previous track"
+      "e <" #'mpc-prev
+      :leader :desc "MPC seek within current track"
+      "e f" #'mpc-seek-current
+      :leader :desc "MPC pause track"
+      "e p" #'mpc-pause
+      :leader :desc "MPC quit"
+      "e q" #'mpc-quit
+      :leader :desc "MPC toggle playing"
+      "e s" #'mpc-toggle-play
+      :leader :desc "MPC toggle consume"
+      "e c" #'mpc-toggle-consume
+      :leader :desc "MPC toggle single"
+      "e 1" #'mpc-toggle-single
+      :leader :desc "MPC toggle repeat"
+      "e r" #'mpc-toggle-repeat
+      :leader :desc "MPC toggle shuffle"
+      "e z" #'mpc-toggle-shuffle
+      :leader :desc "MPC show playlist"
+      "e l" #'mpc-playlist)
+
 ;; EMMS
-;;(use-package! emms
+;; (use-package! emms
 ;;  :init
 ;;  (setq emms-seek-seconds 10)
 ;;  :config
@@ -180,7 +220,7 @@
 ;;        emms-playlist-buffer-name "*EMMS-Music*"
 ;;        emms-source-file-directory-tree-function 'emms-source-file-directory-tree-find
 ;;        emms-browser-covers 'emms-browser-cache-thumbnail-async)
-;;  ;; Or use mpd backend
+;;  ;; Use mpd backend
 ;;  ;;(require 'emms-player-mpd)
 ;;  ;;(setq emms-player-mpd-server-name "localhost"
 ;;  ;;      emms-player-mpd-server-port "6600"
@@ -188,26 +228,19 @@
 ;;  ;;(add-to-list 'emms-player-list 'emms-player-mpd)
 ;;  (add-to-list 'emms-info-functions
 ;;               ;;'emms-info-mpd
-;;               'emms-info-exiftool))
-;; Key maps for emms
-;;(map! :leader
-;;      :desc "Emms playlist"
-;;      "e a" #'emms-playlist-mode-go
-;;      :leader
-;;      :desc "Emms browse by album"
-;;      "e b" #'emms-browse-by-album
-;;      :leader
-;;      :desc "Emms pause track"
-;;      "e x" #'emms-pause
-;;      :leader
-;;      :desc "Emms stop track"
-;;      "e s" #'emms-stop
-;;      :leader
-;;      :desc "Emms previous track"
-;;      "e p" #'emms-previous
-;;      :leader
-;;      :desc "Emms next track"
-;;      "e n" #'emms-next)
+;;               'emms-info-exiftool)
+;;  (map! :leader :desc "EMMS playlist"
+;;        "e a" #'emms-playlist-mode-go
+;;        :leader :desc "EMMS browse by album"
+;;        "e b" #'emms-browse-by-album
+;;        :leader :desc "EMMS pause track"
+;;        "e x" #'emms-pause
+;;        :leader :desc "EMMS stop track"
+;;        "e g" #'emms-stop
+;;        :leader :desc "EMMS previous track"
+;;        "e j" #'emms-previous
+;;        :leader :desc "EMMS next track"
+;;        "e k" #'emms-next))
 ;; Truncate emms module on mode line
 ;;(use-package! emms-mode-line-cycle
 ;;  :after emms
@@ -229,7 +262,7 @@
   (setq counsel-web-search-action #'browse-url)
   (setq counsel-web-search-alternate-action #'browse-url-firefox)
   (setq counsel-web-search-dynamic-update nil)
-  (exwm-input-set-key (kbd "s-s") #'counsel-web-search))
+  (exwm-input-set-key (kbd "s-d") #'counsel-web-search))
 
 ;; Function keys
 (use-package! desktop-environment
diff --git a/home/.config/doom/init.el b/home/.config/doom/init.el
index dcc0829..189b507 100644
--- a/home/.config/doom/init.el
+++ b/home/.config/doom/init.el
@@ -55,7 +55,7 @@
        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
+       vi-tilde-fringe   ; fringe tildes to mark beyond EOB
        (window-select    ; visually switch windows
         +numbers)
        workspaces        ; tab emulation, persistence & separate workspaces
@@ -206,6 +206,7 @@
 
        :app
        calendar
+       ;;everywhere        ; *leave* Emacs!? You must be joking
        irc               ; how neckbeards socialize
        (rss +org)        ; emacs as an RSS reader
        ;;twitter           ; twitter client https://twitter.com/vnought
diff --git a/home/.config/doom/packages.el b/home/.config/doom/packages.el
index 82aa7c7..601926e 100644
--- a/home/.config/doom/packages.el
+++ b/home/.config/doom/packages.el
@@ -61,9 +61,10 @@
 ;;(package! ivy-emms)
 ;;(package! org-roam)
 
-;; Syntax
+;; Additional modes
 (package! vimrc-mode)
+;; (package! mixed-pitch)
 
 ;; Improvements
 (package! magit-delta)
-;; (package! mixed-pitch)
+(package! all-the-icons-ivy-rich)
diff --git a/home/.config/luakit/theme.lua b/home/.config/luakit/theme.lua
index f1ab4d8..46fa0c9 100644
--- a/home/.config/luakit/theme.lua
+++ b/home/.config/luakit/theme.lua
@@ -115,6 +115,10 @@ theme.ok    = { fg = base05, bg = base00 }
 theme.warn  = { fg = base00, bg = base0E }
 theme.error = { fg = base08, bg = base00 }
 
+-- Gopher sites
+theme.gopher_light = { bg = base06, fg = base00, link = base0D }
+theme.gopher_dark = { bg = base00, fg = base06, link = base0A }
+
 -- Font
 theme.font      = "13pt Sarasa Fixed J"
 theme.hint_font = "12pt Sarasa Fixed J"
@@ -238,6 +242,10 @@ return theme
 -- theme.warn  = { fg = base00, bg = base0E }
 -- theme.error = { fg = base08, bg = base00 }
 
+-- -- Gopher sites
+-- theme.gopher_light = { bg = base06, fg = base00, link = base0D }
+-- theme.gopher_dark = { bg = base00, fg = base06, link = base0A }
+
 -- -- Font
 -- theme.font      = "13pt Sarasa Fixed J"
 -- theme.hint_font = "12pt Sarasa Fixed J"
diff --git a/home/.config/luakit/userconf.lua b/home/.config/luakit/userconf.lua
index 2ca4078..6468703 100644
--- a/home/.config/luakit/userconf.lua
+++ b/home/.config/luakit/userconf.lua
@@ -1,12 +1,13 @@
 -- Settings
 local settings = require "settings"
 
-settings.window.home_page = "file:///home/follie/Code/Startpage/index.html"
+settings.application.prefer_dark_mode = true
 settings.completion.history.order = "title"
 settings.webview.default_charset = "utf-8"
 settings.webview.enable_caret_browsing = true
 settings.webview.enable_developer_extras = true
 settings.webview.user_agent = "Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0"
+settings.window.home_page = "file:///home/follie/Code/Startpage/index.html"
 
 local engines = settings.window.search_engines
 engines.duckduckgo = "https://www.duckduckgo.com/?q=%s"
@@ -63,3 +64,6 @@ modes.add_binds("normal", {{
         w.view:stop()
     end
 }})
+
+-- Gopher requires luasocket
+-- local gopher = require "gopher"