diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 7a5f59e02..0e5cbdc8b 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1,10 +1,10 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Signals = imports.signals;
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const Shell = imports.gi.Shell;
+const Signals = imports.signals;
 
 const GenericDisplay = imports.ui.genericDisplay;
 
diff --git a/js/ui/docDisplay.js b/js/ui/docDisplay.js
index 436385d35..b921bd212 100644
--- a/js/ui/docDisplay.js
+++ b/js/ui/docDisplay.js
@@ -1,11 +1,10 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Signals = imports.signals;
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
-
 const Shell = imports.gi.Shell;
+const Signals = imports.signals;
 
 const GenericDisplay = imports.ui.genericDisplay;
 
diff --git a/js/ui/genericDisplay.js b/js/ui/genericDisplay.js
index d9713adc1..8ea31dfc2 100644
--- a/js/ui/genericDisplay.js
+++ b/js/ui/genericDisplay.js
@@ -1,14 +1,13 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Signals = imports.signals;
+const Big = imports.gi.Big;
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
-const Pango = imports.gi.Pango;
 const Gtk = imports.gi.Gtk;
-
-const Tidy = imports.gi.Tidy;
-const Big = imports.gi.Big;
+const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
+const Signals = imports.signals;
+const Tidy = imports.gi.Tidy;
 
 const ITEM_DISPLAY_NAME_COLOR = new Clutter.Color();
 ITEM_DISPLAY_NAME_COLOR.from_pixel(0xffffffff);
diff --git a/js/ui/main.js b/js/ui/main.js
index 272b559a6..10d9d9e76 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -1,14 +1,14 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 const Clutter = imports.gi.Clutter;
-const Shell = imports.gi.Shell;
 const Gio = imports.gi.Gio;
-const Signals = imports.signals;
 const Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
 const Tweener = imports.tweener.tweener;
 
-const Panel = imports.ui.panel;
 const Overlay = imports.ui.overlay;
+const Panel = imports.ui.panel;
 const RunDialog = imports.ui.runDialog;
 const WindowManager = imports.ui.windowManager;
 
diff --git a/js/ui/overlay.js b/js/ui/overlay.js
index 84644da4f..80a5441d1 100644
--- a/js/ui/overlay.js
+++ b/js/ui/overlay.js
@@ -1,19 +1,19 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Signals = imports.signals;
-const Mainloop = imports.mainloop;
-const Tweener = imports.tweener.tweener;
+const Big = imports.gi.Big;
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
-
-const Workspaces = imports.ui.workspaces;
-const Main = imports.ui.main;
-const Panel = imports.ui.panel;
+const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
-const Big = imports.gi.Big;
+const Signals = imports.signals;
+const Tweener = imports.tweener.tweener;
+
 const AppDisplay = imports.ui.appDisplay;
 const DocDisplay = imports.ui.docDisplay;
+const Main = imports.ui.main;
+const Panel = imports.ui.panel;
+const Workspaces = imports.ui.workspaces;
 
 const OVERLAY_BACKGROUND_COLOR = new Clutter.Color();
 OVERLAY_BACKGROUND_COLOR.from_pixel(0x000000ff);
diff --git a/js/ui/panel.js b/js/ui/panel.js
index 5665fb343..e861072f1 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -1,10 +1,10 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
+const Big = imports.gi.Big;
 const Clutter = imports.gi.Clutter;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
-const Big = imports.gi.Big;
 
 const Button = imports.ui.button;
 const Main = imports.ui.main;
diff --git a/js/ui/runDialog.js b/js/ui/runDialog.js
index fd6344711..d94969e62 100644
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@@ -1,8 +1,8 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Signals = imports.signals;
-const Shell = imports.gi.Shell;
 const Clutter = imports.gi.Clutter;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
 
 const Main = imports.ui.main;
 
diff --git a/js/ui/workspaces.js b/js/ui/workspaces.js
index 53bcf9535..0723b7768 100644
--- a/js/ui/workspaces.js
+++ b/js/ui/workspaces.js
@@ -1,19 +1,19 @@
-/* -*- mode: js2; js2-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Tweener = imports.tweener.tweener;
+const Big = imports.gi.Big;
 const Clutter = imports.gi.Clutter;
+const GdkPixbuf = imports.gi.GdkPixbuf;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
+const Meta = imports.gi.Meta;
 const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
 const Signals = imports.signals;
+const Tweener = imports.tweener.tweener;
 
 const Main = imports.ui.main;
 const Overlay = imports.ui.overlay;
 const Panel = imports.ui.panel;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const Big = imports.gi.Big;
-const GdkPixbuf = imports.gi.GdkPixbuf;
 
 // Windows are slightly translucent in the overlay mode
 const WINDOW_OPACITY = 0.9 * 255;