diff --git a/options.xhtml b/options.xhtml
index cc334b1ca..fa504e84e 100644
--- a/options.xhtml
+++ b/options.xhtml
@@ -13580,7 +13580,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>The Alacritty package to install.</p>
+<p>The alacritty package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -20159,7 +20159,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>The Eclipse package to install.</p>
+<p>The eclipse package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -20489,7 +20489,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>The eww package to install.</p>
+<p>The eww package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -20497,9 +20497,6 @@ package</p>
 <p><span class="emphasis"><em>Default:</em></span>
 <code class="literal">pkgs.eww</code></p>
 
-<p><span class="emphasis"><em>Example:</em></span>
-<code class="literal">pkgs.eww</code></p>
-
 <p><span class="emphasis"><em>Declared by:</em></span></p>
 <table border="0" summary="Simple list" class="simplelist">
 <tr><td>
@@ -22492,7 +22489,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>The fish package to install. May be used to change the version.</p>
+<p>The fish package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -24095,7 +24092,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>The foot package to install</p>
+<p>The foot package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -25549,7 +25546,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>Git package to install. Use <code class="varname">pkgs.gitAndTools.gitFull</code>
+<p>The git package to use. Use <code class="varname">pkgs.gitFull</code>
 to gain access to <span class="command"><strong>git send-email</strong></span> for instance.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
@@ -25558,6 +25555,9 @@ package</p>
 <p><span class="emphasis"><em>Default:</em></span>
 <code class="literal">pkgs.git</code></p>
 
+<p><span class="emphasis"><em>Example:</em></span>
+<code class="literal">pkgs.gitFull</code></p>
+
 <p><span class="emphasis"><em>Declared by:</em></span></p>
 <table border="0" summary="Simple list" class="simplelist">
 <tr><td>
@@ -31551,7 +31551,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>The ion package to install. May be used to change the version.</p>
+<p>The ion package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -32063,14 +32063,16 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>Java package to install. Typical values are
-<code class="literal">pkgs.jdk</code> or <code class="literal">pkgs.jre</code>.</p>
+<p>The java package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
 
 <p><span class="emphasis"><em>Default:</em></span>
-<code class="literal">&quot;pkgs.jdk&quot;</code></p>
+<code class="literal">pkgs.jdk</code></p>
+
+<p><span class="emphasis"><em>Example:</em></span>
+<code class="literal">pkgs.jre</code></p>
 
 <p><span class="emphasis"><em>Declared by:</em></span></p>
 <table border="0" summary="Simple list" class="simplelist">
@@ -34658,7 +34660,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>Keychain package to install.</p>
+<p>The keychain package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -35271,7 +35273,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>Kitty package to install.</p>
+<p>The kitty package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -37598,7 +37600,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>The Mangohud package to install.</p>
+<p>The mangohud package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -38198,7 +38200,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>Mercurial package to install.</p>
+<p>The mercurial package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -38842,7 +38844,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>The mods package to install</p>
+<p>The mods package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -43428,7 +43430,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>OBS Studio package to install.</p>
+<p>The obs-studio package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -44154,7 +44156,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>Opam package to install.</p>
+<p>The opam package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -45950,7 +45952,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>The pqiv package to install.</p>
+<p>The pqiv package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -46535,7 +46537,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>Qutebrowser package to install.</p>
+<p>The qutebrowser package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -53241,7 +53243,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>The swayimg package to install</p>
+<p>The swayimg package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -53978,15 +53980,12 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>terminator package to install.</p>
+<p>The terminator package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
 
 <p><span class="emphasis"><em>Default:</em></span>
-<code class="literal">&lt;derivation terminator-2.1.4&gt;</code></p>
-
-<p><span class="emphasis"><em>Example:</em></span>
 <code class="literal">pkgs.terminator</code></p>
 
 <p><span class="emphasis"><em>Declared by:</em></span></p>
@@ -56240,7 +56239,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>Tint2 package to install.</p>
+<p>The tint2 package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -56316,7 +56315,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>The <span class="command"><strong>tiny</strong></span> package to install.</p>
+<p>The tiny package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -56414,7 +56413,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>The tmate package to install.</p>
+<p>The tmate package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -56422,9 +56421,6 @@ package</p>
 <p><span class="emphasis"><em>Default:</em></span>
 <code class="literal">pkgs.tmate</code></p>
 
-<p><span class="emphasis"><em>Example:</em></span>
-<code class="literal">pkgs.tmate</code></p>
-
 <p><span class="emphasis"><em>Declared by:</em></span></p>
 <table border="0" summary="Simple list" class="simplelist">
 <tr><td>
@@ -56601,7 +56597,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>The tmux package to install</p>
+<p>The tmux package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -56609,9 +56605,6 @@ package</p>
 <p><span class="emphasis"><em>Default:</em></span>
 <code class="literal">pkgs.tmux</code></p>
 
-<p><span class="emphasis"><em>Example:</em></span>
-<code class="literal">pkgs.tmux</code></p>
-
 <p><span class="emphasis"><em>Declared by:</em></span></p>
 <table border="0" summary="Simple list" class="simplelist">
 <tr><td>
@@ -57608,7 +57601,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>rxvt-unicode package to install.</p>
+<p>The rxvt-unicode package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -59715,7 +59708,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>The Wezterm package to install.</p>
+<p>The wezterm package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -62063,7 +62056,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>Zoxide package to install.</p>
+<p>The zoxide package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -73858,7 +73851,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>Which lorri package to install.</p>
+<p>The lorri package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -80556,7 +80549,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>Polybar package to install.</p>
+<p>The polybar package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>
@@ -82916,7 +82909,7 @@ boolean</p>
  </span>
 </dt>
 <dd>
-<p>Swayidle package to install.</p>
+<p>The swayidle package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
 package</p>