diff --git a/demos/_assets/js/h2widget.js b/demos/_assets/js/h2widget.js
index 620b844ece0..7fb89ee824f 100644
--- a/demos/_assets/js/h2widget.js
+++ b/demos/_assets/js/h2widget.js
@@ -101,7 +101,7 @@
 	});
 	//h2 widget
 	$( document ).on( "mobileinit", function(){
-		$.widget( "mobile.h2linker", $.mobile.widget, {
+		$.widget( "mobile.h2linker", {
 			options:{
 				initSelector: ":jqmData(quicklinks='true')"
 			},
diff --git a/js/jquery.mobile.widget.js b/js/jquery.mobile.widget.js
index 4fb74f0e2f4..48593b66ed6 100644
--- a/js/jquery.mobile.widget.js
+++ b/js/jquery.mobile.widget.js
@@ -8,7 +8,7 @@ define( [ "jquery", "./jquery.mobile.ns", "jquery.ui.widget" ], function( jQuery
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 
-$.widget( "mobile.widget", {
+$.extend( $.Widget.prototype, {
 	_getCreateOptions: function() {
 
 		var elem = this.element,
@@ -57,7 +57,7 @@ $.widget( "mobile.widget", {
 		throw "Widget [" + this.widgetName + "]: " + msg;
 	}
 });
-
+$.mobile.widget = $.Widget;
 })( jQuery );
 //>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);
 });
diff --git a/js/widgets/collapsible.js b/js/widgets/collapsible.js
index 1d9d671bd8a..7576c961d37 100644
--- a/js/widgets/collapsible.js
+++ b/js/widgets/collapsible.js
@@ -15,7 +15,7 @@ define( [
 
 var getAttr = $.mobile.getAttribute;
 
-$.widget( "mobile.collapsible", $.mobile.widget, {
+$.widget( "mobile.collapsible", {
 	options: {
 		expandCueText: " click to expand contents",
 		collapseCueText: " click to collapse contents",
diff --git a/js/widgets/collapsibleSet.js b/js/widgets/collapsibleSet.js
index 516b54d3d93..0df9c6517cf 100644
--- a/js/widgets/collapsibleSet.js
+++ b/js/widgets/collapsibleSet.js
@@ -9,7 +9,7 @@ define( [ "jquery", "../jquery.mobile.widget", "./collapsible", "./addFirstLastC
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 
-$.widget( "mobile.collapsibleset", $.mobile.widget, $.extend( {
+$.widget( "mobile.collapsibleset", $.extend( {
 	_create: function() {
 		var $el = this.element,
 			o = this.options,
diff --git a/js/widgets/controlgroup.js b/js/widgets/controlgroup.js
index 5f31a32cfc9..a03659b4ec7 100644
--- a/js/widgets/controlgroup.js
+++ b/js/widgets/controlgroup.js
@@ -12,7 +12,7 @@ define( [ "jquery",
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 
-$.widget( "mobile.controlgroup", $.mobile.widget, $.extend( {
+$.widget( "mobile.controlgroup", $.extend( {
 	options: {
 		theme: null,
 		shadow: false,
diff --git a/js/widgets/dialog.js b/js/widgets/dialog.js
index cfe1d2aff4e..3b2d4e93bd4 100644
--- a/js/widgets/dialog.js
+++ b/js/widgets/dialog.js
@@ -9,7 +9,7 @@ define( [ "jquery", "../jquery.mobile.widget", "./page", "../jquery.mobile.navig
 //>>excludeEnd("jqmBuildExclude");
 (function( $, window, undefined ) {
 
-$.widget( "mobile.dialog", $.mobile.widget, $.extend( {
+$.widget( "mobile.dialog", $.extend( {
 	options: {
 		closeBtn: "left", /* Accepts left, right and none */
 		closeBtnText: "Close",
diff --git a/js/widgets/forms/button.js b/js/widgets/forms/button.js
index 34c361e4510..6846e986f32 100644
--- a/js/widgets/forms/button.js
+++ b/js/widgets/forms/button.js
@@ -9,7 +9,7 @@ define( [ "jquery", "../../jquery.mobile.widget", "../../jquery.mobile.registry"
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 
-$.widget( "mobile.button", $.mobile.widget, {
+$.widget( "mobile.button", {
 	options: {
 		theme: null,
 		icon: null,
diff --git a/js/widgets/forms/checkboxradio.js b/js/widgets/forms/checkboxradio.js
index 63ea96f1b85..0de0932577c 100644
--- a/js/widgets/forms/checkboxradio.js
+++ b/js/widgets/forms/checkboxradio.js
@@ -17,7 +17,7 @@ define( [ "jquery",
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 
-$.widget( "mobile.checkboxradio", $.mobile.widget, $.extend( {
+$.widget( "mobile.checkboxradio", $.extend( {
 	options: {
 		theme: null,
 		mini: false
diff --git a/js/widgets/forms/rangeslider.js b/js/widgets/forms/rangeslider.js
index 2e5d359cad6..b9c29432537 100644
--- a/js/widgets/forms/rangeslider.js
+++ b/js/widgets/forms/rangeslider.js
@@ -14,7 +14,7 @@ define( [ "jquery",
 	"./slider" ], function( jQuery ) {
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
-	$.widget( "mobile.rangeslider", $.mobile.widget, $.extend( {
+	$.widget( "mobile.rangeslider", $.extend( {
 
 		options: {
 			theme: null,
diff --git a/js/widgets/forms/select.js b/js/widgets/forms/select.js
index fd34fa6acac..40a7cf872b8 100644
--- a/js/widgets/forms/select.js
+++ b/js/widgets/forms/select.js
@@ -9,7 +9,7 @@ define( [ "jquery", "../../jquery.mobile.core", "../../jquery.mobile.widget", ".
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 
-$.widget( "mobile.selectmenu", $.mobile.widget, $.extend( {
+$.widget( "mobile.selectmenu", $.extend( {
 	options: {
 		theme: null,
 		disabled: false,
diff --git a/js/widgets/forms/slider.js b/js/widgets/forms/slider.js
index a1d08a1114e..fea29ccadc6 100644
--- a/js/widgets/forms/slider.js
+++ b/js/widgets/forms/slider.js
@@ -14,7 +14,7 @@ define( [ "jquery",
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 
-$.widget( "mobile.slider", $.mobile.widget, $.extend( {
+$.widget( "mobile.slider", $.extend( {
 	widgetEventPrefix: "slide",
 
 	options: {
diff --git a/js/widgets/forms/textinput.js b/js/widgets/forms/textinput.js
index 9a1121297ff..d7a22a407f3 100644
--- a/js/widgets/forms/textinput.js
+++ b/js/widgets/forms/textinput.js
@@ -9,7 +9,7 @@ define( [ "jquery", "../../jquery.mobile.core", "../../jquery.mobile.widget", ".
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 
-$.widget( "mobile.textinput", $.mobile.widget, {
+$.widget( "mobile.textinput", {
 	options: {
 		theme: null,
 		corners: true,
diff --git a/js/widgets/listview.js b/js/widgets/listview.js
index 5e04bb3c582..08b30fbf9f7 100644
--- a/js/widgets/listview.js
+++ b/js/widgets/listview.js
@@ -11,7 +11,7 @@ define( [ "jquery", "../jquery.mobile.widget", "./page", "./addFirstLastClasses"
 
 var getAttr = $.mobile.getAttribute;
 
-$.widget( "mobile.listview", $.mobile.widget, $.extend( {
+$.widget( "mobile.listview", $.extend( {
 
 	options: {
 		theme: null,
diff --git a/js/widgets/navbar.js b/js/widgets/navbar.js
index 36ced0488bd..fcc0c457750 100644
--- a/js/widgets/navbar.js
+++ b/js/widgets/navbar.js
@@ -10,7 +10,7 @@ define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.grid", "../jque
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 
-$.widget( "mobile.navbar", $.mobile.widget, {
+$.widget( "mobile.navbar", {
 	options: {
 		iconpos: "top",
 		grid: null
diff --git a/js/widgets/page.js b/js/widgets/page.js
index eeafbc1fd9b..65e931ba549 100644
--- a/js/widgets/page.js
+++ b/js/widgets/page.js
@@ -7,7 +7,7 @@ define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.core", "../jque
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 
-$.widget( "mobile.page", $.mobile.widget, {
+$.widget( "mobile.page", {
 	options: {
 		theme: "a",
 		domCache: false,
@@ -55,7 +55,6 @@ $.widget( "mobile.page", $.mobile.widget, {
 	},
 
 	_setOptions: function( o ) {
-		
 		if( o.theme !== undefined ) {
 			this.element.removeClass( "ui-body-" + this.options.theme ).addClass( "ui-body-" + o.theme );
 		}
diff --git a/js/widgets/panel.js b/js/widgets/panel.js
index 4d68c6d3f55..e51fe6d1a45 100644
--- a/js/widgets/panel.js
+++ b/js/widgets/panel.js
@@ -9,7 +9,7 @@ define( [ "jquery", "../jquery.mobile.widget", "./page", "../jquery.mobile.regis
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 
-$.widget( "mobile.panel", $.mobile.widget, {
+$.widget( "mobile.panel", {
 	options: {
 		classes: {
 			panel: "ui-panel",
diff --git a/js/widgets/popup.js b/js/widgets/popup.js
index b0154e2ca6c..4533e57ab70 100644
--- a/js/widgets/popup.js
+++ b/js/widgets/popup.js
@@ -52,7 +52,7 @@ function windowCoords() {
 	};
 }
 
-$.widget( "mobile.popup", $.mobile.widget, {
+$.widget( "mobile.popup", {
 	options: {
 		theme: null,
 		overlayTheme: null,
diff --git a/js/widgets/table.js b/js/widgets/table.js
index 6e6d9c9475a..db3a3bd82cb 100644
--- a/js/widgets/table.js
+++ b/js/widgets/table.js
@@ -9,7 +9,7 @@ define( [ "jquery", "../jquery.mobile.widget", "./page", "../jquery.mobile.regis
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 
-$.widget( "mobile.table", $.mobile.widget, {
+$.widget( "mobile.table", {
 	options: {
 		classes: {
 			table: "ui-table"
diff --git a/js/widgets/tabs.js b/js/widgets/tabs.js
index f092f367755..b082c622b6a 100644
--- a/js/widgets/tabs.js
+++ b/js/widgets/tabs.js
@@ -8,11 +8,9 @@ define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.core","./jquery
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 
-	$.widget("mobile.tabs", $.mobile.widget, $.ui.tabs.prototype);
+	$.ui.tabs.initSelector = ":jqmData(role='tabs'), :jqmData(content='tabs')";
 
-	$.mobile.tabs.initSelector = ":jqmData(role='tabs'), :jqmData(content='tabs')";
-
-	$.mobile._enhancer.add( "mobile.tabs" );
+	$.mobile._enhancer.add( "ui.tabs" );
 
 })( jQuery );
 //>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);
diff --git a/js/widgets/toolbar.js b/js/widgets/toolbar.js
index 650d67fd08d..a8bb507b09b 100644
--- a/js/widgets/toolbar.js
+++ b/js/widgets/toolbar.js
@@ -10,7 +10,7 @@ define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.core", "../jque
 (function( $, undefined ) {
 
 
-	$.widget( "mobile.toolbar", $.mobile.widget, {
+	$.widget( "mobile.toolbar", {
 		options: {
 			theme: null,
 			addBackBtn: false,