diff --git a/dev/full/dataTable.vue b/dev/full/dataTable.vue
index 30580da8..250ac031 100644
--- a/dev/full/dataTable.vue
+++ b/dev/full/dataTable.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	table.table.table-hover.table-bordered
 		thead
 			tr
diff --git a/dev/full/fieldAwesome.vue b/dev/full/fieldAwesome.vue
index 10f187de..0489a4cf 100644
--- a/dev/full/fieldAwesome.vue
+++ b/dev/full/fieldAwesome.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	input.form-control(type="text", v-model="value", :maxlength="schema.max", :readonly="schema.readonly", :disabled="disabled", :placeholder="schema.placeholder")
 </template>
 
diff --git a/package.json b/package.json
index 14ec3ec2..8720379a 100644
--- a/package.json
+++ b/package.json
@@ -64,8 +64,6 @@
     "fecha": "2.3.0",
     "inject-loader": "2.0.1",
     "isparta-loader": "2.0.0",
-    "jade": "1.11.0",
-    "jade-loader": "0.8.0",
     "karma": "1.4.1",
     "karma-chai": "0.1.0",
     "karma-chrome-launcher": "1.0.1",
@@ -84,6 +82,8 @@
     "mocha-loader": "0.7.1",
     "node-sass": "3.10.1",
     "phantomjs-prebuilt": "2.1.14",
+    "pug": "^2.0.0-beta11",
+    "pug-loader": "^2.3.0",
     "sass-loader": "3.2.0",
     "sinon": "1.17.7",
     "sinon-chai": "2.8.0",
diff --git a/src/fields/core/fieldCheckbox.vue b/src/fields/core/fieldCheckbox.vue
index c52f6832..9fda2d92 100644
--- a/src/fields/core/fieldCheckbox.vue
+++ b/src/fields/core/fieldCheckbox.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	input(type="checkbox", v-model="value", :autocomplete="schema.autocomplete", :disabled="disabled", :name="schema.inputName")
 </template>
 
diff --git a/src/fields/core/fieldChecklist.vue b/src/fields/core/fieldChecklist.vue
index 0872e2ee..ec0e5507 100644
--- a/src/fields/core/fieldChecklist.vue
+++ b/src/fields/core/fieldChecklist.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	.wrapper
 		.listbox.form-control(v-if="schema.listBox", :disabled="disabled")
 			.list-row(v-for="item in items")
diff --git a/src/fields/core/fieldInput.vue b/src/fields/core/fieldInput.vue
index fb5ee12a..2ab359aa 100644
--- a/src/fields/core/fieldInput.vue
+++ b/src/fields/core/fieldInput.vue
@@ -1,10 +1,10 @@
-<template lang="jade">
+<template lang="pug">
 .wrapper
 	input.form-control(
 		:type="schema.inputType", 
 		:value="value",
 		@input="value = $event.target.value",
-		number="schema.inputType == 'number'"
+		number="schema.inputType == 'number'",
 		:disabled="disabled",
 		:accept="schema.accept",
 		:alt="schema.alt",
diff --git a/src/fields/core/fieldLabel.vue b/src/fields/core/fieldLabel.vue
index c8944b5b..3901df97 100644
--- a/src/fields/core/fieldLabel.vue
+++ b/src/fields/core/fieldLabel.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	span {{ value }}
 </template>
 
diff --git a/src/fields/core/fieldRadios.vue b/src/fields/core/fieldRadios.vue
index c62fec5a..e07702c6 100644
--- a/src/fields/core/fieldRadios.vue
+++ b/src/fields/core/fieldRadios.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	.radio-list(:disabled="disabled")
 		label(v-for="item in items")
 			input(type="radio", :disabled="disabled", :name="id", @click="onSelection(item)", :value="getItemValue(item)", :checked="isItemChecked(item)" )
diff --git a/src/fields/core/fieldSelect.vue b/src/fields/core/fieldSelect.vue
index 1315da53..12f93d67 100644
--- a/src/fields/core/fieldSelect.vue
+++ b/src/fields/core/fieldSelect.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	select.form-control(v-model="value", :disabled="disabled", :name="schema.inputName")
 		option(:disabled="schema.required", :value="null", :selected="value == undefined") {{ selectOptions.noneSelectedText || "&lt;Nothing selected&gt;" }}
 		option(v-for="item in items", :value="getItemID(item)") {{ getItemName(item) }}
diff --git a/src/fields/core/fieldSubmit.vue b/src/fields/core/fieldSubmit.vue
index 63ad95e2..a0f85ae1 100644
--- a/src/fields/core/fieldSubmit.vue
+++ b/src/fields/core/fieldSubmit.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	input(type="submit", :value="schema.buttonText", @click="click", :name="schema.inputName", :disabled="disabled")
 </template>
 
diff --git a/src/fields/core/fieldTextArea.vue b/src/fields/core/fieldTextArea.vue
index 778869e2..724104a6 100644
--- a/src/fields/core/fieldTextArea.vue
+++ b/src/fields/core/fieldTextArea.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	textarea.form-control(v-model="value", :disabled="disabled", :maxlength="schema.max", :minlength="schema.min", :placeholder="schema.placeholder", :readonly="schema.readonly", :rows="schema.rows || 2", :name="schema.inputName")
 </template>
 
diff --git a/src/fields/optional/fieldCleave.vue b/src/fields/optional/fieldCleave.vue
index d7fb4ad4..dd50d055 100644
--- a/src/fields/optional/fieldCleave.vue
+++ b/src/fields/optional/fieldCleave.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	input.form-control(type="text", v-model="value", :autocomplete="schema.autocomplete", :disabled="disabled", :placeholder="schema.placeholder", :readonly="schema.readonly", :name="schema.inputName")
 </template>
 
diff --git a/src/fields/optional/fieldDateTimePicker.vue b/src/fields/optional/fieldDateTimePicker.vue
index b6015738..2ee6c34e 100644
--- a/src/fields/optional/fieldDateTimePicker.vue
+++ b/src/fields/optional/fieldDateTimePicker.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	.input-group.date
 		input.form-control(type="text", v-model="value", :autocomplete="schema.autocomplete", :disabled="disabled", :placeholder="schema.placeholder", :readonly="schema.readonly", :name="schema.inputName")
 		span.input-group-addon
diff --git a/src/fields/optional/fieldGoogleAddress.vue b/src/fields/optional/fieldGoogleAddress.vue
index 431e3505..d23ade58 100644
--- a/src/fields/optional/fieldGoogleAddress.vue
+++ b/src/fields/optional/fieldGoogleAddress.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	input.form-control(type="text", v-model="value", :autocomplete="schema.autocomplete", :disabled="disabled", :placeholder="schema.placeholder", :readonly="schema.readonly", :name="schema.inputName",  debounce="500", @focus="geolocate()")
 </template>
 
diff --git a/src/fields/optional/fieldImage.vue b/src/fields/optional/fieldImage.vue
index 209b6b51..8d7528be 100644
--- a/src/fields/optional/fieldImage.vue
+++ b/src/fields/optional/fieldImage.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	div.wrapper
 		input.form-control.link(type="text", v-show="schema.hideInput !== true", v-model="wrappedValue", :autocomplete="schema.autocomplete", :disabled="disabled", :placeholder="schema.placeholder", :readonly="schema.readonly")
 		input.form-control.file(type="file", v-if="schema.browse !== false", :disabled="disabled", @change="fileChanged", :name="schema.inputName")
diff --git a/src/fields/optional/fieldMasked.vue b/src/fields/optional/fieldMasked.vue
index 796ee379..88c3826c 100644
--- a/src/fields/optional/fieldMasked.vue
+++ b/src/fields/optional/fieldMasked.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	input.form-control(type="text", v-model="value", :autocomplete="schema.autocomplete", :disabled="disabled", :placeholder="schema.placeholder", :readonly="schema.readonly", :name="schema.inputName")
 </template>
 
diff --git a/src/fields/optional/fieldPikaday.vue b/src/fields/optional/fieldPikaday.vue
index 5f33d371..fcbf68b1 100644
--- a/src/fields/optional/fieldPikaday.vue
+++ b/src/fields/optional/fieldPikaday.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	input.form-control(type="text", v-model="value", :autocomplete="schema.autocomplete", :disabled="disabled", :placeholder="schema.placeholder", :readonly="schema.readonly", :name="schema.inputName")
 </template>
 
diff --git a/src/fields/optional/fieldRangeSlider.vue b/src/fields/optional/fieldRangeSlider.vue
index 9cfa9d24..7c012f9f 100644
--- a/src/fields/optional/fieldRangeSlider.vue
+++ b/src/fields/optional/fieldRangeSlider.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	input(type="text", :autocomplete="schema.autocomplete", :data-disable="disabled", :data-max="schema.max", :data-min="schema.min", :data-step="schema.step", :placeholder="schema.placeholder", :readonly="schema.readonly", :name="schema.inputName")
 </template>
 
diff --git a/src/fields/optional/fieldSelectEx.vue b/src/fields/optional/fieldSelectEx.vue
index 7ed13428..97978582 100644
--- a/src/fields/optional/fieldSelectEx.vue
+++ b/src/fields/optional/fieldSelectEx.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	select.selectpicker(v-model="value", :disabled="disabled", :multiple="schema.multiSelect", :title="schema.placeholder", data-width="100%", :name="schema.inputName")
 		option(:disabled="schema.required", v-if="schema.multiSelect !== true", :value="null", :selected="value == undefined")
 		option(v-for="item in items", :value="getItemID(item)") {{ getItemName(item) }}
diff --git a/src/fields/optional/fieldSpectrum.vue b/src/fields/optional/fieldSpectrum.vue
index a62c8d36..51012e0a 100644
--- a/src/fields/optional/fieldSpectrum.vue
+++ b/src/fields/optional/fieldSpectrum.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	input(type="text", :autocomplete="schema.autocomplete", :disabled="disabled", :placeholder="schema.placeholder", :readonly="schema.readonly", :name="schema.inputName")
 </template>
 
diff --git a/src/fields/optional/fieldStaticMap.vue b/src/fields/optional/fieldStaticMap.vue
index 7abf44d5..aa023b0c 100644
--- a/src/fields/optional/fieldStaticMap.vue
+++ b/src/fields/optional/fieldStaticMap.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	img(:src="mapLink")
 </template>
 
diff --git a/src/fields/optional/fieldSwitch.vue b/src/fields/optional/fieldSwitch.vue
index 52dc99fc..096af1e0 100644
--- a/src/fields/optional/fieldSwitch.vue
+++ b/src/fields/optional/fieldSwitch.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	label
 		input(type="checkbox", v-model="value", :autocomplete="schema.autocomplete", :disabled="disabled", :name="schema.inputName")
 		span.label(:data-on="schema.textOn || 'On'", :data-off="schema.textOff || 'Off'")
diff --git a/src/fields/optional/fieldVueMultiSelect.vue b/src/fields/optional/fieldVueMultiSelect.vue
index 1ccbb38c..694219e8 100644
--- a/src/fields/optional/fieldVueMultiSelect.vue
+++ b/src/fields/optional/fieldVueMultiSelect.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 	multiselect(		
 		:id="selectOptions.id",
 		:options="options",
diff --git a/src/formGenerator.vue b/src/formGenerator.vue
index 45d416d9..380e551b 100644
--- a/src/formGenerator.vue
+++ b/src/formGenerator.vue
@@ -1,4 +1,4 @@
-<template lang="jade">
+<template lang="pug">
 div
 	fieldset.vue-form-generator(v-if='schema != null')
 		template(v-for='field in fields')