diff --git a/src/embedded/man/files/main.n b/src/embedded/man/files/main.n
index 79d1771a..2056e30a 100644
--- a/src/embedded/man/files/main.n
+++ b/src/embedded/man/files/main.n
@@ -286,6 +286,6 @@ if you have not done so already, to get an overview of the whole system\&.
 .PP
 This document is the reference to commands and modules provided by punkshell
 .SH KEYWORDS
-shell repl
+punk, repl, shell
 .SH CATEGORY
 shell
diff --git a/src/embedded/man/index.n b/src/embedded/man/index.n
index 16492545..4620f64d 100644
--- a/src/embedded/man/index.n
+++ b/src/embedded/man/index.n
@@ -272,7 +272,19 @@ Database Class:	\\fB\\$3\\fR
 .SH INDEX
 doc
 .RS
-shell repl
+punk
+.RS
+.TP
+\fBfiles/main\&.n\fR
+punkshell
+.RE
+repl
+.RS
+.TP
+\fBfiles/main\&.n\fR
+punkshell
+.RE
+shell
 .RS
 .TP
 \fBfiles/main\&.n\fR
diff --git a/src/embedded/md/.idx b/src/embedded/md/.idx
index eaf8b456..f8edecb0 100644
--- a/src/embedded/md/.idx
+++ b/src/embedded/md/.idx
@@ -1 +1 @@
-{{shell repl} {{doc/files/main.md punkshell}}} {{{shell repl} doc/files/main.md punkshell} .} 1 {{shell repl} shell_repl}
\ No newline at end of file
+{shell {{doc/files/main.md punkshell}} punk {{doc/files/main.md punkshell}} repl {{doc/files/main.md punkshell}}} {{repl doc/files/main.md punkshell} . {shell doc/files/main.md punkshell} . {punk doc/files/main.md punkshell} .} 3 {shell shell punk punk repl repl}
\ No newline at end of file
diff --git a/src/embedded/md/.xrf b/src/embedded/md/.xrf
index bfda8175..b4028203 100644
--- a/src/embedded/md/.xrf
+++ b/src/embedded/md/.xrf
@@ -1 +1 @@
-{punkshell - Core} doc/files/main.md sa,punkshell(n) doc/files/main.md punkshell(n) doc/files/main.md {kw,shell repl} {index.md shell_repl} sa,punkshell doc/files/main.md punkshell doc/files/main.md {shell repl} {index.md shell_repl}
\ No newline at end of file
+{punkshell - Core} doc/files/main.md shell {index.md shell} kw,punk {index.md punk} sa,punkshell(n) doc/files/main.md punkshell(n) doc/files/main.md kw,repl {index.md repl} sa,punkshell doc/files/main.md punkshell doc/files/main.md kw,shell {index.md shell} punk {index.md punk} repl {index.md repl}
\ No newline at end of file
diff --git a/src/embedded/md/doc/files/main.md b/src/embedded/md/doc/files/main.md
index 5bea7212..27143523 100644
--- a/src/embedded/md/doc/files/main.md
+++ b/src/embedded/md/doc/files/main.md
@@ -38,7 +38,8 @@ This document is the reference to commands and modules provided by punkshell
 
 # <a name='keywords'></a>KEYWORDS
 
-[shell repl](\.\./\.\./index\.md\#shell\_repl)
+[punk](\.\./\.\./index\.md\#punk), [repl](\.\./\.\./index\.md\#repl),
+[shell](\.\./\.\./index\.md\#shell)
 
 # <a name='category'></a>CATEGORY
 
diff --git a/src/embedded/md/index.md b/src/embedded/md/index.md
index d50c03bb..2abf98a7 100644
--- a/src/embedded/md/index.md
+++ b/src/embedded/md/index.md
@@ -5,12 +5,26 @@
 
 ----
 
-[S](#cS)
+[P](#cP) &#183; [R](#cR) &#183; [S](#cS)
 
 ----
 
+#### <a name='cP'></a>Keywords: P
+
+|||
+|---|---|
+|<a name='punk'></a>punk|[punkshell](doc/files/main\.md)|
+
+
+#### <a name='cR'></a>Keywords: R
+
+|||
+|---|---|
+|<a name='repl'></a>repl|[punkshell](doc/files/main\.md)|
+
+
 #### <a name='cS'></a>Keywords: S
 
 |||
 |---|---|
-|<a name='shell\_repl'></a>shell repl|[punkshell](doc/files/main\.md)|
+|<a name='shell'></a>shell|[punkshell](doc/files/main\.md)|
diff --git a/src/embedded/www/.idx b/src/embedded/www/.idx
index cabab38f..df71b6a4 100644
--- a/src/embedded/www/.idx
+++ b/src/embedded/www/.idx
@@ -1 +1 @@
-{{shell repl} {{doc/files/main.html punkshell}}} {{{shell repl} doc/files/main.html punkshell} .} 1 {{shell repl} shell_repl}
\ No newline at end of file
+{shell {{doc/files/main.html punkshell}} punk {{doc/files/main.html punkshell}} repl {{doc/files/main.html punkshell}}} {{repl doc/files/main.html punkshell} . {shell doc/files/main.html punkshell} . {punk doc/files/main.html punkshell} .} 3 {shell shell punk punk repl repl}
\ No newline at end of file
diff --git a/src/embedded/www/.xrf b/src/embedded/www/.xrf
index 9c7dd4fa..698b9009 100644
--- a/src/embedded/www/.xrf
+++ b/src/embedded/www/.xrf
@@ -1 +1 @@
-{punkshell - Core} doc/files/main.html sa,punkshell(n) doc/files/main.html punkshell(n) doc/files/main.html {kw,shell repl} {index.html shell_repl} sa,punkshell doc/files/main.html punkshell doc/files/main.html {shell repl} {index.html shell_repl}
\ No newline at end of file
+{punkshell - Core} doc/files/main.html shell {index.html shell} kw,punk {index.html punk} sa,punkshell(n) doc/files/main.html punkshell(n) doc/files/main.html kw,repl {index.html repl} sa,punkshell doc/files/main.html punkshell doc/files/main.html kw,shell {index.html shell} punk {index.html punk} repl {index.html repl}
\ No newline at end of file
diff --git a/src/embedded/www/doc/files/main.html b/src/embedded/www/doc/files/main.html
index bf9fe8e8..813d6ff7 100644
--- a/src/embedded/www/doc/files/main.html
+++ b/src/embedded/www/doc/files/main.html
@@ -128,7 +128,7 @@ if you have not done so already, to get an overview of the whole system.</p>
 <p>This document is the reference to commands and modules provided by punkshell</p>
 </div>
 <div id="keywords" class="doctools_section"><h2><a name="keywords">Keywords</a></h2>
-<p><a href="../../index.html#shell_repl">shell repl</a></p>
+<p><a href="../../index.html#punk">punk</a>, <a href="../../index.html#repl">repl</a>, <a href="../../index.html#shell">shell</a></p>
 </div>
 <div id="category" class="doctools_section"><h2><a name="category">Category</a></h2>
 <p>shell</p>
diff --git a/src/embedded/www/index.html b/src/embedded/www/index.html
index b00d0be0..34b9c306 100644
--- a/src/embedded/www/index.html
+++ b/src/embedded/www/index.html
@@ -13,14 +13,30 @@
  ] <hr>
 <h3> Keyword Index </h3>
 <hr><div class="#doctools_idxnav">
-<a href="#cS"> S </a>
+<a href="#cP"> P </a> &#183; <a href="#cR"> R </a> &#183; <a href="#cS"> S </a>
 </div>
 <hr><table class="#doctools_idx" width="100%">
 <tr class="#doctools_idxheader"><th colspan="2">
+<a name="cP">Keywords: P</a>
+</th></tr>
+<tr class="#doctools_idxeven" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="punk"> punk </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="doc/files/main.html"> punkshell </a>
+</td></tr>
+<tr class="#doctools_idxheader"><th colspan="2">
+<a name="cR">Keywords: R</a>
+</th></tr>
+<tr class="#doctools_idxodd" valign=top>
+<td class="#doctools_idxleft" width="35%"><a name="repl"> repl </a></td>
+<td class="#doctools_idxright" width="65%">
+<a href="doc/files/main.html"> punkshell </a>
+</td></tr>
+<tr class="#doctools_idxheader"><th colspan="2">
 <a name="cS">Keywords: S</a>
 </th></tr>
 <tr class="#doctools_idxeven" valign=top>
-<td class="#doctools_idxleft" width="35%"><a name="shell_repl"> shell repl </a></td>
+<td class="#doctools_idxleft" width="35%"><a name="shell"> shell </a></td>
 <td class="#doctools_idxright" width="65%">
 <a href="doc/files/main.html"> punkshell </a>
 </td></tr>