diff --git a/Xresources/.xinitrc b/Xresources/.xinitrc
index cebe491..aa6084f 100644
--- a/Xresources/.xinitrc
+++ b/Xresources/.xinitrc
@@ -40,6 +40,7 @@ xinput set-prop "SteelSeries SteelSeries Rival 300S Gaming Mouse" "Coordinate Tr
 xinput set-prop "SteelSeries SteelSeries Rival 300S Gaming Mouse" "libinput Accel Profile Enabled" 0, 1
 
 picom --experimental-backends --backend glx &
+xbanish &
 mpd &
 keepassxc &
 redshift &
diff --git a/beets/.config/beets/config.yaml b/beets/.config/beets/config.yaml
index eb31a42..d099d32 100644
--- a/beets/.config/beets/config.yaml
+++ b/beets/.config/beets/config.yaml
@@ -1,9 +1,12 @@
-plugins: chroma fromfilename acousticbrainz ftintitle mbsync scrub fish duplicates bpm discogs badfiles fetchart
+plugins: chroma fromfilename acousticbrainz ftintitle mbsync scrub fish duplicates bpm discogs fetchart
 
-badfiles:
-  check_on_import: yes
-  commands:
-    flac: flac --test --warnings-as-errors --silent
+  #badfiles:
+  #check_on_import: yes
+  #commands:
+  #  mp3: mp3val -f
+  #  flac: flac --test --warnings-as-errors
+  #   ogg: oggz validate
+  #  m4a: mp3val -f
 
 import:
   move: yes
diff --git a/beets/.config/beets/library.db b/beets/.config/beets/library.db
index 935e688..9a6402e 100644
Binary files a/beets/.config/beets/library.db and b/beets/.config/beets/library.db differ
diff --git a/beets/.config/beets/state.pickle b/beets/.config/beets/state.pickle
index d418034..7a52888 100644
Binary files a/beets/.config/beets/state.pickle and b/beets/.config/beets/state.pickle differ
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index e26c18b..51e7a94 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -5,6 +5,8 @@ set -Ux XDG_CONFIG_HOME /home/fuzzy/.config
 set -Ux XDG_DATE_HOME /home/fuzzy
 set -Ux XDG_CACHE_HOME /home/fuzzy/.cache
 set -gx	GPG_TTY (tty)
+set -Ux ROMS /mnt/Games/ROMS
+
 alias rm="rm -dr"
 alias cp="cp -r"
 alias exa="exa -aF -s type"
@@ -12,8 +14,7 @@ alias mkdir="mkdir -p"
 alias hima="himalaya"
 alias disroot="himalaya -a disroot"
 alias maim="maim ~/Pictures/Screenshots/(date +%s).png"
-alias sxiv="nsxiv"
-
+alias sxiv="nsxiv -af -e (xdotool getwindowfocus) -g (/home/fuzzy/Documents/scripts/getWindowGeometry.sh)"
 fish_add_path -g /bin /usr/bin /usr/local/bin /home/fuzzy/.cargo/bin /home/fuzzy/.local/bin /home/fuzzy/.local/bin 
 
 # Start X at login
diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables
index 53ddf8a..5ea6509 100644
--- a/fish/.config/fish/fish_variables
+++ b/fish/.config/fish/fish_variables
@@ -5,6 +5,7 @@ SETUVAR --export GPG_TTY:not\x20a\x20tty
 SETUVAR --export GTK_USE_PORTAL:1
 SETUVAR --export HOME:/home/fuzzy
 SETUVAR --export --path PKG_CONFIG_PATH:/usr/lib/pkgconfig/
+SETUVAR --export ROMS:/mnt/Games/ROMS
 SETUVAR --export RUST_LOG:debug\x20himalaya
 SETUVAR SHELL:/usr/bin/fish
 SETUVAR --export USBMUXD_SOCKET_ADDRESS:127\x2e0\x2e0\x2e1\x3a27015
diff --git a/flexget/.flexget/config.yml b/flexget/.flexget/config.yml
index 2e0b592..9f39e1e 100644
--- a/flexget/.flexget/config.yml
+++ b/flexget/.flexget/config.yml
@@ -12,6 +12,7 @@ templates:
             path: /mnt/EntertainmentDrive/anime/{{series_name}}
       seriesgroup:
         - Adachi to Shimamura
+        - Aharen-san wa Hakarenai
         - Beastars
         - Blue Period
         - Blue Reflection Ray
@@ -32,12 +33,15 @@ templates:
         - Jaku-Chara Tomozaki-kun
         - Kageki Shoujo!!
         - Kanojo mo Kanojo
+        - Kawaii dake ja Nai Shikimori-san
         - Koi to Yobu ni wa Kimochi Warui
+        - Koi wa Sekai Seifuku no Ato de
         - Komi-san wa, Comyushou desu
         - Kuma Kuma Kuma Bear
         - Kyoukai Senki
         - Kyuuketsuki Sugu Shinu
         - Love Live! Superstar!!
+        - Machikado Mazoku
         - Mahouka Koukou no Yuutousei
         - Majo no Tabitabi
         - Megaton-kyuu Musashi
diff --git a/flexget/.flexget/db-config.sqlite b/flexget/.flexget/db-config.sqlite
index 10f9557..1215a86 100644
Binary files a/flexget/.flexget/db-config.sqlite and b/flexget/.flexget/db-config.sqlite differ
diff --git a/flexget/.flexget/flexget.log b/flexget/.flexget/flexget.log
index a209dc8..374c670 100644
--- a/flexget/.flexget/flexget.log
+++ b/flexget/.flexget/flexget.log
@@ -814,3 +814,100 @@
 2022-05-16 21:15:03 CRITICAL manager                       Failed to load config file: Did not pass schema validation.
 2022-05-16 22:15:03 CRITICAL manager                       [/templates/anime/exists_series] `/mnt/EntertainmentDrive/anime` does not exist
 2022-05-16 22:15:03 CRITICAL manager                       Failed to load config file: Did not pass schema validation.
+2022-05-26 17:15:12 VERBOSE  task_queue                    There are 5 tasks to execute. Shutdown will commence when they have completed.
+2022-05-26 17:15:14 VERBOSE  details       judas           Produced 75 entries.
+2022-05-26 17:15:14 INFO     parser_internal judas           Title `[Judas] Kawaii Dake ja Nai Shikimori-san (Shikimori`s Not Just a Cutie) - S01E05 [1080p][HEVC x265 10bit][Multi-Subs] (Weekly)` looks like series `Kawaii dake ja Nai Shikimori-san` but cannot find a(n) `sequence` style identifier.
+2022-05-26 17:15:14 INFO     parser_internal judas           Title `[Judas] Kawaii Dake ja Nai Shikimori-san (Shikimori`s Not Just a Cutie) - S01E06 [1080p][HEVC x265 10bit][Multi-Subs] (Weekly)` looks like series `Kawaii dake ja Nai Shikimori-san` but cannot find a(n) `sequence` style identifier.
+2022-05-26 17:15:14 INFO     parser_internal judas           Title `[Judas] Kawaii Dake ja Nai Shikimori-san (Shikimori`s Not Just a Cutie) - S01E04 [1080p][HEVC x265 10bit][Multi-Subs] (Weekly)` looks like series `Kawaii dake ja Nai Shikimori-san` but cannot find a(n) `sequence` style identifier.
+2022-05-26 17:15:14 VERBOSE  task          judas           ACCEPTED: `[Judas] Kawaii Dake ja Nai Shikimori-san (Shikimori`s Not Just a Cutie) - S01E06.5 [1080p][HEVC x265 10bit][Multi-Subs] (Weekly)` by series plugin because choosing first acceptable match
+2022-05-26 17:15:14 WARNING  exists_series judas           Directory /mnt/EntertainmentDrive/anime/Kawaii dake ja Nai Shikimori-san does not exist
+2022-05-26 17:15:14 INFO     download      judas           Downloading: [Judas] Kawaii Dake ja Nai Shikimori-san (Shikimori`s Not Just a Cutie) - S01E06.5 [1080p][HEVC x265 10bit][Multi-Subs] (Weekly)
+2022-05-26 17:15:18 VERBOSE  details       judas           Summary - Accepted: 1 (Rejected: 0 Undecided: 74 Failed: 0)
+2022-05-26 17:15:18 INFO     transmission  judas           "[Judas] Kawaii Dake ja Nai Shikimori-san (Shikimori`s Not Just a Cutie) - S01E06.5 [1080p][HEVC x265 10bit][Multi-Subs] (Weekly)" torrent added to transmission
+2022-05-26 17:15:21 VERBOSE  details       ASW             Produced 75 entries.
+2022-05-26 17:15:21 INFO     parser_internal ASW             Title `[ASW] Kawaii dake ja Nai Shikimori-san - SP1 [1080p HEVC x265 10Bit][AAC]` looks like series `Kawaii dake ja Nai Shikimori-san` but cannot find a(n) `sequence` style identifier.
+2022-05-26 17:15:21 VERBOSE  task          ASW             ACCEPTED: `[ASW] Machikado Mazoku S2 - 07 [1080p HEVC x265 10Bit][AAC]` by series plugin because choosing first acceptable match
+2022-05-26 17:15:21 VERBOSE  task          ASW             ACCEPTED: `[ASW] Kyoukai Senki - 20 [1080p HEVC x265 10Bit][AAC]` by series plugin because choosing first acceptable match
+2022-05-26 17:15:21 VERBOSE  task          ASW             REJECTED: `[ASW] Kyoukai Senki - 19 [1080p HEVC x265 10Bit][AAC]` by series plugin because entity has already been downloaded
+2022-05-26 17:15:21 VERBOSE  task          ASW             ACCEPTED: `[ASW] Koi wa Sekai Seifuku no Ato de - 07 [1080p HEVC x265 10Bit][AAC]` by series plugin because choosing first acceptable match
+2022-05-26 17:15:21 VERBOSE  task          ASW             ACCEPTED: `[ASW] Aharen-san wa Hakarenai - 08 [1080p HEVC x265 10Bit][AAC]` by series plugin because choosing first acceptable match
+2022-05-26 17:15:21 WARNING  exists_series ASW             Directory /mnt/EntertainmentDrive/anime/Aharen-san wa Hakarenai does not exist
+2022-05-26 17:15:21 WARNING  exists_series ASW             Directory /mnt/EntertainmentDrive/anime/Koi wa Sekai Seifuku no Ato de does not exist
+2022-05-26 17:15:21 WARNING  exists_series ASW             Directory /mnt/EntertainmentDrive/anime/Machikado Mazoku does not exist
+2022-05-26 17:15:21 WARNING  exists_series ASW             Directory /mnt/EntertainmentDrive/anime/Aharen-san wa Hakarenai does not exist
+2022-05-26 17:15:21 WARNING  exists_series ASW             Directory /mnt/EntertainmentDrive/anime/Koi wa Sekai Seifuku no Ato de does not exist
+2022-05-26 17:15:21 WARNING  exists_series ASW             Directory /mnt/EntertainmentDrive/anime/Machikado Mazoku does not exist
+2022-05-26 17:15:21 WARNING  exists_series ASW             Directory /mnt/EntertainmentDrive/anime/Aharen-san wa Hakarenai does not exist
+2022-05-26 17:15:21 WARNING  exists_series ASW             Directory /mnt/EntertainmentDrive/anime/Koi wa Sekai Seifuku no Ato de does not exist
+2022-05-26 17:15:21 WARNING  exists_series ASW             Directory /mnt/EntertainmentDrive/anime/Machikado Mazoku does not exist
+2022-05-26 17:15:21 WARNING  exists_series ASW             Directory /mnt/EntertainmentDrive/anime/Aharen-san wa Hakarenai does not exist
+2022-05-26 17:15:21 WARNING  exists_series ASW             Directory /mnt/EntertainmentDrive/anime/Koi wa Sekai Seifuku no Ato de does not exist
+2022-05-26 17:15:21 WARNING  exists_series ASW             Directory /mnt/EntertainmentDrive/anime/Machikado Mazoku does not exist
+2022-05-26 17:15:21 INFO     download      ASW             Downloading: [ASW] Machikado Mazoku S2 - 07 [1080p HEVC x265 10Bit][AAC]
+2022-05-26 17:15:22 INFO     download      ASW             Downloading: [ASW] Kyoukai Senki - 20 [1080p HEVC x265 10Bit][AAC]
+2022-05-26 17:15:24 INFO     download      ASW             Downloading: [ASW] Aharen-san wa Hakarenai - 08 [1080p HEVC x265 10Bit][AAC]
+2022-05-26 17:15:28 INFO     download      ASW             Downloading: [ASW] Koi wa Sekai Seifuku no Ato de - 07 [1080p HEVC x265 10Bit][AAC]
+2022-05-26 17:15:30 VERBOSE  details       ASW             Summary - Accepted: 4 (Rejected: 1 Undecided: 70 Failed: 0)
+2022-05-26 17:15:30 INFO     transmission  ASW             "[ASW] Machikado Mazoku S2 - 07 [1080p HEVC x265 10Bit][AAC]" torrent added to transmission
+2022-05-26 17:15:30 INFO     transmission  ASW             "[ASW] Kyoukai Senki - 20 [1080p HEVC x265 10Bit][AAC]" torrent added to transmission
+2022-05-26 17:15:30 INFO     transmission  ASW             "[ASW] Aharen-san wa Hakarenai - 08 [1080p HEVC x265 10Bit][AAC]" torrent added to transmission
+2022-05-26 17:15:30 INFO     transmission  ASW             "[ASW] Koi wa Sekai Seifuku no Ato de - 07 [1080p HEVC x265 10Bit][AAC]" torrent added to transmission
+2022-05-26 17:15:32 VERBOSE  details       subsplease      Produced 50 entries.
+2022-05-26 17:15:32 INFO     parser_internal subsplease      Title `[SubsPlease] Kawaii dake ja Nai Shikimori-san - SP1 (1080p) [607F182D].mkv` looks like series `Kawaii dake ja Nai Shikimori-san` but cannot find a(n) `sequence` style identifier.
+2022-05-26 17:15:32 VERBOSE  task          subsplease      REJECTED: `[SubsPlease] Machikado Mazoku S2 - 07 (1080p) [8FF5D7A5].mkv` by series plugin because entity has already been downloaded
+2022-05-26 17:15:32 VERBOSE  task          subsplease      REJECTED: `[SubsPlease] Kyoukai Senki - 20 (1080p) [324D8147].mkv` by series plugin because entity has already been downloaded
+2022-05-26 17:15:32 VERBOSE  task          subsplease      REJECTED: `[SubsPlease] Aharen-san wa Hakarenai - 08 (1080p) [B096A15E].mkv` by series plugin because entity has already been downloaded
+2022-05-26 17:15:32 VERBOSE  details       subsplease      Summary - Accepted: 0 (Rejected: 3 Undecided: 47 Failed: 0)
+2022-05-26 17:15:36 VERBOSE  details       tenrai          Produced 75 entries.
+2022-05-26 17:15:36 VERBOSE  parser_internal tenrai          Title `[Tenrai-Sensei] Mieruko-Chan [BD][1080p][HEVC 10bit x265][Dual Audio]` looks like series `Mieruko-chan` but cannot find a(n) `sequence` style identifier.
+2022-05-26 17:15:36 VERBOSE  parser_internal tenrai          Title `[Tenrai-Sensei] Horimiya [BD][1080p][HEVC 10bit x265][Dual Audio]` looks like series `Horimiya` but cannot find a(n) `sequence` style identifier.
+2022-05-26 17:15:37 VERBOSE  task          tenrai          REJECTED: `[Tenrai-Sensei] Vivy -Fluorite Eye's Song- S1+OVA [BD][1080p][HEVC 10bit x265][Dual Audio]` by seen plugin because entry with title `[Tenrai-Sensei] Vivy -Fluorite Eye's Song- S1+OVA [BD][1080p][HEVC 10bit x265][Dual Audio]` is already marked seen in the task tenrai at 2022-02-08 09:51
+2022-05-26 17:15:37 VERBOSE  task          tenrai          REJECTED: `[Tenrai-Sensei | Saint-Subs] Shaman King (2021) - S01E33 - Osorezan Le Voile Part 4 [Web][1080p][AVC x264]` by seen plugin because entry with title `[Tenrai-Sensei | Saint-Subs] Shaman King (2021) - S01E33 - Osorezan Le Voile Part 4 [Web][1080p][AVC x264]` is already marked seen in the task tenrai at 2022-02-08 09:51
+2022-05-26 17:15:37 VERBOSE  task          tenrai          REJECTED: `[Tenrai-Sensei | Saint-Subs] Shaman King (2021) - S01E32 - Osorezan Le Voile Part 3 [Web][1080p][AVC x264]` by seen plugin because entry with title `[Tenrai-Sensei | Saint-Subs] Shaman King (2021) - S01E32 - Osorezan Le Voile Part 3 [Web][1080p][AVC x264]` is already marked seen in the task tenrai at 2022-02-08 09:51
+2022-05-26 17:15:37 VERBOSE  task          tenrai          REJECTED: `[Tenrai-Sensei | Saint-Subs] Shaman King (2021) - S01E31 - Osorezan Le Voile Part 2 [Web][1080p][AVC x264]` by seen plugin because entry with title `[Tenrai-Sensei | Saint-Subs] Shaman King (2021) - S01E31 - Osorezan Le Voile Part 2 [Web][1080p][AVC x264]` is already marked seen in the task tenrai at 2022-02-08 09:51
+2022-05-26 17:15:37 VERBOSE  task          tenrai          REJECTED: `[Tenrai-Sensei | Saint-Subs] Shaman King (2021) - S01E30 - Osorezan Le Voile Part 1 [Web][1080p][AVC x264]` by seen plugin because entry with title `[Tenrai-Sensei | Saint-Subs] Shaman King (2021) - S01E30 - Osorezan Le Voile Part 1 [Web][1080p][AVC x264]` is already marked seen in the task tenrai at 2022-02-08 09:51
+2022-05-26 17:15:37 VERBOSE  details       tenrai          Summary - Accepted: 0 (Rejected: 5 Undecided: 70 Failed: 0)
+2022-05-26 17:15:39 VERBOSE  details       moyaisubs       Produced 75 entries.
+2022-05-26 17:15:39 VERBOSE  parser_internal moyaisubs       Title `[MoyaiSubs] Godzilla Singular Point v2 (Web 1080p AAC) (Batch)` looks like series `Godzilla Singular Point` but cannot find a(n) `sequence` style identifier.
+2022-05-26 17:15:40 VERBOSE  details       moyaisubs       Summary - Accepted: 0 (Rejected: 0 Undecided: 75 Failed: 0)
+2022-06-02 11:50:35 VERBOSE  task_queue                    There are 5 tasks to execute. Shutdown will commence when they have completed.
+2022-06-02 11:50:36 VERBOSE  details       judas           Produced 75 entries.
+2022-06-02 11:50:36 VERBOSE  parser_internal judas           Title `[Judas] Kawaii Dake ja Nai Shikimori-san (Shikimori`s Not Just a Cutie) - S01E05 [1080p][HEVC x265 10bit][Multi-Subs] (Weekly)` looks like series `Kawaii dake ja Nai Shikimori-san` but cannot find a(n) `sequence` style identifier.
+2022-06-02 11:50:36 VERBOSE  parser_internal judas           Title `[Judas] Kawaii Dake ja Nai Shikimori-san (Shikimori`s Not Just a Cutie) - S01E06 [1080p][HEVC x265 10bit][Multi-Subs] (Weekly)` looks like series `Kawaii dake ja Nai Shikimori-san` but cannot find a(n) `sequence` style identifier.
+2022-06-02 11:50:36 INFO     parser_internal judas           Title `[Judas] Kawaii Dake ja Nai Shikimori-san (Shikimori`s Not Just a Cutie) - S01E07 [1080p][HEVC x265 10bit][Multi-Subs] (Weekly)` looks like series `Kawaii dake ja Nai Shikimori-san` but cannot find a(n) `sequence` style identifier.
+2022-06-02 11:50:36 VERBOSE  task          judas           REJECTED: `[Judas] Kawaii Dake ja Nai Shikimori-san (Shikimori`s Not Just a Cutie) - S01E06.5 [1080p][HEVC x265 10bit][Multi-Subs] (Weekly)` by seen plugin because entry with title `[Judas] Kawaii Dake ja Nai Shikimori-san (Shikimori`s Not Just a Cutie) - S01E06.5 [1080p][HEVC x265 10bit][Multi-Subs] (Weekly)` is already marked seen in the task judas at 2022-05-26 17:15
+2022-06-02 11:50:36 VERBOSE  details       judas           Summary - Accepted: 0 (Rejected: 1 Undecided: 74 Failed: 0)
+2022-06-02 11:50:37 VERBOSE  details       ASW             Produced 75 entries.
+2022-06-02 11:50:37 VERBOSE  task          ASW             REJECTED: `[ASW] Machikado Mazoku S2 - 07 [1080p HEVC x265 10Bit][AAC]` by seen plugin because entry with title `[ASW] Machikado Mazoku S2 - 07 [1080p HEVC x265 10Bit][AAC]` is already marked seen in the task ASW at 2022-05-26 17:15
+2022-06-02 11:50:37 VERBOSE  task          ASW             REJECTED: `[ASW] Kyoukai Senki - 20 [1080p HEVC x265 10Bit][AAC]` by seen plugin because entry with title `[ASW] Kyoukai Senki - 20 [1080p HEVC x265 10Bit][AAC]` is already marked seen in the task ASW at 2022-05-26 17:15
+2022-06-02 11:50:37 VERBOSE  task          ASW             ACCEPTED: `[ASW] Kyoukai Senki - 21 [1080p HEVC x265 10Bit][AAC]` by series plugin because choosing first acceptable match
+2022-06-02 11:50:37 VERBOSE  task          ASW             ACCEPTED: `[ASW] Koi wa Sekai Seifuku no Ato de - 08 [1080p HEVC x265 10Bit][AAC]` by series plugin because choosing first acceptable match
+2022-06-02 11:50:37 VERBOSE  task          ASW             ACCEPTED: `[ASW] Kawaii dake ja Nai Shikimori-san - 07 [1080p HEVC x265 10Bit][AAC]` by series plugin because choosing first acceptable match
+2022-06-02 11:50:37 VERBOSE  task          ASW             ACCEPTED: `[ASW] Aharen-san wa Hakarenai - 09 [1080p HEVC x265 10Bit][AAC]` by series plugin because choosing first acceptable match
+2022-06-02 11:50:37 INFO     download      ASW             Downloading: [ASW] Kyoukai Senki - 21 [1080p HEVC x265 10Bit][AAC]
+2022-06-02 11:50:38 INFO     download      ASW             Downloading: [ASW] Kawaii dake ja Nai Shikimori-san - 07 [1080p HEVC x265 10Bit][AAC]
+2022-06-02 11:50:38 INFO     download      ASW             Downloading: [ASW] Aharen-san wa Hakarenai - 09 [1080p HEVC x265 10Bit][AAC]
+2022-06-02 11:50:39 INFO     download      ASW             Downloading: [ASW] Koi wa Sekai Seifuku no Ato de - 08 [1080p HEVC x265 10Bit][AAC]
+2022-06-02 11:50:39 VERBOSE  details       ASW             Summary - Accepted: 4 (Rejected: 2 Undecided: 69 Failed: 0)
+2022-06-02 11:50:39 INFO     transmission  ASW             "[ASW] Kyoukai Senki - 21 [1080p HEVC x265 10Bit][AAC]" torrent added to transmission
+2022-06-02 11:50:39 INFO     transmission  ASW             "[ASW] Kawaii dake ja Nai Shikimori-san - 07 [1080p HEVC x265 10Bit][AAC]" torrent added to transmission
+2022-06-02 11:50:39 INFO     transmission  ASW             "[ASW] Aharen-san wa Hakarenai - 09 [1080p HEVC x265 10Bit][AAC]" torrent added to transmission
+2022-06-02 11:50:39 INFO     transmission  ASW             "[ASW] Koi wa Sekai Seifuku no Ato de - 08 [1080p HEVC x265 10Bit][AAC]" torrent added to transmission
+2022-06-02 11:50:40 VERBOSE  details       subsplease      Produced 50 entries.
+2022-06-02 11:50:40 VERBOSE  task          subsplease      REJECTED: `[SubsPlease] Kyoukai Senki - 21 (1080p) [A9E9546D].mkv` by series plugin because entity has already been downloaded
+2022-06-02 11:50:40 VERBOSE  task          subsplease      REJECTED: `[SubsPlease] Koi wa Sekai Seifuku no Ato de - 08 (1080p) [1AA5116D].mkv` by series plugin because entity has already been downloaded
+2022-06-02 11:50:40 VERBOSE  task          subsplease      REJECTED: `[SubsPlease] Kawaii dake ja Nai Shikimori-san - 07 (1080p) [CA7E54B2].mkv` by series plugin because entity has already been downloaded
+2022-06-02 11:50:41 VERBOSE  task          subsplease      REJECTED: `[SubsPlease] Aharen-san wa Hakarenai - 09 (1080p) [97D8A57D].mkv` by series plugin because entity has already been downloaded
+2022-06-02 11:50:41 VERBOSE  details       subsplease      Summary - Accepted: 0 (Rejected: 4 Undecided: 46 Failed: 0)
+2022-06-02 11:50:41 VERBOSE  details       tenrai          Produced 75 entries.
+2022-06-02 11:50:42 VERBOSE  parser_internal tenrai          Title `[Tenrai-Sensei] Mieruko-Chan [BD][1080p][HEVC 10bit x265][Dual Audio]` looks like series `Mieruko-chan` but cannot find a(n) `sequence` style identifier.
+2022-06-02 11:50:42 VERBOSE  parser_internal tenrai          Title `[Tenrai-Sensei] Horimiya [BD][1080p][HEVC 10bit x265][Dual Audio]` looks like series `Horimiya` but cannot find a(n) `sequence` style identifier.
+2022-06-02 11:50:42 VERBOSE  task          tenrai          REJECTED: `[Tenrai-Sensei] Vivy -Fluorite Eye's Song- S1+OVA [BD][1080p][HEVC 10bit x265][Dual Audio]` by seen plugin because entry with title `[Tenrai-Sensei] Vivy -Fluorite Eye's Song- S1+OVA [BD][1080p][HEVC 10bit x265][Dual Audio]` is already marked seen in the task tenrai at 2022-02-08 09:51
+2022-06-02 11:50:42 VERBOSE  task          tenrai          REJECTED: `[Tenrai-Sensei | Saint-Subs] Shaman King (2021) - S01E33 - Osorezan Le Voile Part 4 [Web][1080p][AVC x264]` by seen plugin because entry with title `[Tenrai-Sensei | Saint-Subs] Shaman King (2021) - S01E33 - Osorezan Le Voile Part 4 [Web][1080p][AVC x264]` is already marked seen in the task tenrai at 2022-02-08 09:51
+2022-06-02 11:50:42 VERBOSE  task          tenrai          REJECTED: `[Tenrai-Sensei | Saint-Subs] Shaman King (2021) - S01E32 - Osorezan Le Voile Part 3 [Web][1080p][AVC x264]` by seen plugin because entry with title `[Tenrai-Sensei | Saint-Subs] Shaman King (2021) - S01E32 - Osorezan Le Voile Part 3 [Web][1080p][AVC x264]` is already marked seen in the task tenrai at 2022-02-08 09:51
+2022-06-02 11:50:42 VERBOSE  task          tenrai          REJECTED: `[Tenrai-Sensei | Saint-Subs] Shaman King (2021) - S01E31 - Osorezan Le Voile Part 2 [Web][1080p][AVC x264]` by seen plugin because entry with title `[Tenrai-Sensei | Saint-Subs] Shaman King (2021) - S01E31 - Osorezan Le Voile Part 2 [Web][1080p][AVC x264]` is already marked seen in the task tenrai at 2022-02-08 09:51
+2022-06-02 11:50:42 VERBOSE  task          tenrai          REJECTED: `[Tenrai-Sensei | Saint-Subs] Shaman King (2021) - S01E30 - Osorezan Le Voile Part 1 [Web][1080p][AVC x264]` by seen plugin because entry with title `[Tenrai-Sensei | Saint-Subs] Shaman King (2021) - S01E30 - Osorezan Le Voile Part 1 [Web][1080p][AVC x264]` is already marked seen in the task tenrai at 2022-02-08 09:51
+2022-06-02 11:50:42 VERBOSE  details       tenrai          Summary - Accepted: 0 (Rejected: 5 Undecided: 70 Failed: 0)
+2022-06-02 11:50:43 VERBOSE  details       moyaisubs       Produced 75 entries.
+2022-06-02 11:50:43 VERBOSE  parser_internal moyaisubs       Title `[MoyaiSubs] Godzilla Singular Point v2 (Web 1080p AAC) (Batch)` looks like series `Godzilla Singular Point` but cannot find a(n) `sequence` style identifier.
+2022-06-02 11:50:43 VERBOSE  details       moyaisubs       Summary - Accepted: 0 (Rejected: 0 Undecided: 75 Failed: 0)
diff --git a/himalaya/.config/himalaya/config.toml b/himalaya/.config/himalaya/config.toml
index 6ff115a..d8ba0ca 100644
--- a/himalaya/.config/himalaya/config.toml
+++ b/himalaya/.config/himalaya/config.toml
@@ -1,18 +1,15 @@
 # ~/.config/himalaya/config.toml
-name = "Jeremy Lavitt"
+name = ""
 downloads-dir = "~/Downloads"
 signature = ""
 default-page-size = 50
 watch-cmds = ["mbsync -a"]
 
 [outlook]
+name = "Jeremy Lavitt"
 email = "JeremyLavitt@outlook.com"
 default = true
 default-page-size = 25
-signature = """
-Regards,
-Jeremy Lavitt
-"""
 
 imap-host = "outlook.office365.com"
 imap-port = 993
@@ -26,14 +23,19 @@ smtp-login = "jeremylavitt@outlook.com"
 smtp-passwd-cmd = "pass show outlook"
 
 [disroot]
+name = "fuzzy"
 email = "fuzzy@disroot.org"
 default = false
 default-page-size = 25
-signature = """
-Cordially,
-Fuzzy
+signature="""
+hell yeah you just got email'd by
+███████╗██╗   ██╗███████╗███████╗██╗   ██╗
+██╔════╝██║   ██║╚══███╔╝╚══███╔╝╚██╗ ██╔╝
+█████╗  ██║   ██║  ███╔╝   ███╔╝  ╚████╔╝
+██╔══╝  ██║   ██║ ███╔╝   ███╔╝    ╚██╔╝
+██║     ╚██████╔╝███████╗███████╗   ██║
+╚═╝      ╚═════╝ ╚══════╝╚══════╝   ╚═╝
 """
-
 imap-host = "disroot.org"
 imap-port = 993
 imap-login = "fuzzy@disroot.org"
@@ -41,6 +43,7 @@ imap-passwd-cmd = "pass show disroot"
 
 smtp-host = "disroot.org"
 smtp-port = 587
+smtp-starttls = true
 smtp-login = "fuzzy@disroot.org"
 smtp-passwd-cmd = "pass show disroot"
 
diff --git a/nvim/.config/nvim/node_modules/.yarn-integrity b/nvim/.config/nvim/node_modules/.yarn-integrity
new file mode 100644
index 0000000..3f7172c
--- /dev/null
+++ b/nvim/.config/nvim/node_modules/.yarn-integrity
@@ -0,0 +1,10 @@
+{
+  "systemParams": "linux-x64-93",
+  "modulesFolders": [],
+  "flags": [],
+  "linkedModules": [],
+  "topLevelPatterns": [],
+  "lockfileEntries": {},
+  "files": [],
+  "artifacts": {}
+}
\ No newline at end of file
diff --git a/nvim/.config/nvim/yarn.lock b/nvim/.config/nvim/yarn.lock
new file mode 100644
index 0000000..fb57ccd
--- /dev/null
+++ b/nvim/.config/nvim/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc
index 4501855..b6d54cb 100644
--- a/sxhkd/.config/sxhkd/sxhkdrc
+++ b/sxhkd/.config/sxhkd/sxhkdrc
@@ -12,4 +12,5 @@ XF86AudioRaiseVolume
 
 XF86AudioLowerVolume
         pactl set-sink-volume alsa_output.pci-0000_00_1f.3.analog-stereo -2%
-
+alt + c
+	grabc -hex | xclip -selection clipboard
diff --git a/xmenu/.local/share/xmenu/Makefile b/xmenu/.local/share/xmenu/Makefile
index f5c7488..75e81af 100644
--- a/xmenu/.local/share/xmenu/Makefile
+++ b/xmenu/.local/share/xmenu/Makefile
@@ -1,4 +1,27 @@
-include config.mk
+# program name
+PROG = xmenu
+
+# paths
+PREFIX    ?= /usr/local
+MANPREFIX ?= ${PREFIX}/share/man
+LOCALINC ?= /usr/local/include
+LOCALLIB ?= /usr/local/lib
+X11INC ?= /usr/X11R6/include
+X11LIB ?= /usr/X11R6/lib
+FREETYPEINC ?= /usr/include/freetype2
+# OpenBSD (uncomment)
+#FREETYPEINC = ${X11INC}/freetype2
+
+# includes and libs
+INCS += -I${LOCALINC} -I${X11INC} -I${FREETYPEINC}
+LIBS += -L${LOCALLIB} -L${X11LIB} -lfontconfig -lXft -lX11 -lXinerama -lImlib2
+
+# flags
+CFLAGS   += ${DEBUG} -Wall -Wextra ${INCS} ${CPPFLAGS}
+LDFLAGS  += ${LIBS}
+
+# compiler and linker
+CC = cc
 
 bindir = ${DESTDIR}${PREFIX}
 mandir = ${DESTDIR}${MANPREFIX}
@@ -11,7 +34,7 @@ all: ${PROG}
 ${PROG}: ${OBJS}
 	${CC} -o $@ ${OBJS} ${LDFLAGS}
 
-${OBJS}: config.h ${PROG}.h
+${OBJS}: config.h
 
 .c.o:
 	${CC} ${CFLAGS} -c $<
diff --git a/xmenu/.local/share/xmenu/README.md b/xmenu/.local/share/xmenu/README.md
index 757fd8a..ac2542b 100644
--- a/xmenu/.local/share/xmenu/README.md
+++ b/xmenu/.local/share/xmenu/README.md
@@ -37,8 +37,6 @@ The files are:
 * `./README`:     This file.
 * `./Makefile`:   The makefile.
 * `./config.h`:   The hardcoded default configuration for XMenu.
-* `./config.mk`:  The setup for the makefile.
-* `./demo.gif`:   A gif demonstrating how XMenu works.
 * `./xmenu.1`:    The manual file (man page) for XMenu.
 * `./xmenu.c`:    The source code of XMenu.
 * `./xmenu.sh`:   A sample script illustrating how to use XMenu.
diff --git a/xmenu/.local/share/xmenu/config.mk b/xmenu/.local/share/xmenu/config.mk
deleted file mode 100644
index c14393c..0000000
--- a/xmenu/.local/share/xmenu/config.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# program name
-PROG = xmenu
-
-# paths
-PREFIX    ?= /usr/local
-MANPREFIX ?= ${PREFIX}/share/man
-
-LOCALINC ?= /usr/local/include
-LOCALLIB ?= /usr/local/lib
-
-# SHELL variable (mainly for non-GNU make)
-SHELL ?= /bin/sh
-
-X11INC ?= /usr/X11R6/include
-X11LIB ?= /usr/X11R6/lib
-
-FREETYPEINC ?= /usr/include/freetype2
-# OpenBSD (uncomment)
-#FREETYPEINC = ${X11INC}/freetype2
-
-# includes and libs
-INCS := -I${LOCALINC} -I${X11INC} -I${FREETYPEINC}
-LIBS := -L${LOCALLIB} -L${X11LIB} -lfontconfig -lXft -lX11 -lXinerama -lImlib2
-
-# flags
-CPPFLAGS :=
-CFLAGS   := -Wall -Wextra ${INCS} ${CPPFLAGS}
-LDFLAGS  := ${LIBS}
-
-# compiler and linker
-CC = cc
diff --git a/xmenu/.local/share/xmenu/xmenu b/xmenu/.local/share/xmenu/xmenu
index e69de29..7c413e1 100755
Binary files a/xmenu/.local/share/xmenu/xmenu and b/xmenu/.local/share/xmenu/xmenu differ
diff --git a/xmenu/.local/share/xmenu/xmenu.1 b/xmenu/.local/share/xmenu/xmenu.1
index 5792b9f..3546f92 100644
--- a/xmenu/.local/share/xmenu/xmenu.1
+++ b/xmenu/.local/share/xmenu/xmenu.1
@@ -62,6 +62,53 @@ so pressing it will not trigger any menu item.
 Asks the window manager to draw a border around the menus.
 This option may be buggy in some window managers,
 specially tiled ones that do not respect window hints.
+.TP
+\fB\-x\fP [\fImod\fP-]\fIbutton\fP
+This option requires an argument of the form
+\fImod\fP-\fIbutton\fP or \fIbutton\fP; where
+.I mod
+is
+.B Mod1
+to
+.BR Mod5 ,
+or
+.B Alt
+(equivalent to
+.BR Mod1 ),
+or
+.B Super
+(equivalent to
+.BR Mod4 );
+and
+.I button
+is the number of a mouse button.
+When this option is used,
+.B pmenu
+listens to button presses on the root window,
+and shows the pie menu when the given button is pressed,
+together with the given modifier,
+on the root window.
+For example, invoking
+.B pmenu
+with the option
+.B -x Super-3
+makes a menu open when clicking with the third mouse button on the root window,
+or when clicking with the third mouse button together with the Super (Mod4) modifier on any window.
+This option makes
+.B pmenu
+run continuously;
+so it should be used when
+.B pmenu
+is invoked in background on a X startup file (like
+.BR "~/.xinitrc" ).
+.TP
+\fB\-X\fP [\fImod\fP-]\fIbutton\fP
+Just like
+.BR \-x ,
+but also pass the click to the root window
+(for the window manager to use it, for example).
+This option is incompatible with
+.BR \-x .
 .PP
 Each item read from stdin has the following format:
 .IP
@@ -79,7 +126,11 @@ items indented with a tab is shown in a submenu of the preceding item not indent
 An item without initial tabs is a top-level item.
 .IP
 The image is a string of the form "IMG:/path/to/image.png".
-It specifies a image to be shown as icon at the left of the entry.
+It specifies the path to a image file to be shown as icon at the left of the entry.
+If the path does not begin with "/", "./" or "../",
+the file is searched on the paths specified in the
+.B ICONPATH
+environment variable.
 .IP
 The label is the string that will be shown as a item in the menu.
 An item without label is considered a separator and is drawn as a thin line in the menu
@@ -190,6 +241,22 @@ or
 .BR "\(dqright\(dq" ,
 text is aligned to the left, center, or right of the menu, respectively.
 By default, text is aligned to the left.
+.TP
+.B xmenu.maxItems
+Maximum number of items to be displayed in a menu.
+If more a menu has more than this number of items,
+they will be scrolled with arrow buttons.
+.SH ENVIRONMENT
+The following environment variables affect the execution of
+.BR pmenu .
+.TP
+.B DISPLAY
+The display to start
+.B pmenu
+on.
+.TP
+.B ICONPATH
+A colon-separated list of directories used to search for the location of image files.
 .SH EXAMPLES
 The following script illustrates the use of
 .BR xmenu .
diff --git a/xmenu/.local/share/xmenu/xmenu.c b/xmenu/.local/share/xmenu/xmenu.c
index 9b3a250..cff634d 100644
--- a/xmenu/.local/share/xmenu/xmenu.c
+++ b/xmenu/.local/share/xmenu/xmenu.c
@@ -16,29 +16,156 @@
 #include <X11/Xft/Xft.h>
 #include <X11/extensions/Xinerama.h>
 #include <Imlib2.h>
-#include "xmenu.h"
+
+/* macros */
+#define MAXPATHS 128            /* maximal number of paths to look for icons */
+#define ICONPATH "ICONPATH"     /* environment variable name */
+#define CLASS               "XMenu"
+#define LEN(x)              (sizeof (x) / sizeof (x[0]))
+#define BETWEEN(x, a, b)    ((a) <= (x) && (x) <= (b))
+#define GETNUM(n, s) { \
+	unsigned long __TMP__; \
+	if ((__TMP__ = strtoul((s), NULL, 10)) < INT_MAX) \
+		(n) = __TMP__; \
+	}
+
+/* Actions for the main loop */
+enum {
+	ACTION_NOP    = 0,
+	ACTION_CLEAR  = 1<<0,     /* clear text */
+	ACTION_SELECT = 1<<1,     /* select item */
+	ACTION_MAP    = 1<<2,     /* remap menu windows */
+	ACTION_DRAW   = 1<<3,     /* redraw menu windows */
+	ACTION_WARP   = 1<<4,     /* warp the pointer */
+};
+
+/* enum for keyboard menu navigation */
+enum { ITEMPREV, ITEMNEXT, ITEMFIRST, ITEMLAST };
+
+/* enum for text alignment */
+enum {LeftAlignment, CenterAlignment, RightAlignment};
+
+/* color enum */
+enum {ColorFG, ColorBG, ColorLast};
+
+/* EWMH atoms */
+enum {NetWMName, NetWMWindowType, NetWMWindowTypePopupMenu, NetLast};
+
+/* configuration structure */
+struct Config {
+	/* the values below are set by config.h */
+	const char *font;
+	const char *background_color;
+	const char *foreground_color;
+	const char *selbackground_color;
+	const char *selforeground_color;
+	const char *separator_color;
+	const char *border_color;
+	int width_pixels;
+	int height_pixels;
+	int border_pixels;
+	int max_items;
+	int separator_pixels;
+	int gap_pixels;
+	int triangle_width;
+	int triangle_height;
+	int iconpadding;
+	int horzpadding;
+	int alignment;
+
+	/* the values below are set by options */
+	int monitor;
+	int posx, posy;         /* rootmenu position */
+
+	/* the value below is computed by xmenu */
+	int iconsize;
+};
+
+/* draw context structure */
+struct DC {
+	XftColor normal[ColorLast];
+	XftColor selected[ColorLast];
+	XftColor border;
+	XftColor separator;
+
+	GC gc;
+
+	FcPattern *pattern;
+	XftFont **fonts;
+	size_t nfonts;
+};
+
+/* menu item structure */
+struct Item {
+	char *label;            /* string to be drawed on menu */
+	char *output;           /* string to be outputed when item is clicked */
+	char *file;             /* filename of the icon */
+	int y;                  /* item y position relative to menu */
+	int h;                  /* item height */
+	int textw;              /* text width */
+	struct Item *prev;      /* previous item */
+	struct Item *next;      /* next item */
+	struct Menu *submenu;   /* submenu spawned by clicking on item */
+	Drawable sel, unsel;    /* pixmap for selected and unselected item */
+	Imlib_Image icon;
+};
+
+/* monitor geometry structure */
+struct Monitor {
+	int x, y, w, h;         /* monitor geometry */
+};
+
+/* menu structure */
+struct Menu {
+	struct Menu *parent;    /* parent menu */
+	struct Item *caller;    /* item that spawned the menu */
+	struct Item *list;      /* list of items contained by the menu */
+	struct Item *first;     /* first item displayed on the menu */
+	struct Item *selected;  /* item currently selected in the menu */
+	int x, y, w, h;         /* menu geometry */
+	int hasicon;            /* whether the menu has item with icons */
+	int drawn;              /* whether the menu was already drawn */
+	int maxtextw;           /* maximum text width */
+	int level;              /* menu level relative to root */
+	int overflow;           /* whether the menu is higher than the monitor */
+	Window win;             /* menu window to map on the screen */
+	XIC xic;                /* input context */
+};
 
 /* X stuff */
 static Display *dpy;
-static int screen;
 static Visual *visual;
 static Window rootwin;
 static Colormap colormap;
 static XrmDatabase xdb;
+static XClassHint classh;
 static char *xrm;
 static struct DC dc;
-static struct Monitor mon;
 static Atom utf8string;
 static Atom wmdelete;
 static Atom netatom[NetLast];
+static int screen;
+static int depth;
 static XIM xim;
 
 /* flags */
-static int iflag = 0;   /* whether to disable icons */
-static int rflag = 0;   /* whether to disable right-click */
-static int mflag = 0;   /* whether the user specified a monitor with -p */
-static int pflag = 0;   /* whether the user specified a position with -p */
-static int wflag = 0;   /* whether to let the window manager control XMenu */
+static int iflag = 0;                   /* whether to disable icons */
+static int rflag = 0;                   /* whether to disable right-click */
+static int mflag = 0;                   /* whether the user specified a monitor with -p */
+static int pflag = 0;                   /* whether the user specified a position with -p */
+static int wflag = 0;                   /* whether to let the window manager control XMenu */
+static int rootmodeflag = 0;            /* wheter to run in root mode */
+static int passclickflag = 0;           /* whether to pass click to root window */
+static int firsttime = 1;               /* set to 0 after first run */
+
+/* arguments */
+static unsigned int button = 0;         /* button to trigger pmenu in root mode */
+static unsigned int modifier = 0;       /* modifier to trigger pmenu */
+
+/* icons paths */
+static char *iconstring = NULL;         /* string read from getenv */
+static char *iconpaths[MAXPATHS];       /* paths to icon directories */
+static int niconpaths = 0;              /* number of paths to icon directories */
 
 /* include config variable */
 #include "config.h"
@@ -51,8 +178,43 @@ usage(void)
 	exit(1);
 }
 
-/* parse position string from -p,
- * put results on config.posx, config.posy, and config.monitor */
+/* maximum int */
+static int
+max(int x, int y)
+{
+	return x > y ? x : y;
+}
+
+/* minimum int */
+static int
+min(int x, int y)
+{
+	return x < y ? x : y;
+}
+
+/* call malloc checking for error */
+static void *
+emalloc(size_t size)
+{
+	void *p;
+
+	if ((p = malloc(size)) == NULL)
+		err(1, "malloc");
+	return p;
+}
+
+/* call strdup checking for error */
+static char *
+estrdup(const char *s)
+{
+	char *t;
+
+	if ((t = strdup(s)) == NULL)
+		err(1, "strdup");
+	return t;
+}
+
+/* parse position string from -p, put results on config.posx, config.posy, and config.monitor */
 static void
 parseposition(char *optarg)
 {
@@ -111,6 +273,8 @@ getresources(void)
 		GETNUM(config.width_pixels, xval.addr)
 	if (XrmGetResource(xdb, "xmenu.gap", "*", &type, &xval) == True)
 		GETNUM(config.gap_pixels, xval.addr)
+	if (XrmGetResource(xdb, "xmenu.maxItems", "*", &type, &xval) == True)
+		GETNUM(config.max_items, xval.addr)
 	if (XrmGetResource(xdb, "xmenu.background", "*", &type, &xval) == True)
 		config.background_color = xval.addr;
 	if (XrmGetResource(xdb, "xmenu.foreground", "*", &type, &xval) == True)
@@ -135,13 +299,75 @@ getresources(void)
 	}
 }
 
+/* set button global variable */
+static void
+setbutton(char *s)
+{
+	size_t len;
+
+	if ((len = strlen(s)) < 1)
+		return;
+	switch (s[len-1]) {
+	case '1': button = Button1; break;
+	case '2': button = Button2; break;
+	case '3': button = Button3; break;
+	default:  button = atoi(&s[len-1]); break;
+	}
+}
+
+/* set modifier global variable */
+static void
+setmodifier(char *s)
+{
+	size_t len;
+
+	if ((len = strlen(s)) < 1)
+		return;
+	switch (s[len-1]) {
+	case '1': modifier = Mod1Mask; break;
+	case '2': modifier = Mod2Mask; break;
+	case '3': modifier = Mod3Mask; break;
+	case '4': modifier = Mod4Mask; break;
+	case '5': modifier = Mod5Mask; break;
+	default:
+		if (strcasecmp(s, "Alt") == 0) {
+			modifier = Mod1Mask;
+		} else if (strcasecmp(s, "Super") == 0) {
+			modifier = Mod4Mask;
+		}
+		break;
+	}
+}
+
+/* parse icon path string */
+static void
+parseiconpaths(char *s)
+{
+	if (s == NULL)
+		return;
+	free(iconstring);
+	iconstring = estrdup(s);
+	niconpaths = 0;
+	for (s = strtok(iconstring, ":"); s != NULL; s = strtok(NULL, ":")) {
+		if (niconpaths < MAXPATHS) {
+			iconpaths[niconpaths++] = s;
+		}
+	}
+}
+
 /* get configuration from command-line options */
-static char *
+static void
 getoptions(int argc, char *argv[])
 {
 	int ch;
+	char *s, *t;
 
-	while ((ch = getopt(argc, argv, "ip:rw")) != -1) {
+	classh.res_class = CLASS;
+	classh.res_name = argv[0];
+	if ((s = strrchr(argv[0], '/')) != NULL)
+		classh.res_name = s + 1;
+	parseiconpaths(getenv(ICONPATH));
+	while ((ch = getopt(argc, argv, "ip:rwx:X:")) != -1) {
 		switch (ch) {
 		case 'i':
 			iflag = 1;
@@ -156,18 +382,30 @@ getoptions(int argc, char *argv[])
 		case 'w':
 			wflag = 1;
 			break;
+		case 'X':
+			passclickflag = 1;
+			/* PASSTHROUGH */
+		case 'x':
+			rootmodeflag = 1;
+			s = optarg;
+			setbutton(s);
+			if ((t = strchr(s, '-')) == NULL)
+				return;
+			*t = '\0';
+			setmodifier(s);
+			break;
 		default:
 			usage();
 			break;
 		}
 	}
+	if (rootmodeflag)
+		wflag = 0;
 	argc -= optind;
 	argv += optind;
-	if (argc > 1)
+	if (argc != 0)
 		usage();
-	else if (argc == 1)
-		return *argv;
-	return PROGNAME;
+	return;
 }
 
 /* parse font string */
@@ -218,7 +456,7 @@ ealloccolor(const char *s, XftColor *color)
 
 /* query monitor information and cursor position */
 static void
-initmonitor(void)
+getmonitor(struct Monitor *mon)
 {
 	XineramaScreenInfo *info = NULL;
 	Window dw;          /* dummy variable */
@@ -230,9 +468,9 @@ initmonitor(void)
 
 	XQueryPointer(dpy, rootwin, &dw, &dw, &cursx, &cursy, &di, &di, &du);
 
-	mon.x = mon.y = 0;
-	mon.w = DisplayWidth(dpy, screen);
-	mon.h = DisplayHeight(dpy, screen);
+	mon->x = mon->y = 0;
+	mon->w = DisplayWidth(dpy, screen);
+	mon->h = DisplayHeight(dpy, screen);
 
 	if ((info = XineramaQueryScreens(dpy, &nmons)) != NULL) {
 		int selmon = 0;
@@ -249,10 +487,10 @@ initmonitor(void)
 			selmon = config.monitor;
 		}
 
-		mon.x = info[selmon].x_org;
-		mon.y = info[selmon].y_org;
-		mon.w = info[selmon].width;
-		mon.h = info[selmon].height;
+		mon->x = info[selmon].x_org;
+		mon->y = info[selmon].y_org;
+		mon->w = info[selmon].width;
+		mon->h = info[selmon].height;
 
 		XFree(info);
 	}
@@ -261,8 +499,8 @@ initmonitor(void)
 		config.posx = cursx;
 		config.posy = cursy;
 	} else if (mflag) {
-		config.posx += mon.x;
-		config.posy += mon.y;
+		config.posx += mon->x;
+		config.posy += mon->y;
 	}
 }
 
@@ -309,26 +547,22 @@ allocitem(const char *label, const char *output, char *file)
 {
 	struct Item *item;
 
-	if ((item = malloc(sizeof *item)) == NULL)
-		err(1, "malloc");
+	item = emalloc(sizeof *item);
 	if (label == NULL) {
 		item->label = NULL;
 		item->output = NULL;
 	} else {
-		if ((item->label = strdup(label)) == NULL)
-			err(1, "strdup");
+		item->label = estrdup(label);
 		if (label == output) {
 			item->output = item->label;
 		} else {
-			if ((item->output = strdup(output)) == NULL)
-				err(1, "strdup");
+			item->output = estrdup(output);
 		}
 	}
 	if (file == NULL) {
 		item->file = NULL;
 	} else {
-		if ((item->file = strdup(file)) == NULL)
-			err(1, "strdup");
+		item->file = estrdup(file);
 	}
 	item->y = 0;
 	item->h = 0;
@@ -341,24 +575,18 @@ allocitem(const char *label, const char *output, char *file)
 
 /* allocate a menu and create its window */
 static struct Menu *
-allocmenu(struct Menu *parent, struct Item *list, unsigned level)
+allocmenu(struct Menu *parent, struct Item *list, int level)
 {
 	XSetWindowAttributes swa;
 	struct Menu *menu;
 
-	if ((menu = malloc(sizeof *menu)) == NULL)
-		err(1, "malloc");
-	menu->parent = parent;
-	menu->list = list;
-	menu->caller = NULL;
-	menu->selected = NULL;
-	menu->w = 0;        /* recalculated by setupmenu() */
-	menu->h = 0;        /* recalculated by setupmenu() */
-	menu->x = mon.x;    /* recalculated by setupmenu() */
-	menu->y = mon.y;    /* recalculated by setupmenu() */
-	menu->level = level;
-	menu->drawn = 0;
-	menu->hasicon = 0;
+	menu = emalloc(sizeof *menu);
+	*menu = (struct Menu){
+		.parent = parent,
+		.list = list,
+		.level = level,
+		.first = NULL,
+	};
 
 	swa.override_redirect = (wflag) ? False : True;
 	swa.background_pixel = dc.normal[ColorBG].pixel;
@@ -368,7 +596,7 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level)
 	               | PointerMotionMask | LeaveWindowMask;
 	if (wflag)
 		swa.event_mask |= StructureNotifyMask;
-	menu->win = XCreateWindow(dpy, rootwin, 0, 0, 1, 1, 0,
+	menu->win = XCreateWindow(dpy, rootwin, 0, 0, 1, 1, config.border_pixels,
 	                          CopyFromParent, CopyFromParent, CopyFromParent,
 	                          CWOverrideRedirect | CWBackPixel |
 	                          CWBorderPixel | CWEventMask | CWSaveUnder,
@@ -384,14 +612,14 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level)
 
 /* build the menu tree */
 static struct Menu *
-buildmenutree(unsigned level, const char *label, const char *output, char *file)
+buildmenutree(int level, const char *label, const char *output, char *file)
 {
 	static struct Menu *prevmenu = NULL;    /* menu the previous item was added to */
 	static struct Menu *rootmenu = NULL;    /* menu to be returned */
 	struct Item *curritem = NULL;           /* item currently being read */
 	struct Item *item;                      /* dummy item for loops */
 	struct Menu *menu;                      /* dummy menu for loops */
-	unsigned i;
+	int i;
 
 	/* create the item */
 	curritem = allocitem(label, output, file);
@@ -455,7 +683,7 @@ parsestdin(void)
 	struct Menu *rootmenu;
 	char *s, buf[BUFSIZ];
 	char *file, *label, *output;
-	unsigned level = 0;
+	int level = 0;
 
 	rootmenu = NULL;
 
@@ -623,20 +851,34 @@ drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *t
 
 /* setup the height, width and icon of the items of a menu */
 static void
-setupitems(struct Menu *menu)
+setupitems(struct Menu *menu, struct Monitor *mon)
 {
+	Pixmap pix;
 	struct Item *item;
 	int itemwidth;
+	int menuh;
+	int maxh;
 
+	menu->first = menu->list;
 	menu->w = config.width_pixels;
 	menu->maxtextw = 0;
+	menuh = 0;
+	maxh = config.max_items > 3 ? (2 + config.max_items) * config.height_pixels : mon->h;
 	for (item = menu->list; item != NULL; item = item->next) {
-		item->y = menu->h;
+		item->y = menuh;
 		if (item->label == NULL)   /* height for separator item */
 			item->h = config.separator_pixels;
 		else
 			item->h = config.height_pixels;
-		menu->h += item->h;
+		menuh += item->h;
+		if (!menu->overflow) {
+			if (menu->h + config.height_pixels * 2 < maxh - config.border_pixels * 2) {
+				menu->h = menuh;
+			} else {
+				menu->overflow = 1;
+				menu->h += config.height_pixels * 2;
+			}
+		}
 		if (item->label)
 			item->textw = drawtext(NULL, NULL, 0, 0, 0, item->label);
 		else
@@ -656,49 +898,79 @@ setupitems(struct Menu *menu)
 		 */
 		itemwidth = item->textw + config.triangle_width + config.horzpadding * 3;
 		itemwidth += (iflag || !menu->hasicon) ? 0 : config.iconsize + config.horzpadding;
-		menu->w = MAX(menu->w, itemwidth);
-		menu->maxtextw = MAX(menu->maxtextw, item->textw);
+		menu->w = max(menu->w, itemwidth);
+		menu->maxtextw = max(menu->maxtextw, item->textw);
+	}
+	if (!menu->overflow) {
+		XSetWindowBackground(dpy, menu->win, dc.normal[ColorBG].pixel);
+	} else {
+		pix = XCreatePixmap(dpy, menu->win, menu->w, menu->h, depth);
+		XSetForeground(dpy, dc.gc, dc.normal[ColorBG].pixel);
+		XFillRectangle(dpy, pix, dc.gc, 0, 0, menu->w, menu->h);
+		XSetForeground(dpy, dc.gc, dc.normal[ColorFG].pixel);
+		XFillPolygon(
+			dpy, pix, dc.gc,
+			(XPoint []){
+				{menu->w / 2 - 3, config.height_pixels / 2 + 2},
+				{3, -4},
+				{3, 4},
+				{-6, 0},
+			},
+			4, Convex, CoordModePrevious
+		);
+		XFillPolygon(
+			dpy, pix, dc.gc,
+			(XPoint []){
+				{menu->w / 2 - 3, menu->h - config.height_pixels / 2 - 2},
+				{3, 4},
+				{3, -4},
+				{-6, 0},
+			},
+			4, Convex, CoordModePrevious
+		);
+		XSetWindowBackgroundPixmap(dpy, menu->win, pix);
+		XFreePixmap(dpy, pix);
 	}
 }
 
 /* setup the position of a menu */
 static void
-setupmenupos(struct Menu *menu)
+setupmenupos(struct Menu *menu, struct Monitor *mon)
 {
 	int width, height;
 
 	width = menu->w + config.border_pixels * 2;
 	height = menu->h + config.border_pixels * 2;
 	if (menu->parent == NULL) { /* if root menu, calculate in respect to cursor */
-		if (pflag || (config.posx >= mon.x && mon.x + mon.w - config.posx >= width))
+		if (pflag || (config.posx >= mon->x && mon->x + mon->w - config.posx >= width))
 			menu->x = config.posx;
 		else if (config.posx > width)
 			menu->x = config.posx - width;
 
-		if (pflag || (config.posy >= mon.y && mon.y + mon.h - config.posy >= height))
+		if (pflag || (config.posy >= mon->y && mon->y + mon->h - config.posy >= height))
 			menu->y = config.posy;
-		else if (mon.y + mon.h > height)
-			menu->y = mon.y + mon.h - height;
+		else if (mon->y + mon->h > height)
+			menu->y = mon->y + mon->h - height;
 	} else {                    /* else, calculate in respect to parent menu */
 		int parentwidth;
 
 		parentwidth = menu->parent->x + menu->parent->w + config.border_pixels + config.gap_pixels;
 
-		if (mon.x + mon.w - parentwidth >= width)
+		if (mon->x + mon->w - parentwidth >= width)
 			menu->x = parentwidth;
 		else if (menu->parent->x > menu->w + config.border_pixels + config.gap_pixels)
 			menu->x = menu->parent->x - menu->w - config.border_pixels - config.gap_pixels;
 
-		if (mon.y + mon.h - (menu->caller->y + menu->parent->y) >= height)
+		if (mon->y + mon->h - (menu->caller->y + menu->parent->y) >= height)
 			menu->y = menu->caller->y + menu->parent->y;
-		else if (mon.y + mon.h > height)
-			menu->y = mon.y + mon.h - height;
+		else if (mon->y + mon->h > height)
+			menu->y = mon->y + mon->h - height;
 	}
 }
 
 /* recursivelly setup menu configuration and its pixmap */
 static void
-setupmenu(struct Menu *menu, XClassHint *classh)
+setupmenu(struct Menu *menu, struct Monitor *mon)
 {
 	char *title;
 	struct Item *item;
@@ -707,45 +979,46 @@ setupmenu(struct Menu *menu, XClassHint *classh)
 	XTextProperty wintitle;
 
 	/* setup size and position of menus */
-	setupitems(menu);
-	setupmenupos(menu);
+	setupitems(menu, mon);
+	setupmenupos(menu, mon);
 
 	/* update menu geometry */
-	changes.border_width = config.border_pixels;
 	changes.height = menu->h;
 	changes.width = menu->w;
 	changes.x = menu->x;
 	changes.y = menu->y;
-	XConfigureWindow(dpy, menu->win, CWBorderWidth | CWWidth | CWHeight | CWX | CWY, &changes);
+	XConfigureWindow(dpy, menu->win, CWWidth | CWHeight | CWX | CWY, &changes);
 
-	/* set window title (used if wflag is on) */
-	if (menu->parent == NULL) {
-		title = classh->res_name;
-	} else if (menu->caller->output) {
-		title = menu->caller->output;
-	} else {
-		title = "\0";
+	if (firsttime) {
+		/* set window title (used if wflag is on) */
+		if (menu->parent == NULL) {
+			title = classh.res_name;
+		} else if (menu->caller->output) {
+			title = menu->caller->output;
+		} else {
+			title = "\0";
+		}
+		XStringListToTextProperty(&title, 1, &wintitle);
+
+		/* set window manager hints */
+		sizeh.flags = USPosition | PMaxSize | PMinSize;
+		sizeh.min_width = sizeh.max_width = menu->w;
+		sizeh.min_height = sizeh.max_height = menu->h;
+		XSetWMProperties(dpy, menu->win, &wintitle, NULL, NULL, 0, &sizeh, NULL, &classh);
+
+		/* set WM protocols and ewmh window properties */
+		XSetWMProtocols(dpy, menu->win, &wmdelete, 1);
+		XChangeProperty(dpy, menu->win, netatom[NetWMName], utf8string, 8,
+	                	PropModeReplace, (unsigned char *)title, strlen(title));
+		XChangeProperty(dpy, menu->win, netatom[NetWMWindowType], XA_ATOM, 32,
+	                	PropModeReplace,
+	                	(unsigned char *)&netatom[NetWMWindowTypePopupMenu], 1);
 	}
-	XStringListToTextProperty(&title, 1, &wintitle);
-
-	/* set window manager hints */
-	sizeh.flags = USPosition | PMaxSize | PMinSize;
-	sizeh.min_width = sizeh.max_width = menu->w;
-	sizeh.min_height = sizeh.max_height = menu->h;
-	XSetWMProperties(dpy, menu->win, &wintitle, NULL, NULL, 0, &sizeh, NULL, classh);
-
-	/* set WM protocols and ewmh window properties */
-	XSetWMProtocols(dpy, menu->win, &wmdelete, 1);
-	XChangeProperty(dpy, menu->win, netatom[NetWMName], utf8string, 8,
-	                PropModeReplace, (unsigned char *)title, strlen(title));
-	XChangeProperty(dpy, menu->win, netatom[NetWMWindowType], XA_ATOM, 32,
-	                PropModeReplace,
-	                (unsigned char *)&netatom[NetWMWindowTypePopupMenu], 1);
 
 	/* calculate positions of submenus */
 	for (item = menu->list; item != NULL; item = item->next) {
 		if (item->submenu != NULL)
-			setupmenu(item->submenu, classh);
+			setupmenu(item->submenu, mon);
 	}
 }
 
@@ -808,22 +1081,42 @@ ungrab(void)
 	XUngrabKeyboard(dpy, CurrentTime);
 }
 
+/* check if path is absolute or relative to current directory */
+static int
+isabsolute(const char *s)
+{
+	return s[0] == '/' || (s[0] == '.' && (s[1] == '/' || (s[1] == '.' && s[2] == '/')));
+}
+
 /* load and scale icon */
 static Imlib_Image
 loadicon(const char *file)
 {
 	Imlib_Image icon;
 	Imlib_Load_Error errcode;
+	char path[PATH_MAX];
 	const char *errstr;
 	int width;
 	int height;
 	int imgsize;
+	int i;
 
-	icon = imlib_load_image_with_error_return(file, &errcode);
 	if (*file == '\0') {
 		warnx("could not load icon (file name is blank)");
 		return NULL;
-	} else if (icon == NULL) {
+	}
+	if (isabsolute(file))
+		icon = imlib_load_image_with_error_return(file, &errcode);
+	else {
+		for (i = 0; i < niconpaths; i++) {
+			snprintf(path, sizeof(path), "%s/%s", iconpaths[i], file);
+			icon = imlib_load_image_with_error_return(path, &errcode);
+			if (icon != NULL || errcode != IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST) {
+				break;
+			}
+		}
+	}
+	if (icon == NULL) {
 		switch (errcode) {
 		case IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST:
 			errstr = "file does not exist";
@@ -867,7 +1160,7 @@ loadicon(const char *file)
 
 	width = imlib_image_get_width();
 	height = imlib_image_get_height();
-	imgsize = MIN(width, height);
+	imgsize = min(width, height);
 
 	icon = imlib_create_cropped_scaled_image(0, 0, imgsize, imgsize,
 	                                         config.iconsize,
@@ -886,22 +1179,20 @@ drawitems(struct Menu *menu)
 	int x, y;
 
 	for (item = menu->list; item != NULL; item = item->next) {
-		item->unsel = XCreatePixmap(dpy, menu->win, menu->w, item->h,
-		                          DefaultDepth(dpy, screen));
+		item->unsel = XCreatePixmap(dpy, menu->win, menu->w, item->h, depth);
 
 		XSetForeground(dpy, dc.gc, dc.normal[ColorBG].pixel);
 		XFillRectangle(dpy, item->unsel, dc.gc, 0, 0, menu->w, item->h);
 
 		if (item->label == NULL) { /* item is separator */
-			y = item->h/2;
+			y = item->h / 2;
 			XSetForeground(dpy, dc.gc, dc.separator.pixel);
 			XDrawLine(dpy, item->unsel, dc.gc, config.horzpadding, y,
 			          menu->w - config.horzpadding, y);
 
 			item->sel = item->unsel;
 		} else {
-			item->sel = XCreatePixmap(dpy, menu->win, menu->w, item->h,
-			                          DefaultDepth(dpy, screen));
+			item->sel = XCreatePixmap(dpy, menu->win, menu->w, item->h, depth);
 			XSetForeground(dpy, dc.gc, dc.selected[ColorBG].pixel);
 			XFillRectangle(dpy, item->sel, dc.gc, 0, 0, menu->w, item->h);
 
@@ -973,47 +1264,73 @@ drawmenus(struct Menu *currmenu)
 {
 	struct Menu *menu;
 	struct Item *item;
+	int y0, y;
+	int maxh;
 
 	for (menu = currmenu; menu != NULL; menu = menu->parent) {
 		if (!menu->drawn) {
 			drawitems(menu);
 			menu->drawn = 1;
 		}
-		for (item = menu->list; item != NULL; item = item->next) {
-			if (item == menu->selected)
-				XCopyArea(dpy, item->sel, menu->win, dc.gc, 0, 0,
-				          menu->w, item->h, 0, item->y);
-			else
-				XCopyArea(dpy, item->unsel, menu->win, dc.gc, 0, 0,
-				          menu->w, item->h, 0, item->y);
+		if (menu->overflow && menu->selected != NULL) {
+			maxh = menu->h - config.height_pixels * 2;
+			while (menu->first->next != NULL &&
+			       menu->selected->y >= menu->first->y + maxh) {
+				menu->first = menu->first->next;
+			}
+			while (menu->first->prev != NULL &&
+			       menu->selected->y < menu->first->y) {
+				menu->first = menu->first->prev;
+			}
+		}
+		y = menu->first->y;
+		y0 = menu->overflow ? config.height_pixels : 0;
+		for (item = menu->first; item != NULL; item = item->next) {
+			if (menu->overflow && item->y - y + item->h > menu->h - config.height_pixels * 2)
+				break;
+			if (item == menu->selected) {
+				XCopyArea(dpy, item->sel, menu->win, dc.gc, 0, 0, menu->w, item->h, 0, y0 + item->y - y);
+			} else {
+				XCopyArea(dpy, item->unsel, menu->win, dc.gc, 0, 0, menu->w, item->h, 0, y0 + item->y - y);
+			}
 		}
 	}
 }
 
-/* umap previous menus and map current menu and its parents */
+/* unmap current menu and its parents */
 static void
-mapmenu(struct Menu *currmenu)
+unmapmenu(struct Menu *currmenu)
+{
+	struct Menu *menu;
+
+	for (menu = currmenu; menu != NULL; menu = menu->parent) {
+		menu->selected = NULL;
+		XUnmapWindow(dpy, menu->win);
+	}
+}
+
+/* umap previous menus and map current menu and its parents */
+static struct Menu *
+mapmenu(struct Menu *currmenu, struct Menu *prevmenu, struct Monitor *mon)
 {
-	static struct Menu *prevmenu = NULL;
 	struct Menu *menu, *menu_;
 	struct Menu *lcamenu;   /* lowest common ancestor menu */
-	unsigned minlevel;      /* level of the closest to root menu */
-	unsigned maxlevel;      /* level of the closest to root menu */
+	int minlevel;           /* level of the closest to root menu */
+	int maxlevel;           /* level of the closest to root menu */
 
 	/* do not remap current menu if it wasn't updated*/
 	if (prevmenu == currmenu)
-		return;
+		goto done;
 
 	/* if this is the first time mapping, skip calculations */
 	if (prevmenu == NULL) {
 		XMapWindow(dpy, currmenu->win);
-		prevmenu = currmenu;
-		return;
+		goto done;
 	}
 
 	/* find lowest common ancestor menu */
-	minlevel = MIN(currmenu->level, prevmenu->level);
-	maxlevel = MAX(currmenu->level, prevmenu->level);
+	minlevel = min(currmenu->level, prevmenu->level);
+	maxlevel = max(currmenu->level, prevmenu->level);
 	if (currmenu->level == maxlevel) {
 		menu = currmenu;
 		menu_ = prevmenu;
@@ -1037,17 +1354,16 @@ mapmenu(struct Menu *currmenu)
 
 	/* map menus from currmenu (inclusive) until lcamenu (exclusive) */
 	for (menu = currmenu; menu != lcamenu; menu = menu->parent) {
-
 		if (wflag) {
-			setupmenupos(menu);
+			setupmenupos(menu, mon);
 			XMoveWindow(dpy, menu->win, menu->x, menu->y);
 		}
-
 		XMapWindow(dpy, menu->win);
 	}
 
-	prevmenu = currmenu;
 	grabfocus(currmenu->win);
+done:
+	return currmenu;
 }
 
 /* get menu of given window */
@@ -1063,20 +1379,40 @@ getmenu(struct Menu *currmenu, Window win)
 	return NULL;
 }
 
-/* get item of given menu and position */
-static struct Item *
-getitem(struct Menu *menu, int y)
+/* get in *ret the item in given menu and position; return 1 if position is on a scroll triangle */
+static int
+getitem(struct Menu *menu, struct Item **ret, int y)
 {
 	struct Item *item;
+	int y0;
 
+	*ret = NULL;
 	if (menu == NULL)
-		return NULL;
-
-	for (item = menu->list; item != NULL; item = item->next)
-		if (y >= item->y && y <= item->y + item->h)
-			return item;
-
-	return NULL;
+		return 0;
+	if (menu->overflow) {
+		if (y < config.height_pixels) {
+			*ret = menu->first->prev;
+			return 1;
+		} else if (y > menu->h - config.height_pixels) {
+			y0 = menu->overflow ? config.height_pixels : 0;
+			y = menu->h - y0 + menu->first->y;
+			for (item = menu->first; item != NULL; item = item->next)
+				if (y >= item->y && y <= item->y + item->h)
+					break;
+			if (item != NULL)
+				*ret = menu->first->next;
+			return 1;
+		}
+	}
+	y0 = menu->overflow ? config.height_pixels : 0;
+	y -= y0 - menu->first->y;
+	for (item = menu->first; item != NULL; item = item->next) {
+		if (y >= item->y && y <= item->y + item->h) {
+			*ret = item;
+			break;
+		}
+	}
+	return 0;
 }
 
 /* cycle through the items; non-zero direction is next, zero is prev */
@@ -1255,11 +1591,11 @@ normalizeksym(KeySym ksym)
 
 /* run event loop */
 static void
-run(struct Menu *currmenu)
+run(struct Menu *currmenu, struct Monitor *mon)
 {
 	char text[BUFSIZ];
 	char buf[32];
-	struct Menu *menu;
+	struct Menu *menu, *prevmenu;
 	struct Item *item;
 	struct Item *previtem = NULL;
 	struct Item *lastitem, *select;
@@ -1272,7 +1608,7 @@ run(struct Menu *currmenu)
 	int i;
 
 	text[0] = '\0';
-	mapmenu(currmenu);
+	prevmenu = currmenu;
 	while (!XNextEvent(dpy, &ev)) {
 		if (XFilterEvent(&ev, None))
 			continue;
@@ -1285,7 +1621,8 @@ run(struct Menu *currmenu)
 		case MotionNotify:
 			if (!warped) {
 				menu = getmenu(currmenu, ev.xbutton.window);
-				item = getitem(menu, ev.xbutton.y);
+				if (getitem(menu, &item, ev.xbutton.y))
+					break;
 				if (menu == NULL || item == NULL || previtem == item)
 					break;
 				previtem = item;
@@ -1309,7 +1646,12 @@ run(struct Menu *currmenu)
 				action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW | ACTION_WARP;
 			} else if (isclickbutton(ev.xbutton.button)) {
 				menu = getmenu(currmenu, ev.xbutton.window);
-				item = getitem(menu, ev.xbutton.y);
+				if (getitem(menu, &item, ev.xbutton.y) && item != NULL) {
+					select = NULL;
+					menu->first = item;
+					action = ACTION_CLEAR | ACTION_SELECT | ACTION_MAP | ACTION_DRAW;
+					break;
+				}
 				if (menu == NULL || item == NULL)
 					break;
 enteritem:
@@ -1319,7 +1661,7 @@ enteritem:
 					currmenu = item->submenu;
 				} else {
 					printf("%s\n", item->output);
-					return;
+					goto done;
 				}
 				select = currmenu->list;
 				action = ACTION_CLEAR | ACTION_SELECT | ACTION_MAP | ACTION_DRAW;
@@ -1331,7 +1673,7 @@ enteritem:
 		case ButtonPress:
 			menu = getmenu(currmenu, ev.xbutton.window);
 			if (menu == NULL)
-				return;
+				goto done;
 			break;
 		case KeyPress:
 			len = XmbLookupString(currmenu->xic, &ev.xkey, buf, sizeof buf, &ksym, &status);
@@ -1347,7 +1689,7 @@ enteritem:
 
 			/* esc closes xmenu when current menu is the root menu */
 			if (ksym == XK_Escape && currmenu->parent == NULL)
-				return;
+				goto done;
 
 			/* Shift-Tab = ISO_Left_Tab */
 			if (ksym == XK_Tab && (ev.xkey.state & ShiftMask))
@@ -1440,12 +1782,12 @@ append:
 			menu->y = ev.xconfigure.y;
 			break;
 		case ClientMessage:
-			if ((unsigned long) ev.xclient.data.l[0] != wmdelete)
+			if ((unsigned long)ev.xclient.data.l[0] != wmdelete)
 				break;
 			/* user closed window */
 			menu = getmenu(currmenu, ev.xclient.window);
 			if (menu->parent == NULL)
-				return;     /* closing the root menu closes the program */
+				goto done;  /* closing the root menu closes the program */
 			currmenu = menu->parent;
 			action = ACTION_MAP;
 			break;
@@ -1455,7 +1797,7 @@ append:
 		if (action & ACTION_SELECT)
 			currmenu->selected = select;
 		if (action & ACTION_MAP)
-			mapmenu(currmenu);
+			prevmenu = mapmenu(currmenu, prevmenu, mon);
 		if (action & ACTION_DRAW)
 			drawmenus(currmenu);
 		if (action & ACTION_WARP) {
@@ -1463,6 +1805,9 @@ append:
 			warped = 1;
 		}
 	}
+done:
+	unmapmenu(currmenu);
+	ungrab();
 }
 
 /* recursivelly free pixmaps and destroy windows */
@@ -1514,8 +1859,9 @@ cleandc(void)
 int
 main(int argc, char *argv[])
 {
+	struct Monitor mon;
 	struct Menu *rootmenu;
-	XClassHint classh;
+	XEvent ev;
 
 	/* open connection to server and set X variables */
 	if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
@@ -1526,6 +1872,7 @@ main(int argc, char *argv[])
 	visual = DefaultVisual(dpy, screen);
 	rootwin = RootWindow(dpy, screen);
 	colormap = DefaultColormap(dpy, screen);
+	depth = DefaultDepth(dpy, screen);
 	XrmInitialize();
 	if ((xrm = XResourceManagerString(dpy)) != NULL)
 		xdb = XrmGetStringDatabase(xrm);
@@ -1534,8 +1881,7 @@ main(int argc, char *argv[])
 
 	/* process configuration and window class */
 	getresources();
-	classh.res_class = PROGNAME;
-	classh.res_name = getoptions(argc, argv);
+	getoptions(argc, argv);
 
 	/* imlib2 stuff */
 	if (!iflag) {
@@ -1547,28 +1893,46 @@ main(int argc, char *argv[])
 	}
 
 	/* initializers */
-	initmonitor();
 	initdc();
 	initiconsize();
 	initatoms();
 
-	/* generate menus and set them up */
+	/* if running in root mode, get button presses from root window */
+	if (rootmodeflag)
+		XGrabButton(dpy, button, AnyModifier, rootwin, False, ButtonPressMask, GrabModeSync, GrabModeSync, None, None);
+
+	/* generate menus */
 	rootmenu = parsestdin();
 	if (rootmenu == NULL)
 		errx(1, "no menu generated");
-	setupmenu(rootmenu, &classh);
-
-	/* grab mouse and keyboard */
-	if (!wflag) {
-		grabpointer();
-		grabkeyboard();
-	}
 
 	/* run event loop */
-	run(rootmenu);
+	do {
+		if (rootmodeflag)
+			XNextEvent(dpy, &ev);
+		if (!rootmodeflag ||
+		    (ev.type == ButtonPress &&
+		     ((modifier != 0 && ev.xbutton.state == modifier) ||
+		      (ev.xbutton.subwindow == None)))) {
+			if (rootmodeflag && passclickflag) {
+				XAllowEvents(dpy, ReplayPointer, CurrentTime);
+			}
+			getmonitor(&mon);
+			if (!wflag) {
+				grabpointer();
+				grabkeyboard();
+			}
+			setupmenu(rootmenu, &mon);
+			mapmenu(rootmenu, NULL, &mon);
+			XFlush(dpy);
+			run(rootmenu, &mon);
+			firsttime = 0;
+		} else {
+			XAllowEvents(dpy, ReplayPointer, CurrentTime);
+		}
+	} while (rootmodeflag);
 
 	/* clean stuff */
-	ungrab();
 	cleanmenu(rootmenu);
 	cleandc();
 	XrmDestroyDatabase(xdb);
diff --git a/xmenu/.local/share/xmenu/xmenu.h b/xmenu/.local/share/xmenu/xmenu.h
deleted file mode 100644
index 5e369a2..0000000
--- a/xmenu/.local/share/xmenu/xmenu.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#define PROGNAME "xmenu"
-
-/* Actions for the main loop */
-#define ACTION_NOP    0
-#define ACTION_CLEAR  1<<0      /* clear text */
-#define ACTION_SELECT 1<<1      /* select item */
-#define ACTION_MAP    1<<2      /* remap menu windows */
-#define ACTION_DRAW   1<<3      /* redraw menu windows */
-#define ACTION_WARP   1<<4      /* warp the pointer */
-
-/* enum for keyboard menu navigation */
-enum { ITEMPREV, ITEMNEXT, ITEMFIRST, ITEMLAST };
-
-/* enum for text alignment */
-enum {LeftAlignment, CenterAlignment, RightAlignment};
-
-/* macros */
-#define LEN(x)              (sizeof (x) / sizeof (x[0]))
-#define MAX(x,y)            ((x)>(y)?(x):(y))
-#define MIN(x,y)            ((x)<(y)?(x):(y))
-#define BETWEEN(x, a, b)    ((a) <= (x) && (x) <= (b))
-#define GETNUM(n, s) { \
-	unsigned long __TMP__; \
-	if ((__TMP__ = strtoul((s), NULL, 10)) < INT_MAX) \
-		(n) = __TMP__; \
-	}
-
-/* color enum */
-enum {ColorFG, ColorBG, ColorLast};
-
-/* EWMH atoms */
-enum {NetWMName, NetWMWindowType, NetWMWindowTypePopupMenu, NetLast};
-
-/* configuration structure */
-struct Config {
-	/* the values below are set by config.h */
-	const char *font;
-	const char *background_color;
-	const char *foreground_color;
-	const char *selbackground_color;
-	const char *selforeground_color;
-	const char *separator_color;
-	const char *border_color;
-	int width_pixels;
-	int height_pixels;
-	int border_pixels;
-	int separator_pixels;
-	int gap_pixels;
-	int triangle_width;
-	int triangle_height;
-	int iconpadding;
-	int horzpadding;
-	int alignment;
-
-	/* the values below are set by options */
-	int monitor;
-	int posx, posy;         /* rootmenu position */
-
-	/* the value below is computed by xmenu */
-	int iconsize;
-};
-
-/* draw context structure */
-struct DC {
-	XftColor normal[ColorLast];
-	XftColor selected[ColorLast];
-	XftColor border;
-	XftColor separator;
-
-	GC gc;
-
-	FcPattern *pattern;
-	XftFont **fonts;
-	size_t nfonts;
-};
-
-/* menu item structure */
-struct Item {
-	char *label;            /* string to be drawed on menu */
-	char *output;           /* string to be outputed when item is clicked */
-	char *file;             /* filename of the icon */
-	int y;                  /* item y position relative to menu */
-	int h;                  /* item height */
-	int textw;              /* text width */
-	struct Item *prev;      /* previous item */
-	struct Item *next;      /* next item */
-	struct Menu *submenu;   /* submenu spawned by clicking on item */
-	Drawable sel, unsel;    /* pixmap for selected and unselected item */
-	Imlib_Image icon;
-};
-
-/* monitor geometry structure */
-struct Monitor {
-	int x, y, w, h;         /* monitor geometry */
-};
-
-/* menu structure */
-struct Menu {
-	struct Menu *parent;    /* parent menu */
-	struct Item *caller;    /* item that spawned the menu */
-	struct Item *list;      /* list of items contained by the menu */
-	struct Item *selected;  /* item currently selected in the menu */
-	int x, y, w, h;         /* menu geometry */
-	int hasicon;            /* whether the menu has item with icons */
-	int drawn;              /* whether the menu was already drawn */
-	int maxtextw;           /* maximum text width */
-	unsigned level;         /* menu level relative to root */
-	Window win;             /* menu window to map on the screen */
-	XIC xic;                /* input context */
-};
diff --git a/xmenu/.local/share/xmenu/xmenu.o b/xmenu/.local/share/xmenu/xmenu.o
index 623207f..06604e0 100644
Binary files a/xmenu/.local/share/xmenu/xmenu.o and b/xmenu/.local/share/xmenu/xmenu.o differ
diff --git a/xmenu/.local/share/xmenu/xmenu.sh b/xmenu/.local/share/xmenu/xmenu.sh
old mode 100644
new mode 100755