diff --git a/.gitmodules b/.gitmodules
index 912e41d..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "global/.config/mutt/gruvbox"]
-	path = global/.config/mutt/gruvbox
-	url = https://git.sthu.org/repos/mutt-gruvbox.git
diff --git a/global/.config/mutt/gruvbox/README.md b/global/.config/mutt/gruvbox/README.md
deleted file mode 100644
index f99e0fe..0000000
--- a/global/.config/mutt/gruvbox/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# A gruvbox color scheme for mutt and neomutt
-
-## Description
-
-[Gruvbox](https://github.com/morhetz/gruvbox) is a well designed, popular
-colorscheme for vim. This is a port to mutt and neomutt, in which vim can act
-as mail composer.
-
-This is a replication of the repository
-[here](https://git.sthu.org/?p=mutt-gruvbox.git;a=summary). The
-[website](https://www.sthu.org/code/codesnippets/mutt-gruvbox.html) gives
-further details and a screenshot, like this:
-
-![screenshot](https://www.sthu.org/code/codesnippets/img/mutt-gruvbox.png)
-
-
-## Usage
-
-Download the files or clone the repo, e.g.
-
-    cd ~/.mutt
-    git clone https://git.sthu.org/repos/mutt-gruvbox.git gruvbox
-
-Then source them in your `~/.mutt/muttrc`, e.g.
-
-    source ~/.mutt/gruvbox/colors-gruvbox-shuber.muttrc
-    # For neomutt also add this line:
-    # source ~/.mutt/gruvbox/colors-gruvbox-shuber-extended.muttrc
-
-The colorscheme is split into two files, where the latter also defines colors
-for neomutt.
-
-## License
-
-GNU Lesser General Public License v3.
diff --git a/global/.config/mutt/gruvbox/colors-gruvbox-shuber-extended.muttrc b/global/.config/mutt/gruvbox/colors-gruvbox-shuber-extended.muttrc
deleted file mode 100644
index fb3eb1e..0000000
--- a/global/.config/mutt/gruvbox/colors-gruvbox-shuber-extended.muttrc
+++ /dev/null
@@ -1 +0,0 @@
-color sidebar_unread     color108 color234
diff --git a/global/.config/mutt/gruvbox/colors-gruvbox-shuber.muttrc b/global/.config/mutt/gruvbox/colors-gruvbox-shuber.muttrc
deleted file mode 100644
index c283d0f..0000000
--- a/global/.config/mutt/gruvbox/colors-gruvbox-shuber.muttrc
+++ /dev/null
@@ -1,121 +0,0 @@
-# gruvbox dark (contrast dark):
-
-# bg0    = 234
-# bg1    = 237
-# bg2    = 239
-# bg3    = 241
-# bg4    = 243
-# 
-# gray   = 245
-# 
-# fg0    = 229
-# fg1    = 223
-# fg2    = 250
-# fg3    = 248
-# fg4    = 246
-# 
-# red    = 167
-# green  = 142
-# yellow = 214
-# blue   = 109
-# purple = 175
-# aqua   = 108
-# orange = 208
-
-
-# See http://www.mutt.org/doc/manual/#color
-
-color attachment  color109 color234
-color bold        color229 color234
-color error       color167 color234
-color hdrdefault  color246 color234
-color indicator   color223 color237
-color markers     color243 color234
-color normal      color223 color234
-color quoted      color250 color234
-color quoted1     color108 color234
-color quoted2     color250 color234
-color quoted3     color108 color234
-color quoted4     color250 color234
-color quoted5     color108 color234
-color search      color234 color208
-color signature   color108 color234
-color status      color234 color250
-color tilde       color243 color234
-color tree        color142 color234
-color underline   color223 color239
-
-color sidebar_divider    color250 color234
-color sidebar_new        color142 color234
-
-color index color142 color234 ~N
-color index color108 color234 ~O
-color index color109 color234 ~P
-color index color214 color234 ~F
-color index color175 color234 ~Q
-color index color167 color234 ~=
-color index color234 color223 ~T
-color index color234 color167 ~D
-
-color header color214 color234 "^(To:|From:)"
-color header color142 color234 "^Subject:"
-color header color108 color234 "^X-Spam-Status:"
-color header color108 color234 "^Received:"
-
-# Regex magic for URLs and hostnames
-#
-# Attention: BSD's regex has RE_DUP_MAX set to 255.
-#
-# Examples:
-#   http://some-service.example.com
-#   example.com
-#   a.example.com
-#   some-service.example.com
-#   example.com/
-#   example.com/datenschutz
-#   file:///tmp/foo
-#
-# Non-examples:
-#   1.1.1900
-#   14.02.2022/24:00
-#   23.59
-#   w.l.o.g
-#   team.its
-color body color142 color234 "[a-z]{3,255}://[[:graph:]]*"
-color body color142 color234 "([-[:alnum:]]+\\.)+([0-9]{1,3}|[-[:alpha:]]+)/[[:graph:]]*"
-color body color142 color234 "([-[:alnum:]]+\\.){2,255}[-[:alpha:]]{2,10}"
-
-# IPv4 and IPv6 stolen from https://stackoverflow.com/questions/53497/regular-expression-that-matches-valid-ipv6-addresses
-color body color142 color234 "((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])"
-color body color142 color234 "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))"
-
-# Mail addresses and mailto URLs
-color body color208 color234 "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+"
-color body color208 color234 "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+"
-
-# some simleys and stuff
-color body color234 color214 "[;:]-*[)>(<lt;|]"
-color body color229 color234 "\\*[- A-Za-z]+\\*"
-
-color body color214 color234 "^-.*PGP.*-*"
-color body color142 color234 "^gpg: Good signature from"
-color body color167 color234 "^gpg: Can't.*$"
-color body color214 color234 "^gpg: WARNING:.*$"
-color body color167 color234 "^gpg: BAD signature from"
-color body color167 color234 "^gpg: Note: This key has expired!"
-color body color214 color234 "^gpg: There is no indication that the signature belongs to the owner."
-color body color214 color234 "^gpg: can't handle these multiple signatures"
-color body color214 color234 "^gpg: signature verification suppressed"
-color body color214 color234 "^gpg: invalid node with packet of type"
-
-color body color142 color234 "^Good signature from:"
-color body color167 color234 "^.?BAD.? signature from:"
-color body color142 color234 "^Verification successful"
-color body color167 color234 "^Verification [^s][^[:space:]]*$"
-
-color compose header            color223 color234
-color compose security_encrypt  color175 color234
-color compose security_sign     color109 color234
-color compose security_both     color142 color234
-color compose security_none     color208 color234
-
diff --git a/global/.config/mutt/mailcap b/global/.config/mutt/mailcap
index e5ba806..b28c975 100644
--- a/global/.config/mutt/mailcap
+++ b/global/.config/mutt/mailcap
@@ -1,4 +1,4 @@
-text/html; firefox %s; test=test -n "$display"; needsterminal;
+text/html; librewolf %s; test=test -n "$display"; needsterminal;
 text/html; lynx -assume_charset=%{charset} -display_charset=utf-8 -dump -width=1024 %s; nametemplate=%s.html; copiousoutput;
 text/plain; cat %s; copiousoutput
-application/pdf; firefox %s; test=test -n "$display"; needsterminal;
+application/pdf; librewolf %s; test=test -n "$display"; needsterminal;
diff --git a/global/.config/mutt/muttrc b/global/.config/mutt/muttrc
index af9cb95..574658c 100644
--- a/global/.config/mutt/muttrc
+++ b/global/.config/mutt/muttrc
@@ -127,5 +127,4 @@ macro index,pager \cb "<pipe-message> urlscan<Enter>" "call urlscan to extract U
 macro attach,compose \cb "<pipe-entry> urlscan<Enter>" "call urlscan to extract URLs out of a message"
 
 #theme
-source ~/.config/mutt/gruvbox/colors-gruvbox-shuber.muttrc
-source ~/.config/mutt/gruvbox/colors-gruvbox-shuber-extended.muttrc
+source ~/.config/mutt/colors.muttrc