diff --git a/erpnext/docs/assets/img/setup-wizard/step-1.png b/erpnext/docs/assets/img/setup-wizard/step-1.png
index 0a3c230..79d4e1f 100644
--- a/erpnext/docs/assets/img/setup-wizard/step-1.png
+++ b/erpnext/docs/assets/img/setup-wizard/step-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-10.png b/erpnext/docs/assets/img/setup-wizard/step-10.png
index 4687999..f16ab62 100644
--- a/erpnext/docs/assets/img/setup-wizard/step-10.png
+++ b/erpnext/docs/assets/img/setup-wizard/step-10.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-10a.png b/erpnext/docs/assets/img/setup-wizard/step-10a.png
new file mode 100644
index 0000000..5f40555
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-10a.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-11.png b/erpnext/docs/assets/img/setup-wizard/step-11.png
new file mode 100644
index 0000000..229c360
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-11.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-11a.png b/erpnext/docs/assets/img/setup-wizard/step-11a.png
new file mode 100644
index 0000000..2804bc9
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-11a.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-12.png b/erpnext/docs/assets/img/setup-wizard/step-12.png
new file mode 100644
index 0000000..ea6cb8e
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-12.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-12a.png b/erpnext/docs/assets/img/setup-wizard/step-12a.png
new file mode 100644
index 0000000..3b156ee
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-12a.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-2.png b/erpnext/docs/assets/img/setup-wizard/step-2.png
index 7330004..abd9deb 100644
--- a/erpnext/docs/assets/img/setup-wizard/step-2.png
+++ b/erpnext/docs/assets/img/setup-wizard/step-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-3.png b/erpnext/docs/assets/img/setup-wizard/step-3.png
index 7aac64a..182d153 100644
--- a/erpnext/docs/assets/img/setup-wizard/step-3.png
+++ b/erpnext/docs/assets/img/setup-wizard/step-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-4.png b/erpnext/docs/assets/img/setup-wizard/step-4.png
index cee29fc..d799f4b 100644
--- a/erpnext/docs/assets/img/setup-wizard/step-4.png
+++ b/erpnext/docs/assets/img/setup-wizard/step-4.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-5.png b/erpnext/docs/assets/img/setup-wizard/step-5.png
index a770f3e..fbe8bf6 100644
--- a/erpnext/docs/assets/img/setup-wizard/step-5.png
+++ b/erpnext/docs/assets/img/setup-wizard/step-5.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-6.png b/erpnext/docs/assets/img/setup-wizard/step-6.png
index db2bf38..a1675dd 100644
--- a/erpnext/docs/assets/img/setup-wizard/step-6.png
+++ b/erpnext/docs/assets/img/setup-wizard/step-6.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-6a.png b/erpnext/docs/assets/img/setup-wizard/step-6a.png
new file mode 100644
index 0000000..f9388b5
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-6a.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-7.png b/erpnext/docs/assets/img/setup-wizard/step-7.png
index 02c6da6..9e5f8fc 100644
--- a/erpnext/docs/assets/img/setup-wizard/step-7.png
+++ b/erpnext/docs/assets/img/setup-wizard/step-7.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-8.png b/erpnext/docs/assets/img/setup-wizard/step-8.png
index 18f8d88..2e12519 100644
--- a/erpnext/docs/assets/img/setup-wizard/step-8.png
+++ b/erpnext/docs/assets/img/setup-wizard/step-8.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-8a.png b/erpnext/docs/assets/img/setup-wizard/step-8a.png
new file mode 100644
index 0000000..764e64f
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-8a.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-9.png b/erpnext/docs/assets/img/setup-wizard/step-9.png
index dced6e0..b417cf8 100644
--- a/erpnext/docs/assets/img/setup-wizard/step-9.png
+++ b/erpnext/docs/assets/img/setup-wizard/step-9.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/step-9a.png b/erpnext/docs/assets/img/setup-wizard/step-9a.png
new file mode 100644
index 0000000..f409785
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-9a.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup-wizard/twofactor.png b/erpnext/docs/assets/img/setup-wizard/twofactor.png
deleted file mode 100644
index ada4f5b..0000000
--- a/erpnext/docs/assets/img/setup-wizard/twofactor.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md
index c05c4af..36b79ce 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md
@@ -1,6 +1,6 @@
 # Setup Wizard
 
-The Setup Wizard helps you quickly setup ERPnext as per your locale and sets up your organisation.
+The Setup Wizard helps you quickly setup ERPnext as per your locale and sets up your organization.
 
 Here is a quick overview of the steps:
 
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt
index b2f680a..91c3afc 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt
@@ -1,5 +1,12 @@
-step-1-language
-step-2-currency-and-timezone
-step-3-user-details
-step-4-two-factor-authentication
-step-5-company-details
+step-01-language
+step-02-currency-and-timezone
+step-03-user-details
+step-04-select-domain
+step-05-the-brand
+step-06-your-organization
+step-07-setup-company-complete
+step-08-set-sales-target
+step-09-customers
+step-10-letterhead
+step-11-suppliers
+step-12-users
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md
similarity index 100%
rename from erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md
new file mode 100644
index 0000000..4f0fbcc
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md
@@ -0,0 +1,15 @@
+# Step 2: Country, Currency and Time Zone
+
+Set your Country Name, Time Zone and Currency.
+
+<img alt="Currency" class="screenshot" src="/docs/assets/img/setup-wizard/step-2.png">
+
+### Default Currency
+
+For most countries, your currency and time zone will be automatically set.
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md
new file mode 100644
index 0000000..d85c940
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md
@@ -0,0 +1,11 @@
+# Step 3: User Details
+
+Enter the First User. Give the Full Name, Email Address (as User ID) and Password. This first user will be setup as a System Manager with privileges similar to the Administrator account.
+
+<img alt="User" class="screenshot" src="/docs/assets/img/setup-wizard/step-3.png">
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md
new file mode 100644
index 0000000..523195b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md
@@ -0,0 +1,11 @@
+# Step 4: Select Domain
+
+Select the domain(s) that will be enabled after setup.
+
+<img alt="Domains" class="screenshot" src="/docs/assets/img/setup-wizard/step-4.png">
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md
new file mode 100644
index 0000000..a310144
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md
@@ -0,0 +1,17 @@
+# Step 5: The Brand
+
+Enter Company Name, Abbreviation and add a logo.
+
+<img alt="Company Details" class="screenshot" src="/docs/assets/img/setup-wizard/step-5.png">
+
+### Company Abbreviation
+
+These will be appended to your **Account** Heads, for example if your abbreviation is **WPL**, then your Sales account will be **Sales - WPL**
+
+For Example: East Wind will be abbreviated as EW. Shades of Green will be abbreviated as SOG. In case you wish to give your own abbreviation, you can do so. The text field allows any type of text.
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md
new file mode 100644
index 0000000..301e529
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md
@@ -0,0 +1,23 @@
+# Step 6: Your Organization
+
+Enter in a short sentence of what your company does. This is often a mission statement or vision statement.
+
+Add the name of the organization's primary financial institution. This information will populate **Accounts**.
+
+<img alt="Company Details" class="screenshot" src="/docs/assets/img/setup-wizard/step-6.png">
+
+### Chart of Accounts
+
+Select whether the organization will use a standard chart of accounts without number or a standard chart of accounts with numbers.  The out of box chart of accounts is the same either way.
+
+### Financial Year
+
+Any annual period at the end of which a firm's accounts are made up is called a Financial Year. Some countries have their account year starting from 1st January and some 1st April.
+
+The end date will be set automatically
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md
new file mode 100644
index 0000000..477a2ca
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md
@@ -0,0 +1,15 @@
+# Step 7: Initial Setup Complete
+
+The initial setup wizard will create all the settings needed including the first system manager user. 
+
+<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-6a.png">
+
+When complete, the Setup Wizard will go to the Desk and begin a secondary set of steps. This screen shows that the initial setup wizard is complete and begins the secondary setup wizard.
+
+<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-7.png">
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md
new file mode 100644
index 0000000..98d9f75
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md
@@ -0,0 +1,15 @@
+# Step 8: Set Sales Target
+
+Set a monthly sales target for the organization in the currency selected during Step 2.
+
+<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-8.png">
+
+If a sales target is not known, then clicking **Mark as Done** will complete the step.
+
+<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-8a.png">
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md
new file mode 100644
index 0000000..9b38ae6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md
@@ -0,0 +1,15 @@
+# Step 9: Add Customers
+
+Add known customers to the system.
+
+<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-9.png">
+
+If customers are not known, then clicking **Mark as Done** will complete the step.
+
+<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-9a.png"> 
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md
new file mode 100644
index 0000000..55dccb1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md
@@ -0,0 +1,15 @@
+# Step 10: Company Letter Head
+
+Add a company logo to be used as a standard letter head on all printed invoices and other document types. Ideally the logo is 900px by 100px.
+
+<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-10.png">
+
+If a letter head logo file is not available, the clicking **Mark as Done** will complete the step.
+
+<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-10a.png">
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md
new file mode 100644
index 0000000..f1e9967
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md
@@ -0,0 +1,20 @@
+# Step 11: Add Suppliers
+
+Add known suppliers to the system.
+
+<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-11.png">
+
+If suppliers are not known, then clicking **Mark as Done** will complete the step.
+
+<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-11a.png"> 
+
+
+## Step 11a: Other Domain Specific Steps
+
+Depending on the domain(s) selected in Step 4, there will be more screens to fill in for the secondary setup wizard.
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md
new file mode 100644
index 0000000..cc2a4ae
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md
@@ -0,0 +1,15 @@
+# Step 12: Add Users
+
+The last step in the secondary setup wizard will prompt to add more users to the system. These users will be regular non-privileged users.
+
+<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-12.png">
+
+If users are not known, then clicking **Mark as Done** will complete the step.
+
+<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-12a.png"> 
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md
deleted file mode 100644
index 6809f40..0000000
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Step 2: Currency and Timezone
-
-Set your country name, currency and timezone.
-
-<img alt="Currency" class="screenshot" src="/docs/assets/img/setup-wizard/step-2.png">
-
----
-
-### Default Currency
-
-For most countries, your currency and timezone will be automatically set
-
-{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md
deleted file mode 100644
index 228b972..0000000
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Step 3: User Details
-
-Enter Users Profile Details like Name, User ID and preferred password.
-
-<img alt="User" class="screenshot" src="/docs/assets/img/setup-wizard/step-3.png">
-
----
-
-Note: Add your own photograph, not your company's
-
-{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-4-two-factor-authentication.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-4-two-factor-authentication.md
deleted file mode 100644
index 66bbd07..0000000
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-4-two-factor-authentication.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Step 4: Two Factor Authentication
-
-Enable Two Factor Athentication
-
-<img alt="TwoFactor" class="screenshot" src="/docs/assets/img/setup-wizard/twofactor.png">
-
----
-###Authentication Method
-Whenevever each user logs in, based on the role set for that user,
-they will be asked for a **One Time Password** after they input 
-their login details.
-
-{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-5-company-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-5-company-details.md
deleted file mode 100644
index 13a87e9..0000000
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-5-company-details.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Step 5: Company Details
-
-Enter Company Details like Name, Abbreviation and Financial Year Details.
-
-<img alt="Company Details" class="screenshot" src="/docs/assets/img/setup-wizard/step-4.png">
-
----
-
-### Company Abbreviation
-
-These will be appened to your **Account** Heads, for example if your abbreviation is **WP**, then your Sales account will be **Sales - WPL**
-
-For Example: East Wind will be abbreviated as EW. Shades of Green will be abbreviated as SOG. In case you wish to give your own abbreviation, you can do so. The text field allows any type of text.
-
-### Financial Year
-
-Any annual period at the end of which a firm's accounts are made up is called a Financial Year. Some countries have their account year starting from 1st January and some 1st April.
-
-The end date will be set automatically
-
-{next}