diff --git a/.repo-stuff/bar-load.png b/.repo-stuff/bar-load.png
index a9e1151..94febe1 100644
Binary files a/.repo-stuff/bar-load.png and b/.repo-stuff/bar-load.png differ
diff --git a/.repo-stuff/bar.png b/.repo-stuff/bar.png
deleted file mode 100644
index dc50f55..0000000
Binary files a/.repo-stuff/bar.png and /dev/null differ
diff --git a/.repo-stuff/desktop.png b/.repo-stuff/desktop.png
index 60321b4..1cfc450 100644
Binary files a/.repo-stuff/desktop.png and b/.repo-stuff/desktop.png differ
diff --git a/.repo-stuff/rofi.png b/.repo-stuff/rofi.png
index 11b6faf..b4a12a8 100644
Binary files a/.repo-stuff/rofi.png and b/.repo-stuff/rofi.png differ
diff --git a/.repo-stuff/single-terminal.png b/.repo-stuff/single-terminal.png
new file mode 100644
index 0000000..c987ac2
Binary files /dev/null and b/.repo-stuff/single-terminal.png differ
diff --git a/README.md b/README.md
index c5f1cdb..5265826 100644
--- a/README.md
+++ b/README.md
@@ -1,47 +1,97 @@
 # Midgard's dotfiles
 
-Configuration based on elegant pure black.
-
 ## Screenshots
 
-These screenshots are slightly out of date, since I change my config without updating these each time.
-
-![Empty desktop](.repo-stuff/desktop.png)
+![Desktop showing nvim, screenfetch and ncmpcpp](.repo-stuff/desktop.png)
+![Desktop showing a single terminal, seamlessly blending with the bar](.repo-stuff/single-terminal.png)
 ![Open Rofi launcher](.repo-stuff/rofi.png)
 
-Background image shown:
-* original by [Charlesjsharp](https://commons.wikimedia.org/wiki/User:Charlesjsharp): [Red-billed streamertail (Trochilus polytmus) female in flight 2](https://commons.wikimedia.org/wiki/File:Red-billed_streamertail_(Trochilus_polytmus)_female_in_flight_2.JPG). Licensed under [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/deed.en)
-* modified by Midgard: darkened and made more green. Licensed under [CC0](https://creativecommons.org/publicdomain/zero/1.0/) (which means you only have to credit Charlesjsharp and mention that it was modified, you don't have to attribute it to me)
+When a CPU core is used, a graph for it appears. When the system temperature gets high, the temperature and fan speed are displayed. When RAM is running out, a warning is shown (not pictured).
+
+![Bar showing CPU and temperature indicators](.repo-stuff/bar-load.png)
 
 ## Requirements
 
-The Arch Linux package to install is between parentheses.
+The Arch Linux / Gentoo Linux packages to install are between parentheses.
 
-* i3-gaps ([community/i3-gaps](https://www.archlinux.org/packages/community/x86_64/i3-gaps/), window manager)
-* Rofi ([community/rofi](https://www.archlinux.org/packages/community/x86_64/rofi/), launcher)
-* Dunst ([community/dunst](https://www.archlinux.org/packages/community/x86_64/dunst/), notification daemon)
-* Polybar ([aur/polybar](https://aur.archlinux.org/packages/polybar), system bar)
-* python-notify2 ([aur/python-notify2](https://aur.archlinux.org/packages/python-notify2/), library to send notifications)
-* Mozilla's Fira fonts ([community/otf-fira-code](https://www.archlinux.org/packages/community/x86_64/otf-fira-code/), [community/otf-fira-mono](https://www.archlinux.org/packages/community/x86_64/otf-fira-mono/) and [community/otf-fira-sans](https://www.archlinux.org/packages/community/x86_64/otf-fira-sans/))
-* xfce4-terminal ([extra/xfce4-terminal](https://www.archlinux.org/packages/extra/x86_64/xfce4-terminal/), but you can choose your own terminal of course if you want)
-* NeoVim ([community/neovim](https://www.archlinux.org/packages/community/x86_64/neovim/), text editor)
-	* par ([aur/par](https://aur.archlinux.org/packages/par/) for nice text reflowing)
-	* xclip ([extra/xclip](https://www.archlinux.org/packages/extra/x86_64/xclip/) for clipboard integration)
-	* [YouCompleteMe](https://framagit.org/Midgard/YouCompleteMe)'s dependencies
-	* ripgrep ([community/ripgrep](https://www.archlinux.org/packages/community/x86_64/ripgrep/), smart grep)
-* acpilight ([aur/acpilight](https://aur.archlinux.org/packages/acpilight/), an xbacklight replacement that directly uses the kernel's API, works without X)
-* xrandr and arandr ([extra/xorg-xrandr](https://www.archlinux.org/packages/extra/x86_64/xorg-xrandr/) and [community/arandr](https://www.archlinux.org/packages/community/any/arandr/))
-* unclutter ([community/unclutter](https://www.archlinux.org/packages/community/x86_64/unclutter/), hide the mouse when it hasn't moved for some time)
+If you choose X:
+* i3-gaps
+  ([community/i3-gaps](https://www.archlinux.org/packages/community/x86_64/i3-gaps/) /
+  [x11-wm/i3-gaps](https://packages.gentoo.org/packages/x11-wm/i3-gaps),
+  window manager)
+* Polybar
+  ([community/polybar](https://archlinux.org/packages/community/x86_64/polybar/) /
+  [x11-misc/polybar](https://packages.gentoo.org/packages/x11-misc/polybar),
+  system bar)
+* Dunst
+  ([community/dunst](https://www.archlinux.org/packages/community/x86_64/dunst/) /
+  [x11-misc/dunst](https://packages.gentoo.org/packages/x11-misc/dunst),
+  notification daemon)
+* python-notify2
+  ([extra/python-notify2](https://archlinux.org/packages/extra/any/python-notify2/) /
+  [dev-python/notify2](https://packages.gentoo.org/packages/dev-python/notify2),
+  library to send notifications)
+* xrandr and arandr
+  ([extra/xorg-xrandr](https://www.archlinux.org/packages/extra/x86_64/xorg-xrandr/) and
+  [community/arandr](https://www.archlinux.org/packages/community/any/arandr/) /
+  [x11-apps/xrandr](https://packages.gentoo.org/packages/x11-apps/xrandr) and
+  [x11-misc/arandr](https://packages.gentoo.org/packages/x11-misc/arandr))
+* unclutter
+  ([community/unclutter](https://www.archlinux.org/packages/community/x86_64/unclutter/) /
+  [x11-misc/unclutter](https://packages.gentoo.org/packages/x11-misc/unclutter),
+  hide the mouse when it hasn't moved for some time)
+
+If you choose Wayland:
+* sway
+  ([community/sway](https://archlinux.org/packages/community/x86_64/sway/) /
+  [gui-wm/sway](https://packages.gentoo.org/packages/gui-wm/sway),
+  Wayland compositor + window manager)
+* yambar
+  ([aur/yambar](https://aur.archlinux.org/packages/yambar) /
+  [gui-apps/yambar::guru](https://gitweb.gentoo.org/repo/proj/guru.git/tree/gui-apps/yambar),
+  system bar)
+
+Both X and Wayland:
+* Rofi
+  ([community/rofi](https://www.archlinux.org/packages/community/x86_64/rofi/),
+  [x11-misc/rofi](https://packages.gentoo.org/packages/x11-misc/rofi)
+  launcher)
+* Mozilla's Fira fonts
+  ([community/otf-fira-code](https://www.archlinux.org/packages/community/x86_64/otf-fira-code/),
+  [community/otf-fira-mono](https://www.archlinux.org/packages/community/x86_64/otf-fira-mono/) and
+  [community/otf-fira-sans](https://www.archlinux.org/packages/community/x86_64/otf-fira-sans/) /
+  [media-fonts/fira-code](https://packages.gentoo.org/packages/media-fonts/fira-code),
+  [media-fonts/fira-mono](https://packages.gentoo.org/packages/media-fonts/fira-mono) and
+  [media-fonts/fira-sans](https://packages.gentoo.org/packages/media-fonts/fira-sans))
+* alacritty
+  ([community/alacritty](https://archlinux.org/packages/community/x86_64/alacritty/) /
+  [x11-terms/alacritty](https://packages.gentoo.org/packages/x11-terms/alacritty),
+  but you can choose your own terminal of course if you want)
+* NeoVim
+  ([community/neovim](https://www.archlinux.org/packages/community/x86_64/neovim/) /
+  [app-editors/neovim](https://packages.gentoo.org/packages/app-editors/neovim),
+  text editor)
+	* par
+	  ([aur/par](https://aur.archlinux.org/packages/par/) /
+	  [app-text/par](https://packages.gentoo.org/packages/app-text/par)
+	  for nice text reflowing)
+	* xclip
+	  ([extra/xclip](https://www.archlinux.org/packages/extra/x86_64/xclip/) /
+	  [x11-misc/xclip](https://packages.gentoo.org/packages/x11-misc/xclip)
+	  for clipboard integration on X)
+	* [YouCompleteMe](https://github.com/ycm-core/YouCompleteMe)'s dependencies
+	* ripgrep
+	  ([community/ripgrep](https://www.archlinux.org/packages/community/x86_64/ripgrep/),
+	  [sys-apps/ripgrep](https://packages.gentoo.org/packages/sys-apps/ripgrep)
+	  smart grep)
+* acpilight
+  ([community/acpilight](https://archlinux.org/packages/community/any/acpilight/),
+  [sys-power/acpilight](https://packages.gentoo.org/packages/sys-power/acpilight)
+  an xbacklight replacement that directly uses the kernel's API, also works without X)
 * driver for your video card that supports GLX
 
 ## Installation
 
 You are encouraged to copy stuff you like to your own configuration files. If you want to copy my setup, you can use the script `install.sh` (that script is normally mostly for myself though).
 
-Create a symlink to a background image in `~/.config/i3/background`.
-
-## TODO
-
-* Document more about how to get NeoVim and the plugins up and running.
-* Expand and test the install script.
-* Add my improved battery monitor script.
+Create a symlink to a background image in `~/.config/i3/background` or `~/.config/sway/background`, and to a lockscreen image in `~/.config/i3/background_lock` or `~/.config/sway/background_lock`.
diff --git a/i3/lock.sh b/i3/lock.sh
index 8d26487..2816ddb 100755
--- a/i3/lock.sh
+++ b/i3/lock.sh
@@ -17,6 +17,6 @@ if ! gpg-connect-agent reloadagent /bye; then
 #	notify-send -u normal -i lock -a i3 'Failed to clear GPG key cache' 'gpg-connect-agent had a non-zero exit code.'
 fi
 
-if ! i3lock --tiling --lock-console --show-failed-attempts --color=000000 --image="$HOME/img/bg/Red-billed_streamertail_Trochilus_polytmus_female_in_flight_2_lock.png"; then
+if ! i3lock --tiling --lock-console --show-failed-attempts --color=000000 --image="$HOME/.config/i3/background_lock"; then
 	exec i3lock
 fi
diff --git a/rofi/midgard.rasi b/rofi/midgard.rasi
index a298b36..a798d41 100644
--- a/rofi/midgard.rasi
+++ b/rofi/midgard.rasi
@@ -16,7 +16,7 @@
 	foreground:                  rgba(193, 193, 193, 100%);
 	alt-foreground:              rgba(193, 193, 193,  50%);
 	/*highlighted-background:      rgba( 85,  54,  31,  50%);*/
-	highlighted-background:      rgba(132, 107, 146,  50%);
+	highlighted-background:      rgba(155, 78, 66,  50%);
 
 	scrollbar-background:        transparent;
 	scrollbar-handle:            @alt-foreground;
@@ -31,7 +31,7 @@
 	location: south;
 	anchor: south;
 	children: [mainbox];
-	background-color: rgba(0,0,0,0.7);
+	background-color: rgba(0,0,0,0.0);
 	font: "Fira Code Light 14";
 }
 
@@ -43,7 +43,7 @@
 	expand: true;
 	padding: 0px 0px 6px;
 	/*margin: 0 25%;*/
-	background-color: rgba(0,0,0,0.6);
+	background-color: rgba(17, 17, 17, 0.85);
 }
 
 #element {
diff --git a/sway/config b/sway/config
index 4993960..5f5b482 100644
--- a/sway/config
+++ b/sway/config
@@ -15,14 +15,14 @@ set $term $HOME/.config/i3/terminal.sh
 # Note: it's recommended that you pass the final command to sway
 #set $menu dmenu_path | dmenu | xargs swaymsg exec --
 set $menu swaymsg -- exec "sh -c 'killall rofi || rofi -show combi'"
-set $lock swaylock -c 000000 -l -f -i $HOME/img/bg/lock.png
+set $lock swaylock -c 000000 -l -f -i $HOME/.config/sway/background_lock
 
 xwayland force
 
 ### Output configuration
 #
 # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
+output * bg $HOME/.config/sway/background fill
 #
 # Example configuration:
 #