diff --git a/changelog.md b/changelog.md
index 1feffd1a..f3341a94 100644
--- a/changelog.md
+++ b/changelog.md
@@ -9,6 +9,7 @@ Features
 * Allow customization of the toolbar with prompt format strings.
 * Add warnings-count prompt format strings: `\w` and `\W`.
 * Handle/document more attributes in the `[colors]` section of `~/.myclirc`.
+* Enable customization of table border color/attributes in `~/.myclirc`.
 
 
 Bug Fixes
diff --git a/mycli/clistyle.py b/mycli/clistyle.py
index 8e5d4163..b75e6ea7 100644
--- a/mycli/clistyle.py
+++ b/mycli/clistyle.py
@@ -32,12 +32,14 @@
     Token.Toolbar.Arg.Text: "arg-toolbar.text",
     Token.Toolbar.Transaction.Valid: "bottom-toolbar.transaction.valid",
     Token.Toolbar.Transaction.Failed: "bottom-toolbar.transaction.failed",
+    Token.Output.TableSeparator: "output.table-separator",
     Token.Output.Header: "output.header",
     Token.Output.OddRow: "output.odd-row",
     Token.Output.EvenRow: "output.even-row",
     Token.Output.Null: "output.null",
     Token.Output.Status: "output.status",
     Token.Output.Timing: "output.timing",
+    Token.Warnings.TableSeparator: "warnings.table-separator",
     Token.Warnings.Header: "warnings.header",
     Token.Warnings.OddRow: "warnings.odd-row",
     Token.Warnings.EvenRow: "warnings.even-row",
diff --git a/mycli/myclirc b/mycli/myclirc
index 2221707a..c66d7866 100644
--- a/mycli/myclirc
+++ b/mycli/myclirc
@@ -264,12 +264,14 @@ prompt = ''
 continuation = ''
 
 # style classes for colored table output
+output.table-separator = ""
 output.header = "#00ff5f bold"
 output.odd-row = ""
 output.even-row = ""
 output.null = "#808080"
 output.status = ""
 output.timing = ""
+warnings.table-separator = ""
 warnings.header = "#00ff5f bold"
 warnings.odd-row = ""
 warnings.even-row = ""
diff --git a/test/myclirc b/test/myclirc
index 4c315fad..1e560b1f 100644
--- a/test/myclirc
+++ b/test/myclirc
@@ -262,12 +262,14 @@ prompt = ''
 continuation = ''
 
 # style classes for colored table output
+output.table-separator = ""
 output.header = "#00ff5f bold"
 output.odd-row = ""
 output.even-row = ""
 output.null = "#808080"
 output.status = ""
 output.timing = ""
+warnings.table-separator = ""
 warnings.header = "#00ff5f bold"
 warnings.odd-row = ""
 warnings.even-row = ""