diff --git a/content/en/commands/hugo_convert.md b/content/en/commands/hugo_convert.md
index a4d0e501b..07f7f9c13 100644
--- a/content/en/commands/hugo_convert.md
+++ b/content/en/commands/hugo_convert.md
@@ -13,10 +13,6 @@ Convert your content (e.g. front matter) to different formats.
 
 See convert's subcommands toJSON, toTOML and toYAML for more information.
 
-```
-hugo convert [command] [flags]
-```
-
 ### Options
 
 ```
diff --git a/content/en/commands/hugo_gen.md b/content/en/commands/hugo_gen.md
index 620d60676..5c8bd6f2c 100644
--- a/content/en/commands/hugo_gen.md
+++ b/content/en/commands/hugo_gen.md
@@ -7,10 +7,6 @@ url: /commands/hugo_gen/
 
 A collection of several useful generators.
 
-```
-hugo gen [command] [flags]
-```
-
 ### Options
 
 ```
diff --git a/content/en/commands/hugo_import.md b/content/en/commands/hugo_import.md
index 570353d34..a6bd40f34 100644
--- a/content/en/commands/hugo_import.md
+++ b/content/en/commands/hugo_import.md
@@ -13,10 +13,6 @@ Import your site from other web site generators like Jekyll.
 
 Import requires a subcommand, e.g. `hugo import jekyll jekyll_root_path target_path`.
 
-```
-hugo import [command] [flags]
-```
-
 ### Options
 
 ```
diff --git a/content/en/commands/hugo_list.md b/content/en/commands/hugo_list.md
index 7cd2b288d..294a8eaa4 100644
--- a/content/en/commands/hugo_list.md
+++ b/content/en/commands/hugo_list.md
@@ -13,10 +13,6 @@ Listing out various types of content.
 
 List requires a subcommand, e.g. hugo list drafts
 
-```
-hugo list [command] [flags]
-```
-
 ### Options
 
 ```
diff --git a/content/en/commands/hugo_new.md b/content/en/commands/hugo_new.md
index 267f6a426..ef0ff4cd4 100644
--- a/content/en/commands/hugo_new.md
+++ b/content/en/commands/hugo_new.md
@@ -18,10 +18,6 @@ If archetypes are provided in your theme or site, they will be used.
 
 Ensure you run this within the root directory of your site.
 
-```
-hugo new [command] [flags]
-```
-
 ### Options
 
 ```
@@ -50,5 +46,5 @@ hugo new [command] [flags]
 * [hugo](/commands/hugo/)	 - hugo builds your site
 * [hugo new content](/commands/hugo_new_content/)	 - Create new content for your site
 * [hugo new site](/commands/hugo_new_site/)	 - Create a new site (skeleton)
-* [hugo new theme](/commands/hugo_new_theme/)	 - Create a new site (skeleton)
+* [hugo new theme](/commands/hugo_new_theme/)	 - Create a new theme (skeleton)
 
diff --git a/content/en/commands/hugo_new_content.md b/content/en/commands/hugo_new_content.md
index 0aa897c64..c7f87631c 100644
--- a/content/en/commands/hugo_new_content.md
+++ b/content/en/commands/hugo_new_content.md
@@ -10,13 +10,13 @@ Create new content for your site
 ### Synopsis
 
 Create a new content file and automatically set the date and title.
-		It will guess which kind of file to create based on the path provided.
-		
-		You can also specify the kind with `-k KIND`.
-		
-		If archetypes are provided in your theme or site, they will be used.
-		
-		Ensure you run this within the root directory of your site.
+It will guess which kind of file to create based on the path provided.
+
+You can also specify the kind with `-k KIND`.
+
+If archetypes are provided in your theme or site, they will be used.
+
+Ensure you run this within the root directory of your site.
 
 ```
 hugo new content [path] [flags]
diff --git a/content/en/commands/hugo_new_site.md b/content/en/commands/hugo_new_site.md
index fb465dc7d..f8a939df5 100644
--- a/content/en/commands/hugo_new_site.md
+++ b/content/en/commands/hugo_new_site.md
@@ -20,8 +20,9 @@ hugo new site [path] [flags]
 ### Options
 
 ```
-  -f, --force   init inside non-empty directory
-  -h, --help    help for site
+  -f, --force           init inside non-empty directory
+      --format string   preferred file format (toml, yaml or json) (default "toml")
+  -h, --help            help for site
 ```
 
 ### Options inherited from parent commands
diff --git a/content/en/commands/hugo_new_theme.md b/content/en/commands/hugo_new_theme.md
index 027f636f2..301c79e0c 100644
--- a/content/en/commands/hugo_new_theme.md
+++ b/content/en/commands/hugo_new_theme.md
@@ -5,16 +5,17 @@ url: /commands/hugo_new_theme/
 ---
 ## hugo new theme
 
-Create a new site (skeleton)
+Create a new theme (skeleton)
 
 ### Synopsis
 
-Create a new site in the provided directory.
-The new site will have the correct structure, but no content or theme yet.
-Use `hugo new [contentPath]` to create new content.
+Create a new theme (skeleton) called [name] in ./themes.
+New theme is a skeleton. Please add content to the touched files. Add your
+name to the copyright line in the license and adjust the theme.toml file
+according to your needs.
 
 ```
-hugo new theme [path] [flags]
+hugo new theme [name] [flags]
 ```
 
 ### Options