diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index 488d3c4..e30daa2 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -1,4 +1,4 @@
-frappe.provide("erpnext.wiz");
+frappe.provide("erpnext.setup");
 
 frappe.pages['setup-wizard'].on_page_load = function(wrapper) {
 	if(frappe.sys_defaults.company) {
@@ -7,459 +7,400 @@
 	}
 };
 
-function load_erpnext_slides() {
-	$.extend(erpnext.wiz, {
-		select_domain: {
-			domains: ["all"],
-			title: __('Select your Domain'),
-			fields: [
-				{fieldname:'domain', label: __('Domain'), fieldtype:'Select',
-					options: [
-						{"label": __("Distribution"), "value": "Distribution"},
-						{"label": __("Education"), "value": "Education"},
-						{"label": __("Manufacturing"), "value": "Manufacturing"},
-						{"label": __("Retail"), "value": "Retail"},
-						{"label": __("Services"), "value": "Services"}
-					], reqd:1},
-			],
-			help: __('Select the nature of your business.'),
-			onload: function(slide) {
-				slide.get_input("domain").on("change", function() {
-					frappe.wiz.domain = $(this).val();
-					frappe.wizard.refresh_slides();
-				});
+var erpnext_slides = [
+	{
+		// Domain
+		name: 'domain',
+		domains: ["all"],
+		title: __('Select your Domain'),
+		fields: [
+			{
+				fieldname: 'domain', label: __('Domain'), fieldtype: 'Select',
+				options: [
+					{ "label": __("Distribution"), "value": "Distribution" },
+					{ "label": __("Education"), "value": "Education" },
+					{ "label": __("Manufacturing"), "value": "Manufacturing" },
+					{ "label": __("Retail"), "value": "Retail" },
+					{ "label": __("Services"), "value": "Services" }
+				], reqd: 1
 			},
-			css_class: "single-column"
+		],
+		help: __('Select the nature of your business.'),
+		onload: function (slide) {
+			slide.get_input("domain").on("change", function () {
+				frappe.setup.domain = $(this).val();
+				frappe.wizard.refresh_slides();
+			});
 		},
-		org: {
-			domains: ["all"],
-			title: __("The Organization"),
-			icon: "fa fa-building",
-			fields: [
-				{fieldname:'company_name',
-					label: frappe.wiz.domain==='Education' ?
-						__('Institute Name') : __('Company Name'),
-					fieldtype:'Data', reqd:1},
-				{fieldname:'company_abbr',
-					label: frappe.wiz.domain==='Education' ?
-						__('Institute Abbreviation') : __('Company Abbreviation'),
-					fieldtype:'Data'},
-				{fieldname:'company_tagline',
-					label: __('What does it do?'),
-					fieldtype:'Data',
-					placeholder: frappe.wiz.domain==='Education' ?
-						__('e.g. "Primary School" or "University"') :
-						__('e.g. "Build tools for builders"'),
-					reqd:1},
-				{fieldname:'bank_account', label: __('Bank Name'), fieldtype:'Data', reqd:1},
-				{fieldname:'chart_of_accounts', label: __('Chart of Accounts'),
-					options: "", fieldtype: 'Select'},
+	},
 
-				// TODO remove this
-				{fieldtype: "Section Break"},
-				{fieldname:'fy_start_date', label:__('Financial Year Start Date'), fieldtype:'Date',
-					description: __('Your financial year begins on'), reqd:1},
-				{fieldname:'fy_end_date', label:__('Financial Year End Date'), fieldtype:'Date',
-					description: __('Your financial year ends on'), reqd:1},
-			],
-			help: (frappe.wiz.domain==='Education' ?
-				__('The name of the institute for which you are setting up this system.'):
-				__('The name of your company for which you are setting up this system.')),
+	{
+		// Brand
+		name: 'brand',
+		domains: ["all"],
+		icon: "fa fa-bookmark",
+		title: __("The Brand"),
+		help: __('Upload your letter head and logo. (you can edit them later).'),
+		fields: [
+			{
+				fieldtype: "Attach Image", fieldname: "attach_logo",
+				label: __("Attach Logo"),
+				description: __("100px by 100px"),
+				is_private: 0
+			},
+			{
+				fieldname: 'company_name',
+				label: frappe.setup.domain === 'Education' ?
+					__('Institute Name') : __('Company Name'),
+				fieldtype: 'Data', reqd: 1
+			},
+			{
+				fieldname: 'company_abbr',
+				label: frappe.setup.domain === 'Education' ?
+					__('Institute Abbreviation') : __('Company Abbreviation'),
+				fieldtype: 'Data'
+			}
+		],
+		onload: function(slide) {
+			this.bind_events(slide);
+		},
+		bind_events: function (slide) {
+			slide.get_input("company_name").on("change", function () {
+				var parts = slide.get_input("company_name").val().split(" ");
+				var abbr = $.map(parts, function (p) { return p ? p.substr(0, 1) : null }).join("");
+				slide.get_field("company_abbr").set_input(abbr.slice(0, 5).toUpperCase());
+			}).val(frappe.boot.sysdefaults.company_name || "").trigger("change");
 
-			onload: function(slide) {
-				erpnext.wiz.org.load_chart_of_accounts(slide);
-				erpnext.wiz.org.bind_events(slide);
-				erpnext.wiz.org.set_fy_dates(slide);
+			slide.get_input("company_abbr").on("change", function () {
+				if (slide.get_input("company_abbr").val().length > 5) {
+					frappe.msgprint("Company Abbreviation cannot have more than 5 characters");
+					slide.get_field("company_abbr").set_input("");
+				}
+			});
+		}
+	},
+	{
+		// Organisation
+		name: 'organisation',
+		domains: ["all"],
+		title: __("Your Organization"),
+		icon: "fa fa-building",
+		help: (frappe.setup.domain === 'Education' ?
+			__('The name of the institute for which you are setting up this system.') :
+			__('The name of your company for which you are setting up this system.')),
+		fields: [
+			{
+				fieldname: 'company_tagline',
+				label: __('What does it do?'),
+				fieldtype: 'Data',
+				placeholder: frappe.setup.domain === 'Education' ?
+					__('e.g. "Primary School" or "University"') :
+					__('e.g. "Build tools for builders"'),
+				reqd: 1
+			},
+			{ fieldname: 'bank_account', label: __('Bank Name'), fieldtype: 'Data', reqd: 1 },
+			{
+				fieldname: 'chart_of_accounts', label: __('Chart of Accounts'),
+				options: "", fieldtype: 'Select'
 			},
 
-			validate: function() {
-				// validate fiscal year start and end dates
-				if (this.values.fy_start_date=='Invalid date' || this.values.fy_end_date=='Invalid date') {
-					frappe.msgprint(__("Please enter valid Financial Year Start and End Dates"));
-					return false;
+			{ fieldtype: "Section Break", label: "Financial Year" },
+			{ fieldname: 'fy_start_date', label: __('Start Date'), fieldtype: 'Date', reqd: 1 },
+			{ fieldtype: "Column Break" },
+			{ fieldname: 'fy_end_date', label: __('End Date'), fieldtype: 'Date', reqd: 1 },
+		],
+
+		onload: function (slide) {
+			this.load_chart_of_accounts(slide);
+			this.bind_events(slide);
+			this.set_fy_dates(slide);
+		},
+
+		validate: function () {
+			// validate fiscal year start and end dates
+			if (this.values.fy_start_date == 'Invalid date' || this.values.fy_end_date == 'Invalid date') {
+				frappe.msgprint(__("Please enter valid Financial Year Start and End Dates"));
+				return false;
+			}
+
+			if ((this.values.company_name || "").toLowerCase() == "company") {
+				frappe.msgprint(__("Company Name cannot be Company"));
+				return false;
+			}
+
+			return true;
+		},
+
+		set_fy_dates: function (slide) {
+			var country = frappe.wizard.values.country;
+
+			if (country) {
+				var fy = erpnext.setup.fiscal_years[country];
+				var current_year = moment(new Date()).year();
+				var next_year = current_year + 1;
+				if (!fy) {
+					fy = ["01-01", "31-12"];
+					next_year = current_year;
 				}
 
-				if ((this.values.company_name || "").toLowerCase() == "company") {
-					frappe.msgprint(__("Company Name cannot be Company"));
-					return false;
+				var year_start_date = current_year + "-" + fy[0];
+				if (year_start_date > frappe.datetime.get_today()) {
+					next_year = current_year
+					current_year -= 1;
 				}
+				slide.get_field("fy_start_date").set_value(fy[0] + "-" + current_year);
+				slide.get_field("fy_end_date").set_value(fy[1] + "-" + next_year);
+			}
 
-				return true;
-			},
+		},
 
-			css_class: "single-column",
 
-			set_fy_dates: function(slide) {
-				var country = frappe.wizard.values.country;
+		load_chart_of_accounts: function (slide) {
+			var country = frappe.wizard.values.country;
 
-				if(country) {
-					var fy = erpnext.wiz.fiscal_years[country];
-					var current_year = moment(new Date()).year();
-					var next_year = current_year + 1;
-					if(!fy) {
-						fy = ["01-01", "12-31"];
-						next_year = current_year;
-					}
-					
-					var year_start_date = current_year + "-" + fy[0];
-					if(year_start_date > frappe.datetime.get_today()) {
-						next_year = current_year
-						current_year -= 1;
-					}
-					slide.get_field("fy_start_date").set_input(current_year + "-" + fy[0]);
-					slide.get_field("fy_end_date").set_input(next_year + "-" + fy[1]);
-				}
+			if (country) {
+				frappe.call({
+					method: "erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts.get_charts_for_country",
+					args: { "country": country },
+					callback: function (r) {
+						if (r.message) {
+							slide.get_input("chart_of_accounts").empty()
+								.add_options(r.message);
 
-			},
-
-			load_chart_of_accounts: function(slide) {
-				var country = frappe.wizard.values.country;
-
-				if(country) {
-					frappe.call({
-						method: "erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts.get_charts_for_country",
-						args: {"country": country},
-						callback: function(r) {
-							if(r.message) {
-								slide.get_input("chart_of_accounts").empty()
-									.add_options(r.message);
-
-								if (r.message.length===1) {
-									var field = slide.get_field("chart_of_accounts");
-									field.set_value(r.message[0]);
-									field.df.hidden = 1;
-									field.refresh();
-								}
+							if (r.message.length === 1) {
+								var field = slide.get_field("chart_of_accounts");
+								field.set_value(r.message[0]);
+								field.df.hidden = 1;
+								field.refresh();
 							}
 						}
-					})
-				}
-			},
-
-			bind_events: function(slide) {
-				slide.get_input("company_name").on("change", function() {
-					var parts = slide.get_input("company_name").val().split(" ");
-					var abbr = $.map(parts, function(p) { return p ? p.substr(0,1) : null }).join("");
-					slide.get_field("company_abbr").set_input(abbr.slice(0, 5).toUpperCase());
-				}).val(frappe.boot.sysdefaults.company_name || "").trigger("change");
-
-				slide.get_input("company_abbr").on("change", function() {
-					if(slide.get_input("company_abbr").val().length > 5) {
-						frappe.msgprint("Company Abbreviation cannot have more than 5 characters");
-						slide.get_field("company_abbr").set_input("");
 					}
-				});
-
-				// TODO remove this
-				slide.get_input("fy_start_date").on("change", function() {
-					var year_end_date =
-						frappe.datetime.add_days(frappe.datetime.add_months(
-							frappe.datetime.user_to_obj(slide.get_input("fy_start_date").val()), 12), -1);
-					slide.get_input("fy_end_date").val(frappe.datetime.obj_to_user(year_end_date));
-
-				});
+				})
 			}
 		},
 
-		branding: {
-			domains: ["all"],
-			icon: "fa fa-bookmark",
-			title: __("The Brand"),
-			help: __('Upload your letter head and logo. (you can edit them later).'),
-			fields: [
-				{fieldtype:"Attach Image", fieldname:"attach_letterhead",
-					label: __("Attach Letterhead"),
-					description: __("Keep it web friendly 900px (w) by 100px (h)"),
-					is_private: 0
-				},
-				{fieldtype: "Column Break"},
-				{fieldtype:"Attach Image", fieldname:"attach_logo",
-					label:__("Attach Logo"),
-					description: __("100px by 100px"),
-					is_private: 0
-				},
-			],
+		bind_events: function (slide) {
 
-			css_class: "two-column"
-		},
-
-		users: {
-			domains: ["all"],
-			icon: "fa fa-money",
-			title: __("Add Users"),
-			help: __("Add users to your organization, other than yourself"),
-			fields: [],
-			before_load: function(slide) {
-				slide.fields = [];
-				for(var i=1; i<5; i++) {
-					slide.fields = slide.fields.concat([
-						{fieldtype:"Section Break"},
-						{fieldtype:"Data", fieldname:"user_fullname_"+ i,
-							label:__("Full Name")},
-						{fieldtype:"Data", fieldname:"user_email_" + i,
-							label:__("Email Address"), placeholder:__("user@example.com"),
-							options: "Email"},
-						{fieldtype:"Column Break"},
-						{fieldtype: "Check", fieldname: "user_sales_" + i,
-							label:__("Sales"), "default": 1,
-							hidden: frappe.wiz.domain==='Education' ? 1 : 0},
-						{fieldtype: "Check", fieldname: "user_purchaser_" + i,
-							label:__("Purchaser"), "default": 1,
-							hidden: frappe.wiz.domain==='Education' ? 1 : 0},
-						{fieldtype: "Check", fieldname: "user_accountant_" + i,
-							label:__("Accountant"), "default": 1,
-							hidden: frappe.wiz.domain==='Education' ? 1 : 0},
-					]);
-				}
-			},
-			css_class: "two-column"
-		},
-
-		taxes: {
-			domains: ['manufacturing', 'services', 'retail', 'distribution'],
-			icon: "fa fa-money",
-			title: __("Add Taxes"),
-			help: __("List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later."),
-			"fields": [],
-			before_load: function(slide) {
-				slide.fields = [];
-				for(var i=1; i<4; i++) {
-					slide.fields = slide.fields.concat([
-						{fieldtype:"Section Break"},
-						{fieldtype:"Data", fieldname:"tax_"+ i, label:__("Tax") + " " + i,
-							placeholder:__("e.g. VAT") + " " + i},
-						{fieldtype:"Column Break"},
-						{fieldtype:"Float", fieldname:"tax_rate_" + i, label:__("Rate (%)"), placeholder:__("e.g. 5")},
-					]);
-				}
-			},
-			css_class: "two-column"
-		},
-
-		customers: {
-			domains: ['manufacturing', 'services', 'retail', 'distribution'],
-			icon: "fa fa-group",
-			title: __("Your Customers"),
-			help: __("List a few of your customers. They could be organizations or individuals."),
-			fields: [],
-			before_load: function(slide) {
-				slide.fields = [];
-				for(var i=1; i<6; i++) {
-					slide.fields = slide.fields.concat([
-						{fieldtype:"Section Break"},
-						{fieldtype:"Data", fieldname:"customer_" + i, label:__("Customer") + " " + i,
-							placeholder:__("Customer Name")},
-						{fieldtype:"Column Break"},
-						{fieldtype:"Data", fieldname:"customer_contact_" + i,
-							label:__("Contact Name") + " " + i, placeholder:__("Contact Name")}
-					])
-				}
-				slide.fields[1].reqd = 1;
-			},
-			css_class: "two-column"
-		},
-
-		suppliers: {
-			domains: ['manufacturing', 'services', 'retail', 'distribution'],
-			icon: "fa fa-group",
-			title: __("Your Suppliers"),
-			help: __("List a few of your suppliers. They could be organizations or individuals."),
-			fields: [],
-			before_load: function(slide) {
-				slide.fields = [];
-				for(var i=1; i<6; i++) {
-					slide.fields = slide.fields.concat([
-						{fieldtype:"Section Break"},
-						{fieldtype:"Data", fieldname:"supplier_" + i, label:__("Supplier")+" " + i,
-							placeholder:__("Supplier Name")},
-						{fieldtype:"Column Break"},
-						{fieldtype:"Data", fieldname:"supplier_contact_" + i,
-							label:__("Contact Name") + " " + i, placeholder:__("Contact Name")},
-					])
-				}
-				slide.fields[1].reqd = 1;
-			},
-			css_class: "two-column"
-		},
-
-		items: {
-			domains: ['manufacturing', 'services', 'retail', 'distribution'],
-			icon: "fa fa-barcode",
-			title: __("Your Products or Services"),
-			help: __("List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start."),
-			fields: [],
-			before_load: function(slide) {
-				slide.fields = [];
-				for(var i=1; i<6; i++) {
-					slide.fields = slide.fields.concat([
-						{fieldtype:"Section Break", show_section_border: true},
-						{fieldtype:"Data", fieldname:"item_" + i, label:__("Item") + " " + i,
-							placeholder:__("A Product or Service")},
-						{fieldtype:"Select", label:__("Group"), fieldname:"item_group_" + i,
-							options:[__("Products"), __("Services"),
-								__("Raw Material"), __("Consumable"), __("Sub Assemblies")],
-							"default": __("Products")},
-						{fieldtype:"Select", fieldname:"item_uom_" + i, label:__("UOM"),
-							options:[__("Unit"), __("Nos"), __("Box"), __("Pair"), __("Kg"), __("Set"),
-								__("Hour"), __("Minute"), __("Litre"), __("Meter"), __("Gram")],
-							"default": __("Unit")},
-						{fieldtype: "Check", fieldname: "is_sales_item_" + i, label:__("We sell this Item"), default: 1},
-						{fieldtype: "Check", fieldname: "is_purchase_item_" + i, label:__("We buy this Item")},
-						{fieldtype:"Column Break"},
-						{fieldtype:"Currency", fieldname:"item_price_" + i, label:__("Rate")},
-						{fieldtype:"Attach Image", fieldname:"item_img_" + i, label:__("Attach Image"), is_private: 0},
-					])
-				}
-				slide.fields[1].reqd = 1;
-
-				// dummy data
-				slide.fields.push({fieldtype: "Section Break"});
-				slide.fields.push({fieldtype: "Check", fieldname: "add_sample_data",
-					label: __("Add a few sample records"), "default": 1});
-				slide.fields.push({fieldtype: "Check", fieldname: "setup_website",
-					label: __("Setup a simple website for my organization"), "default": 1});
-			},
-			css_class: "two-column"
-		},
-
-		program: {
-			domains: ["education"],
-			title: __("Program"),
-			help: __("Example: Masters in Computer Science"),
-			fields: [],
-			before_load: function(slide) {
-				slide.fields = [];
-				for(var i=1; i<6; i++) {
-					slide.fields = slide.fields.concat([
-						{fieldtype:"Section Break", show_section_border: true},
-						{fieldtype:"Data", fieldname:"program_" + i, label:__("Program") + " " + i, placeholder: __("Program Name")},
-					])
-				}
-				slide.fields[1].reqd = 1;
-			},
-			css_class: "single-column"
-		},
-
-		course: {
-			domains: ["education"],
-			title: __("Course"),
-			help: __("Example: Basic Mathematics"),
-			fields: [],
-			before_load: function(slide) {
-				slide.fields = [];
-				for(var i=1; i<6; i++) {
-					slide.fields = slide.fields.concat([
-						{fieldtype:"Section Break", show_section_border: true},
-						{fieldtype:"Data", fieldname:"course_" + i, label:__("Course") + " " + i,  placeholder: __("Course Name")},
-					])
-				}
-				slide.fields[1].reqd = 1;
-			},
-			css_class: "single-column"
-		},
+			// TODO remove this
+			slide.get_input("fy_start_date").on("change", function () {
+				var year_end_date =
+					frappe.datetime.add_days(frappe.datetime.add_months(
+						frappe.datetime.user_to_obj(slide.get_input("fy_start_date").val()), 12), -1);
+				slide.form.fields_dict.fy_end_date.set_value(frappe.datetime.obj_to_user(year_end_date));
+			});
+		}
+	},
 
 
-		instructor: {
-			domains: ["education"],
-			title: __("Instructor"),
-			help: __("People who teach at your organisation"),
-			fields: [],
-			before_load: function(slide) {
-				slide.fields = [];
-				for(var i=1; i<6; i++) {
-					slide.fields = slide.fields.concat([
-						{fieldtype:"Section Break", show_section_border: true},
-						{fieldtype:"Data", fieldname:"instructor_" + i, label:__("Instructor") + " " + i,  placeholder: __("Instructor Name")},
-					])
-				}
-				slide.fields[1].reqd = 1;
-			},
-			css_class: "single-column"
-		},
+	{
+		// Taxes
+		name: 'taxes',
+		domains: ['manufacturing', 'services', 'retail', 'distribution'],
+		icon: "fa fa-money",
+		title: __("Add Taxes"),
+		help: __("List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later."),
+		add_more: 1,
+		max_count: 4,
+		fields: [
+			{fieldtype:"Section Break"},
+			{fieldtype:"Data", fieldname:"tax", label:__("Tax"),
+				placeholder:__("e.g. VAT")},
+			{fieldtype:"Column Break"},
+			{fieldtype:"Float", fieldname:"tax_rate", label:__("Rate (%)"), placeholder:__("e.g. 5")}
+		]
+	},
 
-		room: {
-			domains: ["education"],
-			title: __("Room"),
-			help: __("Classrooms/ Laboratories etc where lectures can be scheduled."),
-			fields: [],
-			before_load: function(slide) {
-				slide.fields = [];
-				for(var i=1; i<4; i++) {
-					slide.fields = slide.fields.concat([
-						{fieldtype:"Section Break", show_section_border: true},
-						{fieldtype:"Data", fieldname:"room_" + i, label:__("Room") + " " + i},
-						{fieldtype:"Column Break"},
-						{fieldtype:"Int", fieldname:"room_capacity_" + i, label:__("Room") + " " + i + " Capacity"},
-					])
-				}
-				slide.fields[1].reqd = 1;
-			},
-			css_class: "two-column"
-		},
-	});
+	{
+		// Customers
+		name: 'customers',
+		domains: ['manufacturing', 'services', 'retail', 'distribution'],
+		icon: "fa fa-group",
+		title: __("Add Customers"),
+		help: __("List a few of your customers. They could be organizations or individuals."),
+		add_more: 1,
+		max_count: 6,
+		fields: [
+			{fieldtype:"Section Break"},
+			{fieldtype:"Data", fieldname:"customer", label:__("Customer"),
+				placeholder:__("Customer Name")},
+			{fieldtype:"Column Break"},
+			{fieldtype:"Data", fieldname:"customer_contact",
+				label:__("Contact Name"), placeholder:__("Contact Name")}
+		],
+	},
 
-	// Source: https://en.wikipedia.org/wiki/Fiscal_year
-	// default 1st Jan - 31st Dec
+	{
+		// Suppliers
+		name: 'suppliers',
+		domains: ['manufacturing', 'services', 'retail', 'distribution'],
+		icon: "fa fa-group",
+		title: __("Your Suppliers"),
+		help: __("List a few of your suppliers. They could be organizations or individuals."),
+		add_more: 1,
+		max_count: 6,
+		fields: [
+			{fieldtype:"Section Break"},
+			{fieldtype:"Data", fieldname:"supplier", label:__("Supplier"),
+				placeholder:__("Supplier Name")},
+			{fieldtype:"Column Break"},
+			{fieldtype:"Data", fieldname:"supplier_contact",
+				label:__("Contact Name"), placeholder:__("Contact Name")},
+		]
+	},
 
-	erpnext.wiz.fiscal_years = {
-		"Afghanistan": ["12-20", "12-21"],
-		"Australia": ["07-01", "06-30"],
-		"Bangladesh": ["07-01", "06-30"],
-		"Canada": ["04-01", "03-31"],
-		"Costa Rica": ["10-01", "09-30"],
-		"Egypt": ["07-01", "06-30"],
-		"Hong Kong": ["04-01", "03-31"],
-		"India": ["04-01", "03-31"],
-		"Iran": ["06-23", "06-22"],
-		"Italy": ["07-01", "06-30"],
-		"Myanmar": ["04-01", "03-31"],
-		"New Zealand": ["04-01", "03-31"],
-		"Pakistan": ["07-01", "06-30"],
-		"Singapore": ["04-01", "03-31"],
-		"South Africa": ["03-01", "02-28"],
-		"Thailand": ["10-01", "09-30"],
-		"United Kingdom": ["04-01", "03-31"],
-	};
-}
+	{
+		// Products
+		name: 'products',
+		domains: ['manufacturing', 'services', 'retail', 'distribution'],
+		icon: "fa fa-barcode",
+		title: __("Your Products or Services"),
+		help: __("List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start."),
+		add_more: 1,
+		max_count: 6,
+		fields: [
+			{fieldtype:"Section Break", show_section_border: true},
+			{fieldtype:"Data", fieldname:"item", label:__("Item"),
+				placeholder:__("A Product or Service")},
+			{fieldtype:"Select", label:__("Group"), fieldname:"item_group",
+				options:[__("Products"), __("Services"),
+					__("Raw Material"), __("Consumable"), __("Sub Assemblies")],
+				"default": __("Products")},
+			{fieldtype:"Select", fieldname:"item_uom", label:__("UOM"),
+				options:[__("Unit"), __("Nos"), __("Box"), __("Pair"), __("Kg"), __("Set"),
+					__("Hour"), __("Minute"), __("Litre"), __("Meter"), __("Gram")],
+				"default": __("Unit")},
+			{fieldtype: "Check", fieldname: "is_sales_item", label:__("We sell this Item"), default: 1},
+			{fieldtype: "Check", fieldname: "is_purchase_item", label:__("We buy this Item")},
+			{fieldtype:"Column Break"},
+			{fieldtype:"Currency", fieldname:"item_price", label:__("Rate")},
+			{fieldtype:"Attach Image", fieldname:"item_img", label:__("Attach Image"), is_private: 0},
+		],
+		get_item_count: function() {
+			return this.item_count;
+		}
+	},
 
-frappe.wiz.on("before_load", function() {
-	load_erpnext_slides();
+	{
+		// Program
+		name: 'program',
+		domains: ["education"],
+		title: __("Program"),
+		help: __("Example: Masters in Computer Science"),
+		add_more: 1,
+		max_count: 6,
+		fields: [
+			{fieldtype:"Section Break", show_section_border: true},
+			{fieldtype:"Data", fieldname:"program", label:__("Program"), placeholder: __("Program Name")},
+		],
+	},
 
-	frappe.wiz.add_slide(erpnext.wiz.select_domain);
-	frappe.wiz.add_slide(erpnext.wiz.org);
-	frappe.wiz.add_slide(erpnext.wiz.branding);
+	{
+		// Course
+		name: 'course',
+		domains: ["education"],
+		title: __("Course"),
+		help: __("Example: Basic Mathematics"),
+		add_more: 1,
+		max_count: 6,
+		fields: [
+			{fieldtype:"Section Break", show_section_border: true},
+			{fieldtype:"Data", fieldname:"course", label:__("Course"),  placeholder: __("Course Name")},
+		]
+	},
 
-	if (!(frappe.boot.limits && frappe.boot.limits.users===1)) {
-		frappe.wiz.add_slide(erpnext.wiz.users);
+	{
+		// Instructor
+		name: 'instructor',
+		domains: ["education"],
+		title: __("Instructor"),
+		help: __("People who teach at your organisation"),
+		add_more: 1,
+		max_count: 6,
+		fields: [
+			{fieldtype:"Section Break", show_section_border: true},
+			{fieldtype:"Data", fieldname:"instructor", label:__("Instructor"),  placeholder: __("Instructor Name")},
+		]
+	},
+
+	{
+		// Room
+		name: 'room',
+		domains: ["education"],
+		title: __("Room"),
+		help: __("Classrooms/ Laboratories etc where lectures can be scheduled."),
+		add_more: 1,
+		max_count: 4,
+		fields: [
+			{fieldtype:"Section Break", show_section_border: true},
+			{fieldtype:"Data", fieldname:"room", label:__("Room")},
+			{fieldtype:"Column Break"},
+			{fieldtype:"Int", fieldname:"room_capacity", label:__("Room") + " Capacity"},
+		]
+	},
+
+	{
+		// last slide: Bootstrap
+		name: 'bootstrap',
+		domains: ["all"],
+		title: __("Bootstrap"),
+		fields: [{fieldtype: "Section Break"},
+			{fieldtype: "Check", fieldname: "add_sample_data",
+				label: __("Add a few sample records"), "default": 1},
+			{fieldtype: "Check", fieldname: "setup_website",
+				label: __("Setup a simple website for my organization"), "default": 1}
+		]
 	}
+];
 
-	frappe.wiz.add_slide(erpnext.wiz.taxes);
-	frappe.wiz.add_slide(erpnext.wiz.customers);
-	frappe.wiz.add_slide(erpnext.wiz.suppliers);
-	frappe.wiz.add_slide(erpnext.wiz.items);
-	frappe.wiz.add_slide(erpnext.wiz.program);
-	frappe.wiz.add_slide(erpnext.wiz.course);
-	frappe.wiz.add_slide(erpnext.wiz.instructor);
-	frappe.wiz.add_slide(erpnext.wiz.room);
+// Source: https://en.wikipedia.org/wiki/Fiscal_year
+// default 1st Jan - 31st Dec
 
-	if(frappe.wizard && frappe.wizard.domain && frappe.wizard.domain !== 'Education') {
-		frappe.wiz.welcome_page = "#welcome-to-erpnext";
+erpnext.setup.fiscal_years = {
+	"Afghanistan": ["20-12", "21-12"],
+	"Australia": ["01-07", "30-06"],
+	"Bangladesh": ["01-07", "30-06"],
+	"Canada": ["01-04", "31-03"],
+	"Costa Rica": ["01-10", "30-09"],
+	"Egypt": ["01-07", "30-06"],
+	"Hong Kong": ["01-04", "31-03"],
+	"India": ["01-04", "31-03"],
+	"Iran": ["23-06", "22-06"],
+	"Italy": ["01-07", "30-06"],
+	"Myanmar": ["01-04", "31-03"],
+	"New Zealand": ["01-04", "31-03"],
+	"Pakistan": ["01-07", "30-06"],
+	"Singapore": ["01-04", "31-03"],
+	"South Africa": ["01-03", "28-02"],
+	"Thailand": ["01-10", "30-09"],
+	"United Kingdom": ["01-04", "31-03"],
+};
+
+frappe.setup.on("before_load", function () {
+	erpnext_slides.map(frappe.setup.add_slide);
+
+	// change header brand
+	let $brand = $('header .setup-wizard-brand');
+	if($brand.find('.erpnext-icon').length === 0) {
+		$brand.find('.frappe-icon').hide();
+		$brand.append(`<span>
+			<img src="/assets/erpnext/images/erp-icon.svg" class="brand-icon erpnext-icon"
+			style="width:36px;"><span class="brand-name">ERPNext</span></span>`);
 	}
 });
 
 var test_values_edu = {
-	"language":"english",
-	"domain":"Education",
-	"country":"India",
-	"timezone":"Asia/Kolkata",
-	"currency":"INR",
-	"first_name":"Tester",
-	"email":"test@example.com",
-	"password":"test",
-	"company_name":"Hogwarts",
-	"company_abbr":"HS",
-	"company_tagline":"School for magicians",
-	"bank_account":"Gringotts Wizarding Bank",
-	"fy_start_date":"2016-04-01",
-	"fy_end_date":"2017-03-31"
+	"language": "english",
+	"domain": "Education",
+	"country": "India",
+	"timezone": "Asia/Kolkata",
+	"currency": "INR",
+	"first_name": "Tester",
+	"email": "test@example.com",
+	"password": "test",
+	"company_name": "Hogwarts",
+	"company_abbr": "HS",
+	"company_tagline": "School for magicians",
+	"bank_account": "Gringotts Wizarding Bank",
+	"fy_start_date": "2016-04-01",
+	"fy_end_date": "2017-03-31"
 }
diff --git a/erpnext/tests/ui/setup_wizard.js b/erpnext/tests/ui/setup_wizard.js
new file mode 100644
index 0000000..aeb8d2a
--- /dev/null
+++ b/erpnext/tests/ui/setup_wizard.js
@@ -0,0 +1,47 @@
+const path = require('path');
+const path_join = path.resolve;
+const apps_path = path_join(__dirname, '..', '..', '..', '..');
+const frappe_ui_tests_path = path_join(apps_path, 'frappe', 'frappe', 'tests', 'ui');
+
+const login = require(frappe_ui_tests_path + "/login.js")['Login'];
+const welcome = require(frappe_ui_tests_path + "/setup_wizard.js")['Welcome'];
+const region = require(frappe_ui_tests_path + "/setup_wizard.js")['Region'];
+const user = require(frappe_ui_tests_path + "/setup_wizard.js")['User'];
+
+module.exports = {
+	before: browser => {
+		browser
+			.url(browser.launch_url + '/login')
+			.waitForElementVisible('body', 5000);
+	},
+	'Login': login,
+	'Welcome': welcome,
+	'Region': region,
+	'User': user,
+	'Domain': browser => {
+		let slide_selector = '[data-slide-name="domain"]';
+		browser
+			.waitForElementVisible(slide_selector, 2000)
+			.setValue('select[data-fieldname="domain"]', "Manufacturing")
+			.click(slide_selector + ' .next-btn');
+	},
+	'Brand': browser => {
+		let slide_selector = '[data-slide-name="brand"]';
+		browser
+			.waitForElementVisible(slide_selector, 2000)
+			.setValue('input[data-fieldname="company_name"]', "Acme")
+			.click(slide_selector + " .next-btn");
+	},
+	'Organisation': browser => {
+		let slide_selector = '[data-slide-name="organisation"]';
+		browser
+			.waitForElementVisible(slide_selector, 2000)
+			.setValue('input[data-fieldname="company_tagline"]', "Build tools for Builders")
+			.setValue('input[data-fieldname="bank_account"]', "YNG")
+			.click(slide_selector + " .next-btn");
+	},
+
+	after: browser => {
+		browser.end();
+	},
+};
\ No newline at end of file