diff --git a/files/foot/foot.ini b/files/foot/foot.ini
index d605818..19247e2 100644
--- a/files/foot/foot.ini
+++ b/files/foot/foot.ini
@@ -26,7 +26,7 @@ font-bold-italic=SauceCodePro Nerd Font Mono:size=10.50:weight=bold:slant=italic
 # initial-window-size-pixels=700x500  # Or,
 # initial-window-size-chars=<COLSxROWS>
 # initial-window-mode=windowed
-# pad=0x0                             # optionally append 'center'
+pad=5x5
 # resize-by-cells=yes
 # resize-keep-grid=yes
 # resize-delay-ms=100
diff --git a/files/river/init b/files/river/init
index d1c9fba..9b6f565 100755
--- a/files/river/init
+++ b/files/river/init
@@ -15,7 +15,7 @@ riverctl map normal Super+Shift B spawn firefox
 riverctl map normal Super+Shift Q exit
 
 # Super+C to close the focused view
-riverctl map normal Super C close
+riverctl map normal Super+Shift C close
 
 # Super+H to shift the focus to the previous view in the layout stack
 # Super+L to shift the focus to the next view in the layout stack
@@ -68,10 +68,40 @@ riverctl map normal Super+Alt+Shift J resize vertical 100
 riverctl map normal Super+Alt+Shift K resize vertical -100
 riverctl map normal Super+Alt+Shift L resize horizontal 100
 
+# Super+Space to toggle float
+riverctl map normal Super Space toggle-float
+
+# Super+Shift+F to togglefullscreen
+riverctl map normal Super+Shift F toggle-fullscreen
+
+# Tags
+for i in $(seq 1 4)
+do
+    tags=$((1 << (i - 1)))
+
+    # Super+[1-4] to focus tag [0-3]
+    riverctl map normal Super "${i}" set-focused-tags "${tags}"
+
+    # Super+Shift+[1-4] to tag focused view with tag [0-3]
+    riverctl map normal Super+Shift "${i}" set-view-tags "${tags}"
+
+    # Super+Control+[1-4] to toggle focus of tag [0-3]
+    riverctl map normal Super+Control "${i}" toggle-focused-tags "${tags}"
+
+    # Super+Shift+Control+[1-4] to toggle tag [0-3] of focused view
+    riverctl map normal Super+Shift+Control "${i}" toggle-view-tags "${tags}"
+done
+
+# Super+0 to focus all tags
+# Super+Shift+0 to tag focused view with all tags
+all_tags=$(((1 << 32) - 1))
+riverctl map normal Super 0 set-focused-tags "${all_tags}"
+riverctl map normal Super+Shift 0 set-view-tags "${all_tags}"
+
 # Configure the keyboard layout
 riverctl keyboard-layout gb
 
 # Set the default layout generator to be rivertile and start it.
 # River will send the process group of the init executable SIGTERM on exit.
 riverctl default-layout rivertile
-rivertile -view-padding 6 -outer-padding 6 &
+rivertile -view-padding 3 -outer-padding 6 -main-location right -main-ratio 0.5 &
diff --git a/hosts/sparrow.json b/hosts/sparrow.json
index e86a87d..c614870 100644
--- a/hosts/sparrow.json
+++ b/hosts/sparrow.json
@@ -37,6 +37,7 @@
       ".local/opt",
       ".local/state/bash",
       ".local/state/less",
+      ".local/state/logs",
       "Docker",
       "Laboratory",
       "Notes",
diff --git a/magefiles/main.go b/magefiles/main.go
deleted file mode 100644
index 8883df9..0000000
--- a/magefiles/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-//go:build ignore
-
-package main
-
-import (
-	"os"
-
-	"github.com/magefile/mage/mage"
-)
-
-func main() {
-	os.Exit(mage.Main())
-}
diff --git a/magefiles/all.go b/magefiles/manager.go
similarity index 80%
rename from magefiles/all.go
rename to magefiles/manager.go
index db4e79e..9fa6526 100644
--- a/magefiles/all.go
+++ b/magefiles/manager.go
@@ -10,7 +10,11 @@ var Default = All
 
 // All runs all the management tasks.
 func All() error {
-	mg.Deps(Directories, Files, Templates)
+	mg.Deps(
+		Directories,
+		Files,
+		Templates,
+	)
 
 	return nil
 }