diff --git a/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownFromURLMacro.java b/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownFromURLMacro.java
index e5d82aa..62908a9 100644
--- a/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownFromURLMacro.java
+++ b/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownFromURLMacro.java
@@ -79,8 +79,8 @@ public class MarkdownFromURLMacro extends BaseMacro implements Macro {
                     .set(TablesExtension.APPEND_MISSING_COLUMNS, true)
                     .set(TablesExtension.DISCARD_EXTRA_COLUMNS, true)
                     .set(TablesExtension.HEADER_SEPARATOR_COLUMN_MATCH, true)
-                    .set(Parser.EXTENSIONS, Arrays.asList(TablesExtension.create()))
-                    ;
+                    .set(TablesExtension.CLASS_NAME, "confluenceTable")
+                    .set(Parser.EXTENSIONS, Arrays.asList(TablesExtension.create()));
 
 			options.set(Parser.EXTENSIONS, Arrays.asList(
 				TablesExtension.create(), 
@@ -99,11 +99,24 @@ public class MarkdownFromURLMacro extends BaseMacro implements Macro {
 
 
 			String highlightjs = "<script>\n" +
-					"AJS.$('[data-macro-name=\"markdown\"] code').each(function(i, block) {\n" +
+					"AJS.$('[data-macro-name=\"markdown-from-url\"] code').each(function(i, block) {\n" +
 					"    hljs.highlightBlock(block);\n" +
 					"  });\n" +
 					"</script>";
 
+			String highlightjscss = "<style>\n"+
+					".hljs {display: inline;}\n" +
+					"pre > code {display: block !important;}\n" +
+					"</style>";
+
+			String tableFixJs = "<script>AJS.$('[data-macro-name=\"markdown-from-url\"] table thead th').each(function(i, block) {\n" +
+                    "    block.classList.add(\"confluenceTh\");\n" +
+                    "});\n" +
+                    "\n" +
+                    "AJS.$('[data-macro-name=\"markdown-from-url\"] table tbody tr td').each(function(i, block) {\n" +
+                    "    block.classList.add(\"confluenceTd\");\n" +
+                    "});</script>";
+
 			class privateRepositoryException extends Exception {
 				public privateRepositoryException(String message) {
 					super(message);
@@ -131,7 +144,7 @@ public class MarkdownFromURLMacro extends BaseMacro implements Macro {
 					throw new privateRepositoryException("Cannot import from private repository.");
 				}else {
 					Node document = parser.parse(toParse);
-					html = renderer.render(document) + highlightjs;
+					html = renderer.render(document) + highlightjs + highlightjscss + tableFixJs;
 				}
 			}
 			catch (MalformedURLException u) {
diff --git a/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java b/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java
index 98351bb..a57e830 100644
--- a/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java
+++ b/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java
@@ -69,6 +69,7 @@ public class MarkdownMacro extends BaseMacro implements Macro {
                 .set(TablesExtension.APPEND_MISSING_COLUMNS, true)
                 .set(TablesExtension.DISCARD_EXTRA_COLUMNS, true)
                 .set(TablesExtension.HEADER_SEPARATOR_COLUMN_MATCH, true)
+                .set(TablesExtension.CLASS_NAME, "confluenceTable")
                 .set(Parser.EXTENSIONS, Arrays.asList(TablesExtension.create()));
 
         options.set(Parser.EXTENSIONS, Arrays.asList(
@@ -98,6 +99,13 @@ public class MarkdownMacro extends BaseMacro implements Macro {
                 "pre > code {display: block !important;}\n" +
                 "</style>";
 
+        String tableFixJs = "<script> AJS.$('[data-macro-name=\"markdown\"] table thead th').each(function(i, block) {\n" +
+                "    block.classList.add(\"confluenceTh\");\n" +
+                "});\n" +
+                "\n" +
+                "AJS.$('[data-macro-name=\"markdown\"] table tbody tr td').each(function(i, block) {\n" +
+                "    block.classList.add(\"confluenceTd\");\n" +
+                "});</script>";
 
 
         Parser parser = Parser.builder(options).build();
@@ -105,7 +113,7 @@ public class MarkdownMacro extends BaseMacro implements Macro {
 
         Node document = parser.parse(bodyContent);
 
-        String html = renderer.render(document ) + highlightjs + highlightjscss;  // "<p>This is <em>Sparta</em></p>\n"
+        String html = renderer.render(document ) + highlightjs + highlightjscss + tableFixJs;  // "<p>This is <em>Sparta</em></p>\n"
 
         return html;