diff --git a/docs/cn/caps.cn.md b/docs/cn/caps.cn.md
index b93dd5a75..5bfd330eb 100644
--- a/docs/cn/caps.cn.md
+++ b/docs/cn/caps.cn.md
@@ -1,5 +1,7 @@
 # Appium 服务关键字
 
+<expand_table>
+
 |关键字|描述|实例|
 |----|-----------|-------|
 |`app`|`.ipa` or `.apk`文件所在的本地绝对路径或者远程路径,也可以是一个包括两者的`.zip`. Appium会先尝试安装路径对应的应用在适当的真机或模拟器上.也可以是一个`chrome`或者`chromium`，这样就会在android系统中其中chrome或chromium,也可以是`safari`会启动ios上的safari. 针对Android系统，如果你指定`app-package`和`app-activity`(具体见下面)的话，那么就可以不指定`app`.|比如`/abs/path/to/my.apk`或`http://myapp.com/app.ipa`, Android上的`chrome`, `chromium`, iOS的`safari`|
@@ -11,6 +13,8 @@
 
 ### Android特有
 
+<expand_table>
+
 |关键字|描述|实例|
 |----|-----------|-------|
 |`app-activity`| 你要启动的Android 应用对应的Activity名称|比如`MainActivity`, `.Settings`|
@@ -21,6 +25,8 @@
 
 ### iOS特有
 
+<expand_table>
+
 |关键字|描述|实例|
 |----|-----------|-------|
 |`calendarFormat`| 为iOS的模拟器设置日历格式|比如. `gregorian`公历|
diff --git a/docs/cn/server-args.cn.md b/docs/cn/server-args.cn.md
index 0b5873122..c3522d21a 100644
--- a/docs/cn/server-args.cn.md
+++ b/docs/cn/server-args.cn.md
@@ -5,6 +5,8 @@
 ###
 所有的标志都是可选的，但是有一些标志需要组合在一起才能生效。
 
+<expand_table>
+
 |标志|默认值|描述|例子|
 |----|-------|-----------|-------|
 |`--shell`|null|进入 REPL 模式||
diff --git a/docs/en/caps.md b/docs/en/caps.md
index d9b93ae30..773d6799f 100644
--- a/docs/en/caps.md
+++ b/docs/en/caps.md
@@ -1,5 +1,7 @@
 # Appium server capabilities
 
+<expand_table>
+
 |Capability|Description|Values|
 |----|-----------|-------|
 |`automationName`|Which automation engine to use|`Appium` (default) or `Selendroid`|
@@ -13,6 +15,8 @@
 
 ### Android Only
 
+<expand_table>
+
 |Capability|Description|Values|
 |----|-----------|-------|
 |`appActivity`| Activity name for the Android activity you want to launch from your package|`MainActivity`, `.Settings`|
@@ -29,6 +33,8 @@
 
 ### iOS Only
 
+<expand_table>
+
 |Capability|Description|Values|
 |----|-----------|-------|
 |`calendarFormat`| (Sim-only) Calendar format to set for the iOS Simulator|e.g. `gregorian`|
diff --git a/docs/en/server-args.md b/docs/en/server-args.md
index c94964233..f0f819239 100644
--- a/docs/en/server-args.md
+++ b/docs/en/server-args.md
@@ -3,9 +3,12 @@
 Usage: `node . [flags]`
 
 ## Server flags
-
 All flags are optional, but some are required in conjunction with certain others.
 
+
+
+<expand_table>
+
 |Flag|Default|Description|Example|
 |----|-------|-----------|-------|
 |`--shell`|null|Enter REPL mode||
@@ -64,4 +67,4 @@ All flags are optional, but some are required in conjunction with certain others
 |`--key-password`|android|(Android-only) Key password||
 |`--show-config`|false|Show info about the appium server configuration and exit||
 |`--command-timeout`|60|The default command timeout for the server to use for all sessions. Will still be overridden by newCommandTimeout cap||
-|`--keep-keychains`|false|(iOS) Whether to keep keychains (Library/Keychains) when reset app between sessions||
\ No newline at end of file
+|`--keep-keychains`|false|(iOS) Whether to keep keychains (Library/Keychains) when reset app between sessions||
diff --git a/grunt-helpers.js b/grunt-helpers.js
index 6f9d3a528..9dffd2159 100644
--- a/grunt-helpers.js
+++ b/grunt-helpers.js
@@ -565,16 +565,12 @@ module.exports.installAndroidApp = function (grunt, appName, cb) {
 module.exports.generateServerDocs = function (grunt, cb) {
   var p = parser();
   var docFile = path.resolve(__dirname, "docs/en/server-args.md");
-  var md = "---\n" +
-           "title: Appium server arguments\n" +
-           "layout: default\n" +
-           "---\n\n" +
-           "Appium server arguments\n" +
-           "==========\n\n";
+  var md = "# Appium server arguments\n\n";
   md += "Usage: `node . [flags]`\n\n";
-  md += "### Server flags\n";
+  md += "## Server flags\n";
   md += "All flags are optional, but some are required in conjunction with " +
         "certain others.\n\n";
+  md += "\n\n<expand_table>\n\n";
   md += "|Flag|Default|Description|Example|\n";
   md += "|----|-------|-----------|-------|\n";
   _.each(p.rawArgs, function (arg) {