diff --git a/layouts/partials/cite_book.html b/layouts/partials/cite_book.html
index d8ed6f7..7884aa8 100644
--- a/layouts/partials/cite_book.html
+++ b/layouts/partials/cite_book.html
@@ -9,11 +9,10 @@
 {{ with .date }}({{ . }}).{{ end }}
 
 {{/* Chapter */}}
-{{ with .chapter }}"{{ . }}"{{ end }}
+{{ with .chapter }}"{{ . }}" in{{ end }}
 
-{{/* Title and edition */}}
-{{ with .title }}in <i>{{ . }}</i>{{ end }}
-{{ with .edition }}({{ . }} ed.){{ end }}.
+{{/* Title, edition and URL */}}
+{{ with .url }}<a href="{{ . }}">{{ end }}{{ with .title }}<i>{{ . }}</i>{{ end }}{{ with .edition }}({{ . }} ed.){{ end }}{{ if .url }}</a>{{ end }}.
 
 {{/* Publisher */}}
 {{ with .publisher }}{{ . }}.{{ end }}
@@ -25,4 +24,7 @@
 {{/* ISBN */}}
 {{ with .isbn }}ISBN <a target="_blank" href="https://en.wikipedia.org/wiki/Special:BookSources/{{ . }}">{{ . }}</a>.{{ end }}
 
+{{/* Archive info */}}
+{{ with .original_url }}Archived from <a href="{{ . }}">the original</a>{{ end }}{{ with .archive_date }} on {{ . }}{{ end }}.
+
 </div>
diff --git a/layouts/shortcodes/cite_book.html b/layouts/shortcodes/cite_book.html
index a8c828c..009ff9b 100644
--- a/layouts/shortcodes/cite_book.html
+++ b/layouts/shortcodes/cite_book.html
@@ -11,6 +11,7 @@ A template for citing books inspired by the "cite book" template of Wikipedia.
   pages = "2-6"
 
   title = "Introduction to Computing Systems – from Bits & Gates to C & Beyond"
+  url = "https://web.archive.org/web/20170421220229/http://www.mhhe.com/engcs/compsci/patt/"
   edition = "1"
   date = "2001"
   publisher = "McGraw-Hill Higher Education"
@@ -18,6 +19,9 @@ A template for citing books inspired by the "cite book" template of Wikipedia.
 
   author = "Patt, Yale N."
   author2 = "Patel, Sanjay J."
+
+  original_url = "http://www.mhhe.com/patt/"
+  archive_date = "2017-04-21"
 >}}
 ```
 
@@ -28,9 +32,12 @@ A template for citing books inspired by the "cite book" template of Wikipedia.
   "pages" (.Get "pages")
   "title" (.Get "title")
   "edition" (.Get "edition")
+  "url" (.Get "url")
   "date" (.Get "date")
   "publisher" (.Get "publisher")
   "isbn" (.Get "isbn")
   "author" (.Get "author")
   "author2" (.Get "author2")
+  "original_url" (.Get "original_url")
+  "archive_date" (.Get "archive_date")
 ) }}
diff --git a/layouts/shortcodes/cite_conference.html b/layouts/shortcodes/cite_conference.html
index 1b0de55..4f91556 100644
--- a/layouts/shortcodes/cite_conference.html
+++ b/layouts/shortcodes/cite_conference.html
@@ -16,8 +16,8 @@ Wikipedia.
   date = "2007-06-09"
   location = "San Diego, CA"
 
-  original-url = "https://www.csc2.ncsu.edu/faculty/efg/wcae/ISCA2007/FinalProgram.html"
-  archive-date = "2025-01-29"
+  original_url = "https://www.csc2.ncsu.edu/faculty/efg/wcae/ISCA2007/FinalProgram.html"
+  archive_date = "2025-01-29"
 >}}
 ```
 
@@ -41,6 +41,6 @@ Wikipedia.
 {{ with .Get "location" }}{{ . }}.{{ end }}
 
 {{/* Archive info */}}
-{{ with .Get "original-url" }}Archived from <a href="{{ . }}">the original</a>{{ end }}{{ with .Get "archive-date" }} on {{ . }}{{ end }}.
+{{ with .Get "original_url" }}Archived from <a href="{{ . }}">the original</a>{{ end }}{{ with .Get "archive_date" }} on {{ . }}{{ end }}.
 
 </div>
diff --git a/layouts/shortcodes/cite_introduction_to_computing_systems.html b/layouts/shortcodes/cite_introduction_to_computing_systems.html
index bfdc767..232cc92 100644
--- a/layouts/shortcodes/cite_introduction_to_computing_systems.html
+++ b/layouts/shortcodes/cite_introduction_to_computing_systems.html
@@ -50,4 +50,8 @@ specifically
   "publisher" "McGraw-Hill Higher Education" 
   "author" "Patt, Yale N."
   "author2" "Patel, Sanjay J."
+
+  "url" ""
+  "original_url" ""
+  "archive_date" ""
 ) }}