diff --git a/README.md b/README.md
index 83f4489..159ac88 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@
   - **Terminal**: [alacritty](https://github.com/alacritty/alacritty), [foot](https://codeberg.org/dnkl/foot)
   - **File manager:** [ranger](https://github.com/ranger/ranger), [vifm](https://github.com/vifm/vifm)
   - **Web browser:** [qutebrowser](https://github.com/qutebrowser/qutebrowser)
-  - **Image viewer:** [feh](https://github.com/derf/feh), [imv](https://github.com/eXeC64/imv)
+  - **Image viewer:** [feh](https://github.com/derf/feh), [imv](https://github.com/eXeC64/imv) / [pqiv](https://github.com/phillipberndt/pqiv)
   - **Wayland wallpaper setter:** [swaybg](https://github.com/swaywm/swaybg) / [oguri](https://github.com/vilhalmer/oguri) / [mpvpaper](https://github.com/GhostNaN/mpvpaper)
   - **Video player:** [mpv](https://github.com/mpv-player/mpv)
   - **Book viewer:** [zathura](https://git.pwmt.org/pwmt/zathura.git)
diff --git a/deploy.sh b/deploy.sh
index c005f6a..118f21b 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -56,7 +56,8 @@ case ${server} in
     cp -rfv ./home/.config/swaylock/      ~/.config/swaylock/
     cp -rfv ./home/.config/waybar/        ~/.config/waybar/
     cp -rfv ./home/.config/wofi/          ~/.config/wofi/
-    cp -rfv ./home/.config/imv/           ~/.config/imv/
+    # cp -rfv ./home/.config/imv/           ~/.config/imv/
+    cp -rfv ./home/.config/pqivrc         ~/.config/pqivrc
     cp -rfv ./home/.config/wayfire.ini    ~/.config/wayfire.ini
     ;;
   x11)
diff --git a/home/.config/doom/exwm.el b/home/.config/doom/exwm.el
index 8ac16a0..2dbd3f2 100644
--- a/home/.config/doom/exwm.el
+++ b/home/.config/doom/exwm.el
@@ -169,7 +169,7 @@
 
 ;; xbps but with Emacs
 ;;(use-package! system-packages
-;;  :after exwm
+;;  :defer t
 ;;  :config
 ;;  (setq system-packages-use-sudo t))
 
@@ -180,7 +180,6 @@
 ;; playerctl status on modeline
 ;; (use-package! doom-modeline-now-playing
 ;;   :after doom-modeline
-;;   :defer t
 ;;   :config
 ;;   (doom-modeline-now-playing-timer)
 ;;   ;; Enable almost everywhere
@@ -215,65 +214,42 @@
 ;;     '(bar window-number matches git-timemachine buffer-position word-count parrot selection-info now-playing)
 ;;     '(misc-info minor-modes indent-info buffer-encoding major-mode)))
 
-;; Mapping for built-in mpc-mode
-(map! :leader :desc "music" "e" nil
-      :leader "e RET" #'mpc-play-at-point
-      :leader "e v" #'mpc-select-toggle
-      :leader "e >" #'mpc-next
-      :leader "e <" #'mpc-prev
-      :leader "e f" #'mpc-seek-current
-      :leader "e p" #'mpc-pause
-      :leader "e q" #'mpc-quit
-      :leader "e s" #'mpc-toggle-play
-      :leader "e c" #'mpc-toggle-consume
-      :leader "e 1" #'mpc-toggle-single
-      :leader "e r" #'mpc-toggle-repeat
-      :leader "e z" #'mpc-toggle-shuffle
-      :leader "e l" #'mpc-playlist-add)
-
 ;; EMMS
-;; (use-package! emms
-;;  :after exwm
-;;  :defer t
-;;  :init
-;;  (setq emms-seek-seconds 10)
-;;  :config
-;;  (require 'emms-setup)
-;;  (emms-all)
-;;  (emms-default-players)
-;;  ;; Play music with emms directly
-;;  (setq emms-source-file-default-directory "~/Music/"
-;;        emms-info-asynchronously 1
-;;        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)
-;;  ;; Use mpd backend
-;;  ;;(require 'emms-player-mpd)
-;;  ;;(setq emms-player-mpd-server-name "localhost"
-;;  ;;      emms-player-mpd-server-port "6600"
-;;  ;;      emms-player-mpd-music-directory "~/Music")
-;;  ;;(add-to-list 'emms-player-list 'emms-player-mpd)
-;;  (add-to-list 'emms-info-functions
-;;               ;;'emms-info-mpd
-;;               'emms-info-exiftool)
-;;  (map! :leader "e a" #'emms-playlist-mode-go
-;;        :leader "e b" #'emms-browse-by-album
-;;        :leader "e x" #'emms-pause
-;;        :leader "e g" #'emms-stop
-;;        :leader "e j" #'emms-previous
-;;        :leader "e k" #'emms-next))
-;; Truncate emms module on mode line
+(use-package! emms
+ :defer t
+ :init
+ (setq emms-seek-seconds 10)
+ :config
+ (emms-playing-time -1)
+ (emms-mode-line -1)
+ ;; Play music with emms directly
+ (setq emms-source-file-default-directory "~/Music/"
+       emms-info-asynchronously 1
+       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)
+ ;; Use mpd backend
+ (setq emms-player-mpd-server-name "localhost"
+       emms-player-mpd-server-port "6600"
+       emms-player-mpd-music-directory "~/Music/")
+ (add-to-list 'emms-player-list 'emms-player-mpd)
+ (add-to-list 'emms-info-functions
+              'emms-info-mpd
+              'emms-info-exiftool)
+ (map! :map emms-playlist-mode-map
+       :localleader
+       "d" #'emms-insert-directory))
+(use-package! ivy-emms
+ :after emms
+ :config
+ (setq ivy-emms-default-action #'ivy-emms-play-next)
+ (setq ivy-emms-default-multi-action #'ivy-emms-play-next-multi))
 ;;(use-package! emms-mode-line-cycle
 ;;  :after emms
 ;;  :config
 ;;  (emms-playing-time 1)
 ;;  (emms-mode-line 1)
 ;;  (emms-mode-line-cycle 1))
-;;(use-package! ivy-emms
-;;  :after emms
-;;  :config
-;;  (setq ivy-emms-default-action #'ivy-emms-play-next)
-;;  (setq ivy-emms-default-multi-action #'ivy-emms-play-next-multi))
 
 ;; Duck the web with ivy
 (use-package! counsel-web
diff --git a/home/.config/doom/init.el b/home/.config/doom/init.el
index 55add51..55d4372 100644
--- a/home/.config/doom/init.el
+++ b/home/.config/doom/init.el
@@ -213,6 +213,7 @@
 
        :app
        calendar
+       emms
        ;;everywhere        ; *leave* Emacs!? You must be joking
        irc               ; how neckbeards socialize
        (rss +org)        ; emacs as an RSS reader
diff --git a/home/.config/doom/packages.el b/home/.config/doom/packages.el
index 5ff67e3..8263c5e 100644
--- a/home/.config/doom/packages.el
+++ b/home/.config/doom/packages.el
@@ -64,12 +64,11 @@
 (package! all-the-icons-ivy-rich)
 (package! nerd-fonts
   :recipe (:host github :repo "FollieHiyuki/nerd-fonts.el"))
+(package! ivy-emms)
 ;;(package! 2048-game)
 ;;(package! org-ql)
 ;;(package! org-wild-notifier)
 ;;(package! system-packages)
-;;(package! emms)
-;;(package! ivy-emms)
 ;;(package! emms-mode-line-cycle)
 ;;(package! doom-modeline-now-playing)
 ;;(package! edwina)
diff --git a/home/.config/pqivrc b/home/.config/pqivrc
new file mode 100644
index 0000000..624adf5
--- /dev/null
+++ b/home/.config/pqivrc
@@ -0,0 +1,13 @@
+[options]
+hide-info-box=1
+scale-images-up=1
+
+[keybindings]
+; Remove keybindings for +
+<plus> { nop() }
+<Control><plus> { nop() }
+<Alt><plus> { nop() }
+; Use = instead
+<equal> { set_scale_level_relative(1.1) }
+<Control><equal> { set_slideshow_interval_relative(1) }
+<Alt><equal> { animation_set_speed_relative(1.1) }
diff --git a/home/.config/vifm/vifmrc b/home/.config/vifm/vifmrc
index 2580fb0..a9496e1 100644
--- a/home/.config/vifm/vifmrc
+++ b/home/.config/vifm/vifmrc
@@ -220,6 +220,7 @@ filetype *.[1-8] man ./%c
 
 " Images
 filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm
+        \ pqiv %f &,
         \ imv %f &,
         \ feh %f &
 filextype *.svg