diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js
index f9bb1b1a..a8525fcc 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -226,11 +226,11 @@
 
 			for ( lang in suggestedLanguages ) {
 				// Skip already found languages
-				if ( $.inArray( suggestedLanguages[lang], languagesForButtons ) > -1 ) {
+				if ( $.inArray( suggestedLanguages[ lang ], languagesForButtons ) > -1 ) {
 					continue;
 				}
 
-				languagesForButtons.push( suggestedLanguages[lang] );
+				languagesForButtons.push( suggestedLanguages[ lang ] );
 
 				// No need to add more languages than buttons
 				if ( languagesForButtons.length >= SUGGESTED_LANGUAGES_NUMBER ) {
@@ -251,7 +251,7 @@
 
 			// Add the buttons for the most likely languages
 			for ( i = 0; i < SUGGESTED_LANGUAGES_NUMBER; i++ ) {
-				language = languagesForButtons[i];
+				language = languagesForButtons[ i ];
 				$button = $( '<button>' )
 					.addClass( 'button uls-language-button autonym' )
 					.text( $.uls.data.getAutonym( language ) )
@@ -665,15 +665,15 @@
 					mw.hook( webfontsEvent ).fire( 'displaysettings' );
 				}
 
-				if ( newFonts[displaySettings.uiLanguage] !== oldFonts[displaySettings.uiLanguage] ) {
+				if ( newFonts[ displaySettings.uiLanguage ] !== oldFonts[ displaySettings.uiLanguage ] ) {
 					mw.hook( 'mw.uls.font.change' ).fire(
-						'interface', displaySettings.uiLanguage, newFonts[displaySettings.uiLanguage]
+						'interface', displaySettings.uiLanguage, newFonts[ displaySettings.uiLanguage ]
 					);
 				}
 
-				if ( newFonts[displaySettings.contentLanguage] !== oldFonts[displaySettings.contentLanguage] ) {
+				if ( newFonts[ displaySettings.contentLanguage ] !== oldFonts[ displaySettings.contentLanguage ] ) {
 					mw.hook( 'mw.uls.font.change' ).fire(
-						'content', displaySettings.contentLanguage, newFonts[displaySettings.contentLanguage]
+						'content', displaySettings.contentLanguage, newFonts[ displaySettings.contentLanguage ]
 					);
 				}
 
diff --git a/resources/js/ext.uls.i18n.js b/resources/js/ext.uls.i18n.js
index e854c197..b5f99dc1 100644
--- a/resources/js/ext.uls.i18n.js
+++ b/resources/js/ext.uls.i18n.js
@@ -48,7 +48,7 @@
 		if ( messages ) {
 			return i18n.load( messages, locale );
 		}
-		if ( i18n.messageStore.messages[locale] ) {
+		if ( i18n.messageStore.messages[ locale ] ) {
 			return $.Deferred().resolve();
 		}
 		return i18n.messageStore.load(
diff --git a/resources/js/ext.uls.ime.js b/resources/js/ext.uls.ime.js
index e80ff0d4..6e8a8916 100644
--- a/resources/js/ext.uls.ime.js
+++ b/resources/js/ext.uls.ime.js
@@ -35,7 +35,7 @@
 			availableLanguages = {};
 
 		for ( language in $.ime.languages ) {
-			availableLanguages[language] = ulsLanguages[language];
+			availableLanguages[ language ] = ulsLanguages[ language ];
 		}
 
 		return availableLanguages;
diff --git a/resources/js/ext.uls.inputsettings.js b/resources/js/ext.uls.inputsettings.js
index 99417b13..5f520544 100644
--- a/resources/js/ext.uls.inputsettings.js
+++ b/resources/js/ext.uls.inputsettings.js
@@ -114,7 +114,7 @@
 			var index, inputSettings, $imeListContainer, defaultInputmethod,
 				imes, selected, imeId, $imeListTitle;
 
-			imes = $.ime.languages[language];
+			imes = $.ime.languages[ language ];
 
 			$imeListTitle = this.$template.find( '.ext-uls-input-settings-imes-title' );
 			$imeListContainer = this.$template.find( '.uls-input-settings-inputmethods-list' );
@@ -134,10 +134,10 @@
 
 			inputSettings = this;
 
-			defaultInputmethod = $.ime.preferences.getIM( language ) || imes.inputmethods[0];
+			defaultInputmethod = $.ime.preferences.getIM( language ) || imes.inputmethods[ 0 ];
 
 			for ( index in imes.inputmethods ) {
-				imeId = imes.inputmethods[index];
+				imeId = imes.inputmethods[ index ];
 				selected = defaultInputmethod === imeId;
 				$imeListContainer.append( inputSettings.renderInputmethodOption( imeId,
 					selected ) );
@@ -161,7 +161,7 @@
 		renderInputmethodOption: function ( imeId, selected ) {
 			var $imeLabel, name, description, $helplink, inputmethod, $inputMethodItem;
 
-			if ( imeId !== 'system' && !$.ime.sources[imeId] ) {
+			if ( imeId !== 'system' && !$.ime.sources[ imeId ] ) {
 				// imeId not known for jquery.ime.
 				// It is very rare, but still validate it.
 				return $();
@@ -186,7 +186,7 @@
 				description = '';
 				$helplink = '';
 			} else {
-				inputmethod = $.ime.inputmethods[imeId];
+				inputmethod = $.ime.inputmethods[ imeId ];
 				$helplink = $( '<a>' )
 					.addClass( 'uls-ime-help' )
 					.text( $.i18n( 'ext-uls-ime-help' ) )
@@ -195,11 +195,11 @@
 				if ( !inputmethod ) {
 					// The input method definition(rules) not loaded.
 					// We will show the name from $.ime.sources
-					name = $.ime.sources[imeId].name;
+					name = $.ime.sources[ imeId ].name;
 					description = '';
 				} else {
 					name = inputmethod.name;
-					description = $.ime.inputmethods[imeId].description;
+					description = $.ime.inputmethods[ imeId ].description;
 				}
 			}
 
@@ -239,25 +239,25 @@
 
 			// Selected IME language may be different, and it must
 			// be present, too
-			if ( $.uls.data.languages[selectedImeLanguage] &&
+			if ( $.uls.data.languages[ selectedImeLanguage ] &&
 				$.inArray( selectedImeLanguage, languagesForButtons ) === -1 ) {
 				languagesForButtons.push( selectedImeLanguage );
 			}
 
 			// UI language must always be present
 			if ( this.uiLanguage !== this.contentLanguage &&
-				$.uls.data.languages[this.uiLanguage] &&
+				$.uls.data.languages[ this.uiLanguage ] &&
 				$.inArray( this.uiLanguage, languagesForButtons ) === -1 ) {
 				languagesForButtons.push( this.uiLanguage );
 			}
 
 			for ( lang in suggestedLanguages ) {
 				// Skip already found languages
-				if ( $.inArray( suggestedLanguages[lang], languagesForButtons ) > -1 ) {
+				if ( $.inArray( suggestedLanguages[ lang ], languagesForButtons ) > -1 ) {
 					continue;
 				}
 
-				languagesForButtons.push( suggestedLanguages[lang] );
+				languagesForButtons.push( suggestedLanguages[ lang ] );
 
 				// No need to add more languages than buttons
 				if ( languagesForButtons.length >= SUGGESTED_LANGUAGES_NUMBER ) {
@@ -284,7 +284,7 @@
 			selectedImeLanguage = selectedImeLanguage || this.contentLanguage;
 			// Add the buttons for the most likely languages
 			for ( i = 0; i < SUGGESTED_LANGUAGES_NUMBER; i++ ) {
-				language = languagesForButtons[i];
+				language = languagesForButtons[ i ];
 				$button = $( '<button>' )
 					.addClass( 'button uls-language-button autonym' )
 					.text( $.uls.data.getAutonym( language ) )
@@ -515,7 +515,7 @@
 			inputSettings.$parent.setBusy( true );
 
 			if ( previousLanguage ) {
-				previousIM = inputSettings.savedRegistry.imes[previousLanguage];
+				previousIM = inputSettings.savedRegistry.imes[ previousLanguage ];
 			}
 
 			if ( currentLanguage !== inputSettings.savedRegistry.language ||
diff --git a/resources/js/ext.uls.interface.js b/resources/js/ext.uls.interface.js
index 14aa040b..4160c70b 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -255,7 +255,7 @@
 		}
 
 		previousLanguages = mw.uls.getPreviousLanguages();
-		previousLang = previousLanguages.slice( -1 )[0];
+		previousLang = previousLanguages.slice( -1 )[ 0 ];
 
 		previousLanguages.push( currentLang );
 		mw.uls.setPreviousLanguages( previousLanguages );
@@ -263,7 +263,7 @@
 		getUndoAutonym( previousLang ).done( function( autonym ) {
 			// Attach a tipsy tooltip to the trigger
 			$ulsTrigger.tipsy( {
-				gravity: tipsyGravity[ulsPosition],
+				gravity: tipsyGravity[ ulsPosition ],
 				delayOut: 3000,
 				html: true,
 				fade: true,
diff --git a/resources/js/ext.uls.languagesettings.js b/resources/js/ext.uls.languagesettings.js
index 5f93693a..377b864b 100644
--- a/resources/js/ext.uls.languagesettings.js
+++ b/resources/js/ext.uls.languagesettings.js
@@ -119,7 +119,7 @@
 		initModule: function ( moduleName, active ) {
 			var $settingsTitle, $settingsText, $settingsLink,
 				languageSettings = this,
-				module = new $.fn.languagesettings.modules[moduleName]( languageSettings ),
+				module = new $.fn.languagesettings.modules[ moduleName ]( languageSettings ),
 				$settingsMenuItems = languageSettings.$window.find( '.settings-menu-items' );
 
 			$settingsTitle = $( '<div>' )
@@ -153,7 +153,7 @@
 				module.render();
 				$settingsLink.addClass( 'active' );
 			}
-			this.modules[moduleName] = module;
+			this.modules[ moduleName ] = module;
 
 			// Register cancel and apply hooks
 			mw.hook( 'mw.uls.settings.cancel' ).add( $.proxy( module.cancel, module ) );
@@ -165,7 +165,7 @@
 				languageSettings = this;
 
 			pos = $.extend( {}, this.$element.offset(), {
-				height: this.$element[0].offsetHeight
+				height: this.$element[ 0 ].offsetHeight
 			} );
 			top = this.top || pos.top + pos.height;
 			left = this.left || '25%';
@@ -299,7 +299,7 @@
 			}
 
 			if ( typeof option === 'string' ) {
-				data[option]();
+				data[ option ]();
 			}
 		} );
 	};
diff --git a/resources/js/ext.uls.preferences.js b/resources/js/ext.uls.preferences.js
index 36f96d2c..3316c856 100644
--- a/resources/js/ext.uls.preferences.js
+++ b/resources/js/ext.uls.preferences.js
@@ -61,7 +61,7 @@
 					if ( !data ) {
 						// Try to restore the old preferences, if any, if possible.
 						try {
-							data = JSON.parse( localStorage.getItem( 'jStorage' ) )['uls-preferences'];
+							data = JSON.parse( localStorage.getItem( 'jStorage' ) )[ 'uls-preferences' ];
 							// And try to remove it.
 							localStorage.removeItem( 'jStorage' );
 						} catch ( e ) {
@@ -122,7 +122,7 @@
 		 * @param value
 		 */
 		set: function ( key, value ) {
-			this.preferences[key] = value;
+			this.preferences[ key ] = value;
 		},
 
 		/**
@@ -131,7 +131,7 @@
 		 * @param key
 		 */
 		get: function ( key ) {
-			return this.preferences[key];
+			return this.preferences[ key ];
 		},
 
 		/**