diff --git a/src/theme/book.css b/src/theme/book.css
index 6d7994d6..b33d9e90 100644
--- a/src/theme/book.css
+++ b/src/theme/book.css
@@ -27,12 +27,14 @@ h5 {
 }
 table {
   margin: 0 auto;
-}
-table thead td {
-  font-weight: 700;
+  border-collapse: collapse;
 }
 table td {
   padding: 3px 20px;
+  border: 1px solid;
+}
+table thead td {
+  font-weight: 700;
 }
 .sidebar {
   position: absolute;
@@ -296,14 +298,6 @@ table td {
 .light {
   color: #333;
   background-color: #fff;
-/*
-    table {
-        thead td {
-            color: $table-header-fg;
-            backrgound: $table-header-bg;
-        }
-    }
-    */
 /* Inline code */
 }
 .light .content .header:link,
@@ -375,6 +369,21 @@ table td {
   border-top: 0.1em solid #e1edf1;
   border-bottom: 0.1em solid #e1edf1;
 }
+.light table td {
+  border-color: #f2f2f2;
+}
+.light table tbody tr:nth-child(2n) {
+  background: #f7f7f7;
+}
+.light table thead {
+  background: #ccc;
+}
+.light table thead td {
+  border: none;
+}
+.light table thead tr {
+  border: 1px #ccc solid;
+}
 .light :not(pre) > .hljs {
   display: inline-block;
   vertical-align: middle;
@@ -404,14 +413,6 @@ table td {
 .coal {
   color: #98a3ad;
   background-color: #141617;
-/*
-    table {
-        thead td {
-            color: $table-header-fg;
-            backrgound: $table-header-bg;
-        }
-    }
-    */
 /* Inline code */
 }
 .coal .content .header:link,
@@ -483,6 +484,21 @@ table td {
   border-top: 0.1em solid #2c2f44;
   border-bottom: 0.1em solid #2c2f44;
 }
+.coal table td {
+  border-color: #1f2223;
+}
+.coal table tbody tr:nth-child(2n) {
+  background: #1b1d1e;
+}
+.coal table thead {
+  background: #3f4649;
+}
+.coal table thead td {
+  border: none;
+}
+.coal table thead tr {
+  border: 1px #3f4649 solid;
+}
 .coal :not(pre) > .hljs {
   display: inline-block;
   vertical-align: middle;
@@ -512,14 +528,6 @@ table td {
 .navy {
   color: #bcbdd0;
   background-color: #161923;
-/*
-    table {
-        thead td {
-            color: $table-header-fg;
-            backrgound: $table-header-bg;
-        }
-    }
-    */
 /* Inline code */
 }
 .navy .content .header:link,
@@ -591,6 +599,21 @@ table td {
   border-top: 0.1em solid #2f333f;
   border-bottom: 0.1em solid #2f333f;
 }
+.navy table td {
+  border-color: #1f2331;
+}
+.navy table tbody tr:nth-child(2n) {
+  background: #1b1f2b;
+}
+.navy table thead {
+  background: #39415b;
+}
+.navy table thead td {
+  border: none;
+}
+.navy table thead tr {
+  border: 1px #39415b solid;
+}
 .navy :not(pre) > .hljs {
   display: inline-block;
   vertical-align: middle;
@@ -620,14 +643,6 @@ table td {
 .rust {
   color: #262625;
   background-color: #e1e1db;
-/*
-    table {
-        thead td {
-            color: $table-header-fg;
-            backrgound: $table-header-bg;
-        }
-    }
-    */
 /* Inline code */
 }
 .rust .content .header:link,
@@ -699,6 +714,21 @@ table td {
   border-top: 0.1em solid #b8b8b1;
   border-bottom: 0.1em solid #b8b8b1;
 }
+.rust table td {
+  border-color: #d7d7cf;
+}
+.rust table tbody tr:nth-child(2n) {
+  background: #dbdbd4;
+}
+.rust table thead {
+  background: #b3a497;
+}
+.rust table thead td {
+  border: none;
+}
+.rust table thead tr {
+  border: 1px #b3a497 solid;
+}
 .rust :not(pre) > .hljs {
   display: inline-block;
   vertical-align: middle;
diff --git a/src/theme/stylus/general.styl b/src/theme/stylus/general.styl
index 3ff21332..8cef9161 100644
--- a/src/theme/stylus/general.styl
+++ b/src/theme/stylus/general.styl
@@ -22,7 +22,14 @@ h4, h5 { margin-top: 2em }
 
 table {
     margin: 0 auto;
+    border-collapse: collapse;
 
-    thead td { font-weight: 700; }
-    td { padding: 3px 20px; }
+    td {
+      padding: 3px 20px;
+      border: 1px solid;
+    }
+
+    thead {
+      td { font-weight: 700; }
+    }
 }
diff --git a/src/theme/stylus/themes/base.styl b/src/theme/stylus/themes/base.styl
index de2170b5..6a4cc021 100644
--- a/src/theme/stylus/themes/base.styl
+++ b/src/theme/stylus/themes/base.styl
@@ -79,14 +79,25 @@
         border-bottom: .1em solid $quote-border;
     }
 
-    /*
+
     table {
-        thead td {
-            color: $table-header-fg;
-            backrgound: $table-header-bg;
+
+        td {
+            border-color: $table-border-color;
+        }
+
+        // Alternate background colors for rows
+        tbody tr:nth-child(2n) {
+            background: $table-alternate-bg;
+        }
+
+        thead {
+            background: $table-header-bg;
+            td { border: none; }
+            tr { border: 1px $table-header-bg solid; }
         }
     }
-    */
+
 
     /* Inline code */
     :not(pre) > .hljs {
diff --git a/src/theme/stylus/themes/coal.styl b/src/theme/stylus/themes/coal.styl
index f66b92f4..8864d3c2 100644
--- a/src/theme/stylus/themes/coal.styl
+++ b/src/theme/stylus/themes/coal.styl
@@ -21,4 +21,8 @@ $theme-hover = #1f2124
 $quote-bg = #242637
 $quote-border = lighten($quote-bg, 5%)
 
+$table-border-color = lighten($bg, 5%)
+$table-header-bg = lighten($bg, 20%)
+$table-alternate-bg = lighten($bg, 3%)
+
 @import 'base'
diff --git a/src/theme/stylus/themes/light.styl b/src/theme/stylus/themes/light.styl
index 71b2b0f0..05cbb7f9 100644
--- a/src/theme/stylus/themes/light.styl
+++ b/src/theme/stylus/themes/light.styl
@@ -21,4 +21,8 @@ $theme-hover = #e6e6e6
 $quote-bg = #f2f7f9
 $quote-border = darken($quote-bg, 5%)
 
+$table-border-color = darken($bg, 5%)
+$table-header-bg = darken($bg, 20%)
+$table-alternate-bg = darken($bg, 3%)
+
 @import 'base'
diff --git a/src/theme/stylus/themes/navy.styl b/src/theme/stylus/themes/navy.styl
index e4f3f43c..7a761965 100644
--- a/src/theme/stylus/themes/navy.styl
+++ b/src/theme/stylus/themes/navy.styl
@@ -21,4 +21,8 @@ $theme-hover = #282e40
 $quote-bg = #262933
 $quote-border = lighten($quote-bg, 5%)
 
+$table-border-color = lighten($bg, 5%)
+$table-header-bg = lighten($bg, 20%)
+$table-alternate-bg = lighten($bg, 3%)
+
 @import 'base'
diff --git a/src/theme/stylus/themes/rust.styl b/src/theme/stylus/themes/rust.styl
index 47c41301..a44915d9 100644
--- a/src/theme/stylus/themes/rust.styl
+++ b/src/theme/stylus/themes/rust.styl
@@ -21,4 +21,8 @@ $theme-hover = #99908a
 $quote-bg = #c1c1bb
 $quote-border = darken($quote-bg, 5%)
 
+$table-border-color = darken($bg, 5%)
+$table-header-bg = #b3a497
+$table-alternate-bg = darken($bg, 3%)
+
 @import 'base'