diff --git a/lib/componentFactory.js b/lib/componentFactory.js
index 858d506..02cfb31 100644
--- a/lib/componentFactory.js
+++ b/lib/componentFactory.js
@@ -18,7 +18,7 @@ module.exports = function(element) {
        if (element.attr('class')) {
           classes = classes.concat(element.attr('class').split(' '));
        }
-       return format('<table class="%s"><tr><th>&nbsp;</th></tr></table>', classes.join(' '))
+       return format('<table class="%s" role="presentation"><tr><th>&nbsp;</th></tr></table>', classes.join(' '))
 
     // <column>
     case this.components.columns:
@@ -31,7 +31,7 @@ module.exports = function(element) {
         classes = classes.concat(element.attr('class').split(' '));
       }
 
-      return format('<table %s class="%s"><tbody><tr>%s</tr></tbody></table>', attrs, classes.join(' '), inner);
+      return format('<table %s class="%s" role="presentation"><tbody><tr>%s</tr></tbody></table>', attrs, classes.join(' '), inner);
 
     // <button>
     case this.components.button:
@@ -60,7 +60,7 @@ module.exports = function(element) {
         classes = classes.concat(element.attr('class').split(' '));
       }
 
-      return format('<table class="%s"><tbody><tr><td><table><tbody><tr><td>%s</td></tr></tbody></table></td>%s</tr></tbody></table>', classes.join(' '), inner, expander);
+      return format('<table class="%s" role="presentation"><tbody><tr><td><table role="presentation"><tbody><tr><td>%s</td></tr></tbody></table></td>%s</tr></tbody></table>', classes.join(' '), inner, expander);
 
     // <container>
     case this.components.container:
@@ -69,7 +69,7 @@ module.exports = function(element) {
         classes = classes.concat(element.attr('class').split(' '));
       }
 
-      return format('<table %s align="center" class="%s"><tbody><tr><td>%s</td></tr></tbody></table>', attrs, classes.join(' '), inner);
+      return format('<table %s align="center" class="%s" role="presentation"><tbody><tr><td>%s</td></tr></tbody></table>', attrs, classes.join(' '), inner);
 
     // <inky>
     case this.components.inky:
@@ -81,7 +81,7 @@ module.exports = function(element) {
       if (element.attr('class')) {
         classes = classes.concat(element.attr('class').split(' '));
       }
-      return format('<table class="%s"><tbody><tr>%s</tr></tbody></table>', classes.join(' '), inner);
+      return format('<table class="%s" role="presentation"><tbody><tr>%s</tr></tbody></table>', classes.join(' '), inner);
 
     // <menu>
     case this.components.menu:
@@ -89,7 +89,7 @@ module.exports = function(element) {
       if (element.attr('class')) {
         classes = classes.concat(element.attr('class').split(' '));
       }
-      return format('<table %s class="%s"><tbody><tr><td><table><tbody><tr>%s</tr></tbody></table></td></tr></tbody></table>', attrs, classes.join(' '), inner);
+      return format('<table %s class="%s" role="presentation"><tbody><tr><td><table><tbody><tr>%s</tr></tbody></table></td></tr></tbody></table>', attrs, classes.join(' '), inner);
 
     // <item>
     case this.components.menuItem:
@@ -125,7 +125,7 @@ module.exports = function(element) {
         classes = classes.concat(element.attr('class').split(' '));
       }
 
-      return format('<table %s class="callout"><tbody><tr><th class="%s">%s</th><th class="expander"></th></tr></tbody></table>', attrs, classes.join(' '), inner);
+      return format('<table %s class="callout" role="presentation"><tbody><tr><th class="%s">%s</th><th class="expander"></th></tr></tbody></table>', attrs, classes.join(' '), inner);
 
     // <spacer>
     case this.components.spacer:
@@ -138,15 +138,15 @@ module.exports = function(element) {
       if (element.attr('size-sm') || element.attr('size-lg')) {
         if (element.attr('size-sm')) {
           size = (element.attr('size-sm'));
-          html += format('<table %s class="%s hide-for-large"><tbody><tr><td height="'+size+'px" style="font-size:'+size+'px;line-height:'+size+'px;">&nbsp;</td></tr></tbody></table>', attrs);
+          html += format('<table %s class="%s hide-for-large" role="presentation"><tbody><tr><td height="'+size+'px" style="font-size:'+size+'px;line-height:'+size+'px;">&nbsp;</td></tr></tbody></table>', attrs);
         }
         if (element.attr('size-lg')) {
           size = (element.attr('size-lg'));
-          html += format('<table %s class="%s show-for-large"><tbody><tr><td height="'+size+'px" style="font-size:'+size+'px;line-height:'+size+'px;">&nbsp;</td></tr></tbody></table>', attrs);
+          html += format('<table %s class="%s show-for-large" role="presentation"><tbody><tr><td height="'+size+'px" style="font-size:'+size+'px;line-height:'+size+'px;">&nbsp;</td></tr></tbody></table>', attrs);
         }
       } else {
         size = (element.attr('size')) || 16;
-        html += format('<table %s class="%s"><tbody><tr><td height="'+size+'px" style="font-size:'+size+'px;line-height:'+size+'px;">&nbsp;</td></tr></tbody></table>', attrs);
+        html += format('<table %s class="%s" role="presentation"><tbody><tr><td height="'+size+'px" style="font-size:'+size+'px;line-height:'+size+'px;">&nbsp;</td></tr></tbody></table>', attrs);
       }
 
       if( element.attr('size-sm') && element.attr('size-lg') ) {
@@ -162,7 +162,7 @@ module.exports = function(element) {
         classes = classes.concat(element.attr('class').split(' '));
       }
 
-      return format('<table %s class="%s" align="center"><tbody><tr><td class="wrapper-inner">%s</td></tr></tbody></table>', attrs, classes.join(' '), inner);
+      return format('<table %s class="%s" align="center" role="presentation"><tbody><tr><td class="wrapper-inner">%s</td></tr></tbody></table>', attrs, classes.join(' '), inner);
 
     default:
       // If it's not a custom component, return it as-is