diff --git a/ox-context.el b/ox-context.el
index be2b493..f44b4b1 100644
--- a/ox-context.el
+++ b/ox-context.el
@@ -387,111 +387,173 @@
 
 ;;;;; Table Styles
 
+(defcustom org-context-table-body-style '("OrgTableBody" . "")
+  "The default style name for the body row group in tables.
 
-(defcustom org-context-table-body-style "OrgTableBody"
-  "The default style name for the body row group in tables."
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
+
+(defcustom org-context-table-bottomleft-style '("OrgTableBottomLeftCell" . "")
+  "The default style name for the bottom left cell in tables.
 
-(defcustom org-context-table-bottomleft-style "OrgTableBottomLeftCell"
-  "The default style name for the bottom left cell in tables."
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
 
-(defcustom org-context-table-bottomright-style "OrgTableBottomRightCell"
-  "The default style name for the bottom right cell in tables."
+(defcustom org-context-table-bottomright-style '("OrgTableBottomRightCell" . "")
+  "The default style name for the bottom right cell in tables.
+
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
+
+(defcustom org-context-table-bottomrow-style '("OrgTableBottomRow" . "")
+  "The default style name for the bottom row in tables.
 
-(defcustom org-context-table-bottomrow-style "OrgTableBottomRow"
-  "The default style name for the bottom row in tables."
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
+
+(defcustom org-context-table-colgroup-end-style '("OrgTableColGroupEnd" . "")
+  "The default style name for columns ending column groups in tables.
 
-(defcustom org-context-table-colgroup-end-style "OrgTableColGroupEnd"
-  "The default style name for columns ending column groups in tables."
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
 
-(defcustom org-context-table-colgroup-start-style "OrgTableColGroupStart"
-  "The default style name for columns starting column groups in tables."
+(defcustom org-context-table-colgroup-start-style '("OrgTableColGroupStart" . "")
+  "The default style name for columns starting column groups in tables.
+
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
+
+(defcustom org-context-table-footer-bottom-style '("OrgTableFooterBottom" . "")
+  "The default style name for the bottom row in the footer row group in tables.
 
-(defcustom org-context-table-footer-bottom-style "OrgTableFooterBottom"
-  "The default style name for the bottom row in the footer row group in tables."
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
+
+(defcustom org-context-table-footer-mid-style '("OrgTableFooterMid" . "")
+  "The default style name for footer rows where the footer is only one row.
 
-(defcustom org-context-table-footer-mid-style "OrgTableFooterMid"
-  "The default style name for footer rows where the footer is only one row."
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
 
-(defcustom org-context-table-footer-style "OrgTableFooter"
-  "The default style name for the footer row group in tables."
+(defcustom org-context-table-footer-style '("OrgTableFooter" . "")
+  "The default style name for the footer row group in tables.
+
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
+
+(defcustom org-context-table-footer-top-style '("OrgTableFooterTop" . "")
+  "The default style name for the top row in the footer row group in tables.
 
-(defcustom org-context-table-footer-top-style "OrgTableFooterTop"
-  "The default style name for the top row in the footer row group in tables."
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
+
+(defcustom org-context-table-header-bottom-style '("OrgTableHeaderBottom" . "")
+  "The default style name for the bottom row in the header row group in tables.
 
-(defcustom org-context-table-header-bottom-style "OrgTableHeaderBottom"
-  "The default style name for the bottom row in the header row group in tables."
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
 
-(defcustom org-context-table-header-mid-style "OrgTableHeaderMid"
-  "The default style name for header rows where the header is only one row."
+(defcustom org-context-table-header-mid-style '("OrgTableHeaderMid" . "")
+  "The default style name for header rows where the header is only one row.
+
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
+
+(defcustom org-context-table-header-style '("OrgTableHeader" . "")
+  "The default style name for the header row group in tables.
 
-(defcustom org-context-table-header-style "OrgTableHeader"
-  "The default style name for the header row group in tables."
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
+
+(defcustom org-context-table-header-top-style '("OrgTableHeaderTop" . "")
+  "The default style name for the top row in the header row group in tables.
 
-(defcustom org-context-table-header-top-style "OrgTableHeaderTop"
-  "The default style name for the top row in the header row group in tables."
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
 
-(defcustom org-context-table-leftcol-style "OrgTableLeftCol"
-  "The default style name for the left column in tables."
+(defcustom org-context-table-leftcol-style '("OrgTableLeftCol" . "")
+  "The default style name for the left column in tables.
+
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
+
+(defcustom org-context-table-rightcol-style '("OrgTableRightCol" . "")
+  "The default style name for the right column in tables.
 
-(defcustom org-context-table-rightcol-style "OrgTableRightCol"
-  "The default style name for the right column in tables."
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
+
+(defcustom org-context-table-rowgroup-start-style '("OrgTableRowGroupStart" . "")
+  "The default style name for rows starting row groups in tables.
 
-(defcustom org-context-table-rowgroup-start-style "OrgTableRowGroupStart"
-  "The default style name for rows starting row groups in tables."
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
 
-(defcustom org-context-table-rowgroup-end-style "OrgTableRowGroupEnd"
-  "The default style name for rows ending row groups in tables."
+(defcustom org-context-table-rowgroup-end-style '("OrgTableRowGroupEnd" . "")
+  "The default style name for rows ending row groups in tables.
+
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
+
+(defcustom org-context-table-topleft-style '("OrgTableTopLeftCell" . "")
+  "The default style name for the top left cell in tables.
 
-(defcustom org-context-table-topleft-style "OrgTableTopLeftCell"
-  "The default style name for the top left cell in tables."
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
+
+(defcustom org-context-table-topright-style '("OrgTableTopRightCell" . "")
+  "The default style name for the top right cell in tables.
 
-(defcustom org-context-table-topright-style "OrgTableTopRightCell"
-  "The default style name for the top right cell in tables."
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
 
-(defcustom org-context-table-toprow-style "OrgTableTopRow"
-  "The default style name for the top row in tables."
+(defcustom org-context-table-toprow-style '("OrgTableTopRow" . "")
+  "The default style name for the top row in tables.
+
+Cons list of NAME, DEF. If DEF is nil, an empty definition is created."
   :group 'org-export-context
-  :type 'string)
+  :type '(cons (string :tag "Style Name")
+               (string :tag "Style Definition")))
 
 
 
@@ -3478,28 +3540,28 @@ a communication channel."
          (ends-colgroup-p (org-export-table-cell-ends-colgroup-p table-cell info))
          (first-col-style (or (plist-get attr :w)
                              (org-string-nw-p
-                              (plist-get info :context-table-leftcol-style))))
+                              (car (plist-get info :context-table-leftcol-style)))))
          (last-col-style (or (plist-get attr :e)
                             (org-string-nw-p
-                             (plist-get info :context-table-rightcol-style))))
+                             (car (plist-get info :context-table-rightcol-style)))))
          (top-left-style (or (plist-get attr :nw)
                             (org-string-nw-p
-                             (plist-get info :context-table-topleft-style))))
+                             (car (plist-get info :context-table-topleft-style)))))
          (top-right-style (or (plist-get attr :ne)
                              (org-string-nw-p
-                              (plist-get info :context-table-topright-style))))
+                              (car (plist-get info :context-table-topright-style)))))
          (bottom-left-style (or (plist-get attr :sw)
                                (org-string-nw-p
-                                (plist-get info :context-table-bottomleft-style))))
+                                (car (plist-get info :context-table-bottomleft-style)))))
          (bottom-right-style (or (plist-get attr :se)
                                 (org-string-nw-p
-                                 (plist-get info :context-table-bottomright-style))))
+                                 (car (plist-get info :context-table-bottomright-style)))))
          (starts-colgroup-style (or (plist-get attr :cgs)
                                     (org-string-nw-p
-                                     (plist-get info :context-table-colgroup-start-style))))
+                                     (car (plist-get info :context-table-colgroup-start-style)))))
          (ends-colgroup-style (or (plist-get attr :cge)
                                     (org-string-nw-p
-                                     (plist-get info :context-table-colgroup-end-style))))
+                                     (car (plist-get info :context-table-colgroup-end-style)))))
          (suffix
           (cond ((and first-row-p first-col-p top-left-style) (format "[%s]" top-left-style))
                 ((and first-row-p last-col-p top-right-style) (format "[%s]" top-right-style))
@@ -3562,50 +3624,56 @@ a communication channel."
             last-row-group-p))
          (header-style (or (plist-get attr :h)
                            (org-string-nw-p
-                            (plist-get info :context-table-header-style))))
+                            (car (plist-get info :context-table-header-style)))))
          (footer-style (or (plist-get attr :f)
                            (org-string-nw-p
-                            (plist-get info :context-table-footer-style))))
+                            (car (plist-get info :context-table-footer-style)))))
          (body-style (or (plist-get attr :b)
                            (org-string-nw-p
-                            (plist-get info :context-table-body-style))))
+                            (car (plist-get info :context-table-body-style)))))
          (header-mid-row-style
           (or (plist-get attr :hm)
-              (org-string-nw-p (plist-get info :context-table-header-mid-style))))
+              (org-string-nw-p
+               (car (plist-get info :context-table-header-mid-style)))))
          (footer-mid-row-style
           (or (plist-get attr :fm)
-              (org-string-nw-p (plist-get info :context-table-footer-mid-style))))
+              (org-string-nw-p
+               (car (plist-get info :context-table-footer-mid-style)))))
          (header-top-row-style
           (or (plist-get attr :ht)
-              (org-string-nw-p (plist-get info :context-table-header-top-style))))
+              (org-string-nw-p
+               (car (plist-get info :context-table-header-top-style)))))
          (footer-top-row-style
           (or (plist-get attr :ft)
-              (org-string-nw-p (plist-get info :context-table-footer-top-style))))
+              (org-string-nw-p
+               (car (plist-get info :context-table-footer-top-style)))))
          (header-bottom-row-style
           (or (plist-get attr :hb)
-              (org-string-nw-p (plist-get info :context-table-header-bottom-style))))
+              (org-string-nw-p
+               (car (plist-get info :context-table-header-bottom-style)))))
          (footer-bottom-row-style
           (or (plist-get attr :hb)
-              (org-string-nw-p (plist-get info :context-table-footer-bottom-style))))
+              (org-string-nw-p
+               (car (plist-get info :context-table-footer-bottom-style)))))
          (row-group-start-style
           (or (plist-get attr :rgs)
               (org-string-nw-p
-               (plist-get info :context-table-rowgroup-start-style))))
+               (car (plist-get info :context-table-rowgroup-start-style)))))
          (row-group-end-style
           (or (plist-get attr :rge)
               (org-string-nw-p
-               (plist-get info :context-table-rowgroup-end-style))))
+               (car (plist-get info :context-table-rowgroup-end-style)))))
          (first-row-style
           (or
            (or (plist-get attr :n)
                (org-string-nw-p
-                (plist-get info :context-table-toprow-style)))
+                (car (plist-get info :context-table-toprow-style))))
            row-group-start-style))
          (last-row-style
           (or
            (or (plist-get attr :s)
                (org-string-nw-p
-                (plist-get info :context-table-bottomrow-style)))
+                (car (plist-get info :context-table-bottomrow-style))))
            row-group-end-style))
          (first-row-p (= row-num 0))
          (last-row-p (= row-num (- (car dimensions) 1)))
@@ -4012,8 +4080,12 @@ Returns a string containing those definitions."
              (mapcar
               (lambda
                 (kw)
-                (let ((style (plist-get info kw)))
-                  (when (org-string-nw-p style) (format "\\setupxtable[%s][]" style))))
+                (let* ((styledef (plist-get info kw))
+                       (def (cdr styledef))
+                       (style (car styledef)))
+                  (if (org-string-nw-p def)
+                      def
+                    (format "\\setupxtable[%s][]" style))))
               (list :context-table-toprow-style
                     :context-table-bottomrow-style
                     :context-table-leftcol-style
diff --git a/testing/test-ox-context.el b/testing/test-ox-context.el
index 6be26ad..f7fdc02 100644
--- a/testing/test-ox-context.el
+++ b/testing/test-ox-context.el
@@ -5042,7 +5042,7 @@ foo bar baz
      (regexp-quote "[TestBody]"))
     (context-test-with-temp-customization-value
      org-context-table-body-style
-     "TestBody"
+     '("TestBody" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-body-style-plist ()
@@ -5058,7 +5058,29 @@ foo bar baz
      (org-trim (org-export-as
                 'context nil nil t
                 '(:context-preset "empty"
-                  :context-table-body-style "TestBody")))))))
+                  :context-table-body-style ("TestBody" . ""))))))))
+(ert-deftest test-org-context/table-body-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestBodyDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim (org-export-as
+                'context nil nil nil
+                '(:context-preset "empty"
+                  :context-table-body-style ("TestBody" . "TestBodyDef"))))))))
+(ert-deftest test-org-context/table-body-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestBody]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim (org-export-as
+                'context nil nil nil
+                '(:context-preset "empty"
+                  :context-table-body-style ("TestBody" . ""))))))))
 (ert-deftest test-org-context/table-bottomleft-style-cust ()
   "Test table body style override"
   (should
@@ -5069,7 +5091,7 @@ foo bar baz
      (regexp-quote "[TestBottomLeft]"))
     (context-test-with-temp-customization-value
      org-context-table-bottomleft-style
-     "TestBottomLeft"
+     '("TestBottomLeft" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-bottomleft-style-plist ()
@@ -5086,7 +5108,31 @@ foo bar baz
        (org-export-as
         'context nil nil t
         '(:context-preset "empty"
-          :context-table-bottomleft-style "TestBottomLeft")))))))
+          :context-table-bottomleft-style ("TestBottomLeft" . ""))))))))
+(ert-deftest test-org-context/table-bottomleft-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestBottomLeftDef"
+    (context-test-with-temp-text
+      test-org-context--basic-table
+      (org-trim
+       (org-export-as
+        'context nil nil nil
+        '(:context-preset "empty"
+          :context-table-bottomleft-style ("TestBottomLeft" . "TestBottomLeftDef"))))))))
+(ert-deftest test-org-context/table-bottomleft-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestBottomLeft]")
+    (context-test-with-temp-text
+      test-org-context--basic-table
+      (org-trim
+       (org-export-as
+        'context nil nil nil
+        '(:context-preset "empty"
+          :context-table-bottomleft-style ("TestBottomLeft" . ""))))))))
 (ert-deftest test-org-context/table-bottomright-style-cust ()
   "Test table body style override"
   (should
@@ -5097,7 +5143,7 @@ foo bar baz
      (regexp-quote "[TestBottomRight]"))
     (context-test-with-temp-customization-value
      org-context-table-bottomright-style
-     "TestBottomRight"
+     '("TestBottomRight" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-bottomright-style-plist ()
@@ -5114,7 +5160,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-bottomright-style "TestBottomRight")))))))
+         :context-table-bottomright-style ("TestBottomRight" . ""))))))))
+(ert-deftest test-org-context/table-bottomright-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestBottomRightDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-bottomright-style ("TestBottomRight" . "TestBottomRightDef"))))))))
+(ert-deftest test-org-context/table-bottomright-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestBottomRight]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-bottomright-style ("TestBottomRight" . ""))))))))
 (ert-deftest test-org-context/table-bottomrow-style-cust ()
   "Test table body style override"
   (should
@@ -5125,7 +5195,7 @@ foo bar baz
      (regexp-quote "[TestBottomRow]"))
     (context-test-with-temp-customization-value
      org-context-table-bottomrow-style
-     "TestBottomRow"
+     '("TestBottomRow" . "")
      (context-test-with-temp-text
       "| abc |
 | 123 |"
@@ -5145,7 +5215,33 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-bottomrow-style "TestBottomRow")))))))
+         :context-table-bottomrow-style ("TestBottomRow" . ""))))))))
+(ert-deftest test-org-context/table-bottomrow-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestBottomRowDef"
+    (context-test-with-temp-text
+     "| abc |
+| 123 |"
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-bottomrow-style ("TestBottomRow" . "TestBottomRowDef"))))))))
+(ert-deftest test-org-context/table-bottomrow-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestBottomRow]")
+    (context-test-with-temp-text
+     "| abc |
+| 123 |"
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-bottomrow-style ("TestBottomRow" . ""))))))))
 (ert-deftest test-org-context/table-colgroup-end-style-cust ()
   "Test table body style override"
   (should
@@ -5156,7 +5252,7 @@ foo bar baz
      (regexp-quote "[TestColgroupEnd]"))
     (context-test-with-temp-customization-value
      org-context-table-colgroup-end-style
-     "TestColgroupEnd"
+     '("TestColgroupEnd" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-colgroup-end-style-plist ()
@@ -5173,7 +5269,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-colgroup-end-style "TestColgroupEnd")))))))
+         :context-table-colgroup-end-style ("TestColgroupEnd" . ""))))))))
+(ert-deftest test-org-context/table-colgroup-end-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestColgroupEndDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-colgroup-end-style ("TestColgroupEnd" . "TestColgroupEndDef"))))))))
+(ert-deftest test-org-context/table-colgroup-end-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestColgroupEnd]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-colgroup-end-style ("TestColgroupEnd" . ""))))))))
 (ert-deftest test-org-context/table-colgroup-start-style-cust ()
   "Test table body style override"
   (should
@@ -5184,7 +5304,7 @@ foo bar baz
      (regexp-quote "[TestColgroupStart]"))
     (context-test-with-temp-customization-value
      org-context-table-colgroup-start-style
-     "TestColgroupStart"
+'("TestColgroupStart" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-colgroup-start-style-plist ()
@@ -5201,7 +5321,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-colgroup-start-style "TestColgroupStart")))))))
+         :context-table-colgroup-start-style ("TestColgroupStart" . ""))))))))
+(ert-deftest test-org-context/table-colgroup-start-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestColgroupStartDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-colgroup-start-style ("TestColgroupStart" . "TestColgroupStartDef"))))))))
+(ert-deftest test-org-context/table-colgroup-start-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestColgroupStart]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-colgroup-start-style ("TestColgroupStart" . ""))))))))
 (ert-deftest test-org-context/table-footer-bottom-style-cust ()
   "Test table body style override"
   (should
@@ -5212,7 +5356,7 @@ foo bar baz
      (regexp-quote "[TestFooterBottomStyle]"))
     (context-test-with-temp-customization-value
      org-context-table-footer-bottom-style
-     "TestFooterBottomStyle"
+     '("TestFooterBottomStyle" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-footer-bottom-style-plist ()
@@ -5229,7 +5373,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-footer-bottom-style "TestFooterBottomStyle")))))))
+         :context-table-footer-bottom-style ("TestFooterBottomStyle" . ""))))))))
+(ert-deftest test-org-context/table-footer-bottom-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestFooterBottomStyleDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-footer-bottom-style ("TestFooterBottomStyle" . "TestFooterBottomStyleDef"))))))))
+(ert-deftest test-org-context/table-footer-bottom-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestFooterBottomStyle]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-footer-bottom-style ("TestFooterBottomStyle" . ""))))))))
 (ert-deftest test-org-context/table-footer-mid-style-cust ()
   "Test table body style override"
   (should
@@ -5240,7 +5408,7 @@ foo bar baz
      (regexp-quote "[TestFooterMidStyle]"))
     (context-test-with-temp-customization-value
      org-context-table-footer-mid-style
-     "TestFooterMidStyle"
+     '("TestFooterMidStyle" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-footer-mid-style-plist ()
@@ -5257,7 +5425,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-footer-mid-style "TestFooterMidStyle")))))))
+         :context-table-footer-mid-style ("TestFooterMidStyle" . ""))))))))
+(ert-deftest test-org-context/table-footer-mid-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestFooterMidStyleDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-footer-mid-style ("TestFooterMidStyle" . "TestFooterMidStyleDef"))))))))
+(ert-deftest test-org-context/table-footer-mid-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestFooterMidStyle]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-footer-mid-style ("TestFooterMidStyle" . ""))))))))
 (ert-deftest test-org-context/table-footer-style-cust ()
   "Test table body style override"
   (should
@@ -5268,7 +5460,7 @@ foo bar baz
      (regexp-quote "[TestFooterStyle]"))
     (context-test-with-temp-customization-value
      org-context-table-footer-style
-     "TestFooterStyle"
+     '("TestFooterStyle" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-footer-style-plist ()
@@ -5285,7 +5477,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-footer-style "TestFooterStyle")))))))
+         :context-table-footer-style ("TestFooterStyle" . ""))))))))
+(ert-deftest test-org-context/table-footer-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestFooterStyleDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-footer-style ("TestFooterStyle" . "TestFooterStyleDef"))))))))
+(ert-deftest test-org-context/table-footer-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestFooterStyle]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-footer-style ("TestFooterStyle" . ""))))))))
 (ert-deftest test-org-context/table-footer-top-style-cust ()
   "Test table body style override"
   (should
@@ -5296,7 +5512,7 @@ foo bar baz
      (regexp-quote "[TestFooterTopStyle]"))
     (context-test-with-temp-customization-value
      org-context-table-footer-top-style
-     "TestFooterTopStyle"
+     '("TestFooterTopStyle" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-footer-top-style-plist ()
@@ -5313,7 +5529,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-footer-top-style "TestFooterTopStyle")))))))
+         :context-table-footer-top-style ("TestFooterTopStyle" . ""))))))))
+(ert-deftest test-org-context/table-footer-top-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestFooterTopStyleDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-footer-top-style ("TestFooterTopStyle" . "TestFooterTopStyleDef"))))))))
+(ert-deftest test-org-context/table-footer-top-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestFooterTopStyle]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-footer-top-style ("TestFooterTopStyle" . ""))))))))
 (ert-deftest test-org-context/table-header-bottom-style-cust ()
   "Test table body style override"
   (should
@@ -5324,7 +5564,7 @@ foo bar baz
      (regexp-quote "[TestHeaderBottomStyle]"))
     (context-test-with-temp-customization-value
      org-context-table-header-bottom-style
-     "TestHeaderBottomStyle"
+     '("TestHeaderBottomStyle" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-header-bottom-style-plist ()
@@ -5341,7 +5581,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-header-bottom-style "TestHeaderBottomStyle")))))))
+         :context-table-header-bottom-style ("TestHeaderBottomStyle" . ""))))))))
+(ert-deftest test-org-context/table-header-bottom-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestHeaderBottomStyleDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-header-bottom-style ("TestHeaderBottomStyle" . "TestHeaderBottomStyleDef"))))))))
+(ert-deftest test-org-context/table-header-bottom-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestHeaderBottomStyle]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-header-bottom-style ("TestHeaderBottomStyle" . ""))))))))
 (ert-deftest test-org-context/table-header-mid-style-cust ()
   "Test table body style override"
   (should
@@ -5352,7 +5616,7 @@ foo bar baz
      (regexp-quote "[TestHeaderMidStyle]"))
     (context-test-with-temp-customization-value
      org-context-table-header-mid-style
-     "TestHeaderMidStyle"
+     '("TestHeaderMidStyle" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-header-mid-style-plist ()
@@ -5369,7 +5633,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-header-mid-style "TestHeaderMidStyle")))))))
+         :context-table-header-mid-style ("TestHeaderMidStyle" . ""))))))))
+(ert-deftest test-org-context/table-header-mid-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestHeaderMidStyleDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-header-mid-style ("TestHeaderMidStyle" . "TestHeaderMidStyleDef"))))))))
+(ert-deftest test-org-context/table-header-mid-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestHeaderMidStyle]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-header-mid-style ("TestHeaderMidStyle" . ""))))))))
 (ert-deftest test-org-context/table-header-style-cust ()
   "Test table body style override"
   (should
@@ -5380,7 +5668,7 @@ foo bar baz
      (regexp-quote "[TestHeaderStyle]"))
     (context-test-with-temp-customization-value
      org-context-table-header-style
-     "TestHeaderStyle"
+     '("TestHeaderStyle" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-header-style-plist ()
@@ -5397,7 +5685,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-header-style "TestHeaderStyle")))))))
+         :context-table-header-style ("TestHeaderStyle" . ""))))))))
+(ert-deftest test-org-context/table-header-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestHeaderStyleDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-header-style ("TestHeaderStyle" . "TestHeaderStyleDef"))))))))
+(ert-deftest test-org-context/table-header-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestHeaderStyle]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-header-style ("TestHeaderStyle" . ""))))))))
 (ert-deftest test-org-context/table-header-top-style-cust ()
   "Test table body style override"
   (should
@@ -5408,7 +5720,7 @@ foo bar baz
      (regexp-quote "[TestHeaderTopStyle]"))
     (context-test-with-temp-customization-value
      org-context-table-header-top-style
-     "TestHeaderTopStyle"
+     '("TestHeaderTopStyle" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-header-top-style-plist ()
@@ -5425,7 +5737,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-header-top-style "TestHeaderTopStyle")))))))
+         :context-table-header-top-style ("TestHeaderTopStyle" . ""))))))))
+(ert-deftest test-org-context/table-header-top-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestHeaderTopStyleDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-header-top-style ("TestHeaderTopStyle" . "TestHeaderTopStyleDef"))))))))
+(ert-deftest test-org-context/table-header-top-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestHeaderTopStyle]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-header-top-style ("TestHeaderTopStyle" . ""))))))))
 (ert-deftest test-org-context/table-leftcolstyle-cust ()
   "Test table body style override"
   (should
@@ -5436,7 +5772,7 @@ foo bar baz
      (regexp-quote "[TestLeftcolStyle]"))
     (context-test-with-temp-customization-value
      org-context-table-leftcol-style
-     "TestLeftcolStyle"
+     '("TestLeftcolStyle" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-leftcolstyle-plist ()
@@ -5453,7 +5789,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-leftcol-style "TestLeftcolStyle")))))))
+         :context-table-leftcol-style ("TestLeftcolStyle" . ""))))))))
+(ert-deftest test-org-context/table-leftcolstyle-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestLeftcolStyleDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-leftcol-style ("TestLeftcolStyle" . "TestLeftcolStyleDef"))))))))
+(ert-deftest test-org-context/table-leftcolstyle-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestLeftcolStyle]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-leftcol-style ("TestLeftcolStyle" . ""))))))))
 (ert-deftest test-org-context/table-rightcol-style-cust ()
   "Test table body style override"
   (should
@@ -5464,7 +5824,7 @@ foo bar baz
      (regexp-quote "[TestRightcolStyle]"))
     (context-test-with-temp-customization-value
      org-context-table-rightcol-style
-     "TestRightcolStyle"
+     '("TestRightcolStyle" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-rightcol-style-plist ()
@@ -5481,7 +5841,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-rightcol-style "TestRightcolStyle")))))))
+         :context-table-rightcol-style ("TestRightcolStyle" . ""))))))))
+(ert-deftest test-org-context/table-rightcol-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestRightcolStyleDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-rightcol-style ("TestRightcolStyle" . "TestRightcolStyleDef"))))))))
+(ert-deftest test-org-context/table-rightcol-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestRightcolStyle]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-rightcol-style ("TestRightcolStyle" . ""))))))))
 (ert-deftest test-org-context/table-rowgroup-start-style-cust ()
   "Test table body style override"
   (should
@@ -5492,7 +5876,7 @@ foo bar baz
      (regexp-quote "[TestRowgroupStartStyle]"))
     (context-test-with-temp-customization-value
      org-context-table-rowgroup-start-style
-     "TestRowgroupStartStyle"
+     '("TestRowgroupStartStyle" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-rowgroup-start-style-plist ()
@@ -5509,7 +5893,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-rowgroup-start-style "TestRowgroupStartStyle")))))))
+         :context-table-rowgroup-start-style ("TestRowgroupStartStyle" . ""))))))))
+(ert-deftest test-org-context/table-rowgroup-start-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestRowgroupStartStyleDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-rowgroup-start-style ("TestRowgroupStartStyle" . "TestRowgroupStartStyleDef"))))))))
+(ert-deftest test-org-context/table-rowgroup-start-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestRowgroupStartStyle]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-rowgroup-start-style ("TestRowgroupStartStyle" . ""))))))))
 (ert-deftest test-org-context/table-rowgroup-end-style-cust ()
   "Test table body style override"
   (should
@@ -5520,7 +5928,7 @@ foo bar baz
      (regexp-quote "[TestRowgroupEndStyle]"))
     (context-test-with-temp-customization-value
      org-context-table-rowgroup-end-style
-     "TestRowgroupEndStyle"
+     '("TestRowgroupEndStyle" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-rowgroup-end-style-plist ()
@@ -5537,7 +5945,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-rowgroup-end-style "TestRowgroupEndStyle")))))))
+         :context-table-rowgroup-end-style ("TestRowgroupEndStyle" . ""))))))))
+(ert-deftest test-org-context/table-rowgroup-end-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestRowgroupEndStyleDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-rowgroup-end-style ("TestRowgroupEndStyle" . "TestRowgroupEndStyleDef"))))))))
+(ert-deftest test-org-context/table-rowgroup-end-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestRowgroupEndStyle]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-rowgroup-end-style ("TestRowgroupEndStyle" . ""))))))))
 (ert-deftest test-org-context/table-topleft-style-cust ()
   "Test table body style override"
   (should
@@ -5548,7 +5980,7 @@ foo bar baz
      (regexp-quote "[TestTopleftStyle]"))
     (context-test-with-temp-customization-value
      org-context-table-topleft-style
-     "TestTopleftStyle"
+     '("TestTopleftStyle" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-topleft-style-plist ()
@@ -5565,7 +5997,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-topleft-style "TestTopleftStyle")))))))
+         :context-table-topleft-style ("TestTopleftStyle" . ""))))))))
+(ert-deftest test-org-context/table-topleft-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestTopleftStyleDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-topleft-style ("TestTopleftStyle" . "TestTopleftStyleDef"))))))))
+(ert-deftest test-org-context/table-topleft-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestTopleftStyle]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-topleft-style ("TestTopleftStyle" . ""))))))))
 (ert-deftest test-org-context/table-topright-style-cust ()
   "Test table body style override"
   (should
@@ -5576,7 +6032,7 @@ foo bar baz
      (regexp-quote "[TestToprightStyle]"))
     (context-test-with-temp-customization-value
      org-context-table-topright-style
-     "TestToprightStyle"
+     '("TestToprightStyle" . "")
      (context-test-with-temp-text test-org-context--basic-table
       (org-trim (org-export-as 'context nil nil t '(:context-preset "empty"))))))))
 (ert-deftest test-org-context/table-topright-style-plist ()
@@ -5593,7 +6049,31 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-topright-style "TestToprightStyle")))))))
+         :context-table-topright-style ("TestToprightStyle" . ""))))))))
+(ert-deftest test-org-context/table-topright-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestToprightStyleDef"
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-topright-style ("TestToprightStyle" . "TestToprightStyleDef"))))))))
+(ert-deftest test-org-context/table-topright-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestToprightStyle]")
+    (context-test-with-temp-text
+     test-org-context--basic-table
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-topright-style ("TestToprightStyle" . ""))))))))
 (ert-deftest test-org-context/table-toprow-style-cust ()
   "Test table body style override"
   (should
@@ -5604,7 +6084,7 @@ foo bar baz
      (regexp-quote "[TestToprowStyle]"))
     (context-test-with-temp-customization-value
      org-context-table-toprow-style
-     "TestToprowStyle"
+     '("TestToprowStyle" . "")
      (context-test-with-temp-text
       "| abc |
 | 123 |"
@@ -5624,7 +6104,33 @@ foo bar baz
       (org-export-as
        'context nil nil t
        '(:context-preset "empty"
-         :context-table-toprow-style "TestToprowStyle")))))))
+         :context-table-toprow-style ("TestToprowStyle" . ""))))))))
+(ert-deftest test-org-context/table-toprow-style-def-nonnil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    "TestToprowStyleDef"
+    (context-test-with-temp-text
+     "| abc |
+| 123 |"
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-toprow-style ("TestToprowStyle" . "TestToprowStyleDef"))))))))
+(ert-deftest test-org-context/table-toprow-style-def-nil ()
+  "Test table body style override"
+  (should
+   (string-match-p
+    (regexp-quote "\\setupxtable[TestToprowStyle]")
+    (context-test-with-temp-text
+     "| abc |
+| 123 |"
+     (org-trim
+      (org-export-as
+       'context nil nil nil
+       '(:context-preset "empty"
+         :context-table-toprow-style ("TestToprowStyle" . ""))))))))
 ;;;; Table approximate layout
 (ert-deftest test-org-context/table-layout ()
   "Test complete table structure."
@@ -5635,27 +6141,27 @@ foo bar baz
            (org-export-as
             'context nil nil t
             '(:context-preset "empty"
-              :context-table-body-style "TestBodyStyle"
-              :context-table-bottomleft-style "TestBottomleftStyle"
-              :context-table-bottomright-style  "TestBottomrightStyle"
-              :context-table-bottomrow-style "TestBottomRowStyle"
-              :context-table-colgroup-end-style  "TestColgroupEndStyle"
-              :context-table-colgroup-start-style "TestColgroupStartStyle"
-              :context-table-footer-bottom-style "TestFooterBottomStyle"
-              :context-table-footer-mid-style "TestFooterMidStyle"
-              :context-table-footer-style "TestFooterStyle"
-              :context-table-footer-top-style "TestFooterTopStyle"
-              :context-table-header-bottom-style "TestHeaderBottomStyle"
-              :context-table-header-mid-style "TestHeaderMidStyle"
-              :context-table-header-style "TestHeaderStyle"
-              :context-table-header-top-style "TestHeaderTopStyle"
-              :context-table-leftcol-style "TestLeftcolStyle"
-              :context-table-rightcol-style "TestRightcolStyle"
-              :context-table-rowgroup-end-style "TestRowgroupEndStyle"
-              :context-table-rowgroup-start-style "TestRowgroupStartStyle"
-              :context-table-topleft-style "TestTopleftStyle"
-              :context-table-topright-style "TestToprightStyle"
-              :context-table-toprow-style "TestToprowStyle"))))))
+              :context-table-body-style ("TestBodyStyle" . "")
+              :context-table-bottomleft-style ("TestBottomleftStyle" . "")
+              :context-table-bottomright-style  ("TestBottomrightStyle" . "")
+              :context-table-bottomrow-style ("TestBottomRowStyle" . "")
+              :context-table-colgroup-end-style  ("TestColgroupEndStyle" . "")
+              :context-table-colgroup-start-style ("TestColgroupStartStyle" . "")
+              :context-table-footer-bottom-style ("TestFooterBottomStyle" . "")
+              :context-table-footer-mid-style ("TestFooterMidStyle" . "")
+              :context-table-footer-style ("TestFooterStyle" . "")
+              :context-table-footer-top-style ("TestFooterTopStyle" . "")
+              :context-table-header-bottom-style ("TestHeaderBottomStyle" . "")
+              :context-table-header-mid-style ("TestHeaderMidStyle" . "")
+              :context-table-header-style ("TestHeaderStyle" . "")
+              :context-table-header-top-style ("TestHeaderTopStyle" . "")
+              :context-table-leftcol-style ("TestLeftcolStyle" . "")
+              :context-table-rightcol-style ("TestRightcolStyle" . "")
+              :context-table-rowgroup-end-style ("TestRowgroupEndStyle" . "")
+              :context-table-rowgroup-start-style ("TestRowgroupStartStyle" . "")
+              :context-table-topleft-style ("TestTopleftStyle" . "")
+              :context-table-topright-style ("TestToprightStyle" . "")
+              :context-table-toprow-style ("TestToprowStyle" . "")))))))
     (should
      (string-match-p
       (concat