diff --git a/sample1.md b/sample1.md
index 6c6327f..fa726b4 100644
--- a/sample1.md
+++ b/sample1.md
@@ -39,12 +39,12 @@ and brands contained herein are the property of their respective owners.
 
 \newpage
 
-# CHANGE HISTORY
+# Change History
 
-| Revision | Date       | Description     |
-| -------- | ---------- | --------------- |
-| 0.2/17   | 2022/08/10 | Initial draft   |
-| 0.2/18   | 2022/08/10 | Add page breaks |
+| **Revision** | **Date**   | **Description** |
+| ------------ | ---------- | --------------- |
+| 0.2/17       | 2022/08/10 | Initial draft   |
+| 0.2/18       | 2022/08/10 | Add page breaks |
 
 \newpage
 
@@ -73,34 +73,34 @@ culpa qui officia deserunt mollit anim id est laborum.
 
 Table: List of Mandatory Algorithms
 
-| Algorithm ID     | M/R/O/D | Comments                                      |
-| ---------------- | ------- | --------------------------------------------- |
-| TPM_ALG_ECC      | M       | Support for 256 and 384-bit keys is required. |
-| TPM_ALG_ECDSA    | M       |
-| TPM_ALG_ECDH     | M       |
-| TPM_ALG_ECDAA    | O       |
-| TPM_ALG_RSA      | O       |
-| TPM_ALG_RSAES    | O       |
-| TPM_ALG_RSAPSS   | O       |
-| TPM_ALG_RSAOAEP  | O       |
-| TPM_ALG_AES      | M       |
-| TPM_ALG_SHA256   | M       |
-| TPM_ALG_SHA384   | M       |
-| TPM_ALG_SHA512   | O       |
-| TPM_ALG_HMAC     | M       |
-| TPM_ALG_SHA3_256 | O       |
-| TPM_ALG_SHA3_384 | O       |
-| TPM_ALG_SHA3_512 | O       |
-| TPM_ALG_NULL     | M       |
+| **Algorithm ID** | **M/R/O/D** | **Comments**                                  |
+| ---------------- | ----------- | --------------------------------------------- |
+| TPM_ALG_ECC      | M           | Support for 256 and 384-bit keys is required. |
+| TPM_ALG_ECDSA    | M           |
+| TPM_ALG_ECDH     | M           |
+| TPM_ALG_ECDAA    | O           |
+| TPM_ALG_RSA      | O           |
+| TPM_ALG_RSAES    | O           |
+| TPM_ALG_RSAPSS   | O           |
+| TPM_ALG_RSAOAEP  | O           |
+| TPM_ALG_AES      | M           |
+| TPM_ALG_SHA256   | M           |
+| TPM_ALG_SHA384   | M           |
+| TPM_ALG_SHA512   | O           |
+| TPM_ALG_HMAC     | M           |
+| TPM_ALG_SHA3_256 | O           |
+| TPM_ALG_SHA3_384 | O           |
+| TPM_ALG_SHA3_512 | O           |
+| TPM_ALG_NULL     | M           |
 
 ### Mandatory Curves
 
 Table: List of Mandatory Curves
 
-| Curve Identifier  | M/R/O/D | Comments |
-| ----------------- | ------- | -------- |
-| TPM_ECC_NIST_P256 | M       |
-| TPM_ECC_NIST_P384 | M       |
+| **Curve Identifier** | **M/R/O/D** | **Comments** |
+| -------------------- | ----------- | ------------ |
+| TPM_ECC_NIST_P256    | M           |
+| TPM_ECC_NIST_P384    | M           |
 
 ## Code
 
@@ -117,6 +117,6 @@ int main() {
 
 Table: Fantastic Table
 
-| Column 1 | Column 2 | Column 3 |
-| -------- | -------- | -------- |
-| AAAAAAAA | BBBBBBBB | CCCCCCCC |
+| **Column 1** | **Column 2** | **Column 3** |
+| ------------ | ------------ | ------------ |
+| AAAAAAAA     | BBBBBBBB     | CCCCCCCC     |
diff --git a/sample2.md b/sample2.md
index d857a14..6eea0a2 100644
--- a/sample2.md
+++ b/sample2.md
@@ -39,12 +39,12 @@ and brands contained herein are the property of their respective owners.
 
 \newpage
 
-# CHANGE HISTORY
+# Change History
 
-| Revision | Date       | Description     |
-| -------- | ---------- | --------------- |
-| 0.2/17   | 2022/08/10 | Initial draft   |
-| 0.2/18   | 2022/08/10 | Add page breaks |
+| **Revision** | **Date**   | **Description** |
+| ------------ | ---------- | --------------- |
+| 0.2/17       | 2022/08/10 | Initial draft   |
+| 0.2/18       | 2022/08/10 | Add page breaks |
 
 \newpage
 
@@ -100,34 +100,34 @@ graph TD;
 
 Table: List of Mandatory Algorithms
 
-| Algorithm ID     | M/R/O/D | Comments                                      |
-| ---------------- | ------- | --------------------------------------------- |
-| TPM_ALG_ECC      | M       | Support for 256 and 384-bit keys is required. |
-| TPM_ALG_ECDSA    | M       |
-| TPM_ALG_ECDH     | M       |
-| TPM_ALG_ECDAA    | O       |
-| TPM_ALG_RSA      | O       |
-| TPM_ALG_RSAES    | O       |
-| TPM_ALG_RSAPSS   | O       |
-| TPM_ALG_RSAOAEP  | O       |
-| TPM_ALG_AES      | M       |
-| TPM_ALG_SHA256   | M       |
-| TPM_ALG_SHA384   | M       |
-| TPM_ALG_SHA512   | O       |
-| TPM_ALG_HMAC     | M       |
-| TPM_ALG_SHA3_256 | O       |
-| TPM_ALG_SHA3_384 | O       |
-| TPM_ALG_SHA3_512 | O       |
-| TPM_ALG_NULL     | M       |
+| **Algorithm ID** | **M/R/O/D** | **Comments**                                  |
+| ---------------- | ----------- | --------------------------------------------- |
+| TPM_ALG_ECC      | M           | Support for 256 and 384-bit keys is required. |
+| TPM_ALG_ECDSA    | M           |
+| TPM_ALG_ECDH     | M           |
+| TPM_ALG_ECDAA    | O           |
+| TPM_ALG_RSA      | O           |
+| TPM_ALG_RSAES    | O           |
+| TPM_ALG_RSAPSS   | O           |
+| TPM_ALG_RSAOAEP  | O           |
+| TPM_ALG_AES      | M           |
+| TPM_ALG_SHA256   | M           |
+| TPM_ALG_SHA384   | M           |
+| TPM_ALG_SHA512   | O           |
+| TPM_ALG_HMAC     | M           |
+| TPM_ALG_SHA3_256 | O           |
+| TPM_ALG_SHA3_384 | O           |
+| TPM_ALG_SHA3_512 | O           |
+| TPM_ALG_NULL     | M           |
 
 ### Mandatory Curves
 
 Table: List of Mandatory Curves
 
-| Curve Identifier  | M/R/O/D | Comments |
-| ----------------- | ------- | -------- |
-| TPM_ECC_NIST_P256 | M       |
-| TPM_ECC_NIST_P384 | M       |
+| **Curve Identifier** | **M/R/O/D** | **Comments** |
+| -------------------- | ----------- | ------------ |
+| TPM_ECC_NIST_P256    | M           |
+| TPM_ECC_NIST_P384    | M           |
 
 ## Code
 
@@ -144,6 +144,6 @@ int main() {
 
 Table: Fantastic Table
 
-| Column 1 | Column 2 | Column 3 |
-| -------- | -------- | -------- |
-| AAAAAAAA | BBBBBBBB | CCCCCCCC |
+| **Column 1** | **Column 2** | **Column 3** |
+| ------------ | ------------ | ------------ |
+| AAAAAAAA     | BBBBBBBB     | CCCCCCCC     |
diff --git a/template/eisvogel.latex b/template/eisvogel.latex
index 08ff7f8..1f1c5f3 100644
--- a/template/eisvogel.latex
+++ b/template/eisvogel.latex
@@ -685,33 +685,19 @@ $endif$
 $if(tables)$
 
 \definecolor{table-row-color}{HTML}{F5F5F5}
-\definecolor{table-rule-color}{HTML}{999999}
+\definecolor{table-alt-color}{HTML}{D1E3A0}
+\definecolor{table-rule-color}{HTML}{FFFFFF}
 
-%\arrayrulecolor{black!40}
 \arrayrulecolor{table-rule-color}     % color of \toprule, \midrule, \bottomrule
 \setlength\heavyrulewidth{0.3ex}      % thickness of \toprule, \bottomrule
 \renewcommand{\arraystretch}{1.3}     % spacing (padding)
 
 $if(table-use-row-colors)$
-% TODO: This doesn't work anymore. I don't know why.
-% Reset rownum counter so that each table
-% starts with the same row colors.
-% https://tex.stackexchange.com/questions/170637/restarting-rowcolors
-%
-% Unfortunately the colored cells extend beyond the edge of the
-% table because pandoc uses @-expressions (@{}) like so:
-%
-% \begin{longtable}[]{@{}ll@{}}
-% \end{longtable}
-%
-% https://en.wikibooks.org/wiki/LaTeX/Tables#.40-expressions
-\let\oldlongtable\longtable
-\let\endoldlongtable\endlongtable
-\renewenvironment{longtable}{
-\rowcolors{3}{}{table-row-color!100}  % row color
-\oldlongtable} {
-\endoldlongtable
-\global\rownum=0\relax}
+\usepackage{etoolbox}
+\AtBeginEnvironment{longtable}{\rowcolors{2}{table-row-color!50}{table-alt-color!50}}
+\preto{\toprule}{\hiderowcolors}{}{}
+\appto{\endhead}{\showrowcolors}{}{}
+\appto{\endfirsthead}{\showrowcolors}{}{}
 $endif$
 $endif$