diff --git a/static/js/pandora.js b/static/js/pandora.js
index 257525f..3557a22 100644
--- a/static/js/pandora.js
+++ b/static/js/pandora.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 /***
     Pandora
 ***/
diff --git a/static/js/pandora/Query.js b/static/js/pandora/Query.js
index f14e56b..65f8ca7 100644
--- a/static/js/pandora/Query.js
+++ b/static/js/pandora/Query.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.Query = (function() {
 
     function constructFind(query) {
diff --git a/static/js/pandora/UI.js b/static/js/pandora/UI.js
index 291ee1f..d7a13ef 100644
--- a/static/js/pandora/UI.js
+++ b/static/js/pandora/UI.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.UI = (function() {
     return {
         set: function(obj) {
diff --git a/static/js/pandora/URL.js b/static/js/pandora/URL.js
index db18c85..192c546 100644
--- a/static/js/pandora/URL.js
+++ b/static/js/pandora/URL.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 
 
 pandora.URL = (function() {
diff --git a/static/js/pandora/autovalidate.js b/static/js/pandora/autovalidate.js
index 7c10747..19e9888 100644
--- a/static/js/pandora/autovalidate.js
+++ b/static/js/pandora/autovalidate.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.autovalidateCode = function(value, blur, callback) {
     value = $.map(value.toUpperCase().split(''), function(v) {
         return /[0-9A-Z]/(v) ? v : null;
diff --git a/static/js/pandora/pandora.js b/static/js/pandora/pandora.js
index aac27bb..4b7a150 100644
--- a/static/js/pandora/pandora.js
+++ b/static/js/pandora/pandora.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 
 pandora.enterFullscreen = function() {
     pandora.$ui.appPanel.size(0, 0);
diff --git a/static/js/pandora/ui/Ox.FilesView.js b/static/js/pandora/ui/Ox.FilesView.js
index d173893..82d3e41 100644
--- a/static/js/pandora/ui/Ox.FilesView.js
+++ b/static/js/pandora/ui/Ox.FilesView.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 
 Ox.FilesView = function(options, self) {
 
diff --git a/static/js/pandora/ui/account.js b/static/js/pandora/ui/account.js
index d89290f..86ae076 100644
--- a/static/js/pandora/ui/account.js
+++ b/static/js/pandora/ui/account.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 
 pandora.ui.accountDialog = function(action) {
     var that = Ox.Dialog($.extend({
diff --git a/static/js/pandora/ui/appPanel.js b/static/js/pandora/ui/appPanel.js
index 8823911..7e05f77 100644
--- a/static/js/pandora/ui/appPanel.js
+++ b/static/js/pandora/ui/appPanel.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.appPanel = function() {
     var that = Ox.SplitPanel({
             elements: [
diff --git a/static/js/pandora/ui/backButton.js b/static/js/pandora/ui/backButton.js
index 3d7c97c..41482d1 100644
--- a/static/js/pandora/ui/backButton.js
+++ b/static/js/pandora/ui/backButton.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.backButton = function() {
     var that = Ox.Button({
         title: 'Back to ' + pandora.site.itemName.plural,
diff --git a/static/js/pandora/ui/browser.js b/static/js/pandora/ui/browser.js
index c4de5c5..180316a 100644
--- a/static/js/pandora/ui/browser.js
+++ b/static/js/pandora/ui/browser.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.browser = function() {
     var that;
     if (!pandora.user.ui.item) {
diff --git a/static/js/pandora/ui/contentPanel.js b/static/js/pandora/ui/contentPanel.js
index 89a17d7..2502f47 100644
--- a/static/js/pandora/ui/contentPanel.js
+++ b/static/js/pandora/ui/contentPanel.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.contentPanel = function() {
     var that = Ox.SplitPanel({
         elements: pandora.user.ui.item == '' ? [
diff --git a/static/js/pandora/ui/editor.js b/static/js/pandora/ui/editor.js
index 702a6c1..6646414 100644
--- a/static/js/pandora/ui/editor.js
+++ b/static/js/pandora/ui/editor.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.annotations = function() {
     var that = Ox.Element({
             id: 'annotations'
diff --git a/static/js/pandora/ui/filter.js b/static/js/pandora/ui/filter.js
index aabf6c9..1b2158b 100644
--- a/static/js/pandora/ui/filter.js
+++ b/static/js/pandora/ui/filter.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.filter = function() {
     var that = Ox.Filter({
         findKeys: Ox.map(pandora.site.itemKeys, function(key) {
diff --git a/static/js/pandora/ui/filterDialog.js b/static/js/pandora/ui/filterDialog.js
index ed0f07b..97bb2fb 100644
--- a/static/js/pandora/ui/filterDialog.js
+++ b/static/js/pandora/ui/filterDialog.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.filterDialog = function() {
     var that = Ox.Dialog({
         buttons: [
diff --git a/static/js/pandora/ui/findElement.js b/static/js/pandora/ui/findElement.js
index 4ce6dfc..d32c3b1 100644
--- a/static/js/pandora/ui/findElement.js
+++ b/static/js/pandora/ui/findElement.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.findElement = function() {
     var findKey = '',
         findValue = '';
diff --git a/static/js/pandora/ui/flipbook.js b/static/js/pandora/ui/flipbook.js
index 7ce9e2e..86cf091 100644
--- a/static/js/pandora/ui/flipbook.js
+++ b/static/js/pandora/ui/flipbook.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.flipbook = function(item) {
     var that = Ox.Flipbook({
         }).bindEvent('click', function(event, data) {
diff --git a/static/js/pandora/ui/folderBrowser.js b/static/js/pandora/ui/folderBrowser.js
index b628a7f..4fc8fba 100644
--- a/static/js/pandora/ui/folderBrowser.js
+++ b/static/js/pandora/ui/folderBrowser.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.folderBrowser = function(id) {
     var that = Ox.SplitPanel({
         elements: [
diff --git a/static/js/pandora/ui/folderBrowserBar.js b/static/js/pandora/ui/folderBrowserBar.js
index 2aab4ab..895d4da 100644
--- a/static/js/pandora/ui/folderBrowserBar.js
+++ b/static/js/pandora/ui/folderBrowserBar.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.folderBrowserBar = function(id) {
     var that = Ox.Bar({
             size: 24
diff --git a/static/js/pandora/ui/folderBrowserList.js b/static/js/pandora/ui/folderBrowserList.js
index 78d3d87..881f39b 100644
--- a/static/js/pandora/ui/folderBrowserList.js
+++ b/static/js/pandora/ui/folderBrowserList.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.folderBrowserList = function(id) {
     var columnWidth = (pandora.user.ui.sidebarSize - Ox.UI.SCROLLBAR_SIZE - 88) / 2,
         i = Ox.getPositionById(pandora.site.sectionFolders[pandora.user.ui.section], id),
diff --git a/static/js/pandora/ui/folders.js b/static/js/pandora/ui/folders.js
index f58d4d6..9f28b85 100644
--- a/static/js/pandora/ui/folders.js
+++ b/static/js/pandora/ui/folders.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.folders = function() {
     var that = Ox.Element()
         .css({overflowX: 'hidden', overflowY: 'auto'})
diff --git a/static/js/pandora/ui/foldersList.js b/static/js/pandora/ui/foldersList.js
index 9e4813b..3959769 100644
--- a/static/js/pandora/ui/foldersList.js
+++ b/static/js/pandora/ui/foldersList.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.folderList = function(id) {
     var i = Ox.getPositionById(pandora.site.sectionFolders[pandora.user.ui.section], id),
         that;
diff --git a/static/js/pandora/ui/group.js b/static/js/pandora/ui/group.js
index a2914ee..c9c6a52 100644
--- a/static/js/pandora/ui/group.js
+++ b/static/js/pandora/ui/group.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.group = function(id, query) {
     //Ox.print('group', id, query);
     /*
diff --git a/static/js/pandora/ui/homePage.js b/static/js/pandora/ui/homePage.js
index 6d87247..e87f3fb 100644
--- a/static/js/pandora/ui/homePage.js
+++ b/static/js/pandora/ui/homePage.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 
 pandora.ui.homePage = function() {
 
diff --git a/static/js/pandora/ui/info.js b/static/js/pandora/ui/info.js
index 77de369..e1e7c3f 100644
--- a/static/js/pandora/ui/info.js
+++ b/static/js/pandora/ui/info.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.info = function() {
     var that = Ox.Element()
         .append(
diff --git a/static/js/pandora/ui/item.js b/static/js/pandora/ui/item.js
index e8d9e8a..1b341cc 100644
--- a/static/js/pandora/ui/item.js
+++ b/static/js/pandora/ui/item.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.item = function() {
     var that = Ox.Element();
     pandora.api.getItem(pandora.user.ui.item, function(result) {
diff --git a/static/js/pandora/ui/leftPanel.js b/static/js/pandora/ui/leftPanel.js
index 10276fe..499bbfb 100644
--- a/static/js/pandora/ui/leftPanel.js
+++ b/static/js/pandora/ui/leftPanel.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.leftPanel = function() {
     var that = Ox.SplitPanel({
             elements: [
diff --git a/static/js/pandora/ui/list.js b/static/js/pandora/ui/list.js
index 28aa934..110b21b 100644
--- a/static/js/pandora/ui/list.js
+++ b/static/js/pandora/ui/list.js
@@ -1,4 +1,5 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
+
 pandora.ui.list = function(view) { // fixme: remove view argument
     var that, $map;
     //Ox.print('constructList', view);
diff --git a/static/js/pandora/ui/mainPanel.js b/static/js/pandora/ui/mainPanel.js
index 4638227..7ecca0d 100644
--- a/static/js/pandora/ui/mainPanel.js
+++ b/static/js/pandora/ui/mainPanel.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.mainPanel = function() {
     var that = Ox.SplitPanel({
         elements: [
diff --git a/static/js/pandora/ui/menu.js b/static/js/pandora/ui/menu.js
index d44a1f8..6bdc15b 100644
--- a/static/js/pandora/ui/menu.js
+++ b/static/js/pandora/ui/menu.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.mainMenu = function() {
     var isGuest = pandora.user.level == 'guest',
         that = Ox.MainMenu({
diff --git a/static/js/pandora/ui/placesDialog.js b/static/js/pandora/ui/placesDialog.js
index 03d379b..0f06387 100644
--- a/static/js/pandora/ui/placesDialog.js
+++ b/static/js/pandora/ui/placesDialog.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.placesDialog = function() {
     var height = Math.round(window.innerHeight * 0.9),
         width = Math.round(window.innerWidth * 0.9),
diff --git a/static/js/pandora/ui/publicLists.js b/static/js/pandora/ui/publicLists.js
index 4fd58a5..58b6752 100644
--- a/static/js/pandora/ui/publicLists.js
+++ b/static/js/pandora/ui/publicLists.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.publicListsDialog = function() { // fixme: unused
     var that = Ox.Dialog({
         buttons: [
diff --git a/static/js/pandora/ui/rightPanel.js b/static/js/pandora/ui/rightPanel.js
index 28eac13..a03dc45 100644
--- a/static/js/pandora/ui/rightPanel.js
+++ b/static/js/pandora/ui/rightPanel.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.rightPanel = function() {
     var that;
     if (pandora.user.ui.section == 'site') {
diff --git a/static/js/pandora/ui/sectionButtons.js b/static/js/pandora/ui/sectionButtons.js
index 9540326..f3bea73 100644
--- a/static/js/pandora/ui/sectionButtons.js
+++ b/static/js/pandora/ui/sectionButtons.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.sectionButtons = function() {
     var that = Ox.ButtonGroup({
             buttons: [
diff --git a/static/js/pandora/ui/sectionSelect.js b/static/js/pandora/ui/sectionSelect.js
index 50ad242..a23ce5d 100644
--- a/static/js/pandora/ui/sectionSelect.js
+++ b/static/js/pandora/ui/sectionSelect.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.sectionSelect = function() {
     // fixme: duplicated
     var that = Ox.Select({
diff --git a/static/js/pandora/ui/sectionbar.js b/static/js/pandora/ui/sectionbar.js
index 6250148..0a6f15d 100644
--- a/static/js/pandora/ui/sectionbar.js
+++ b/static/js/pandora/ui/sectionbar.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.sectionbar = function(mode) {
     var that = Ox.Bar({
             size: 24
diff --git a/static/js/pandora/ui/sortSelect.js b/static/js/pandora/ui/sortSelect.js
index 33ad0c2..9d6be32 100644
--- a/static/js/pandora/ui/sortSelect.js
+++ b/static/js/pandora/ui/sortSelect.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.sortSelect = function() {
     var that = Ox.Select({
             id: 'sortSelect',
diff --git a/static/js/pandora/ui/status.js b/static/js/pandora/ui/status.js
index a91cd8c..f82fce6 100644
--- a/static/js/pandora/ui/status.js
+++ b/static/js/pandora/ui/status.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.status = function(key, data) {
     var that = Ox.toTitleCase(key) + ': ' + [
         Ox.formatNumber(data.items) + ' movie' + (data.items != 1 ? 's' : ''),
diff --git a/static/js/pandora/ui/statusbar.js b/static/js/pandora/ui/statusbar.js
index 6f49584..1d488ca 100644
--- a/static/js/pandora/ui/statusbar.js
+++ b/static/js/pandora/ui/statusbar.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.statusbar = function() {
     var that = Ox.Bar({
             size: 16
diff --git a/static/js/pandora/ui/toolbar.js b/static/js/pandora/ui/toolbar.js
index 2ea4f72..6b7ef58 100644
--- a/static/js/pandora/ui/toolbar.js
+++ b/static/js/pandora/ui/toolbar.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.toolbar = function() {
     var that = Ox.Bar({
             size: 24
diff --git a/static/js/pandora/ui/viewSelect.js b/static/js/pandora/ui/viewSelect.js
index 16f9d69..e21e0c9 100644
--- a/static/js/pandora/ui/viewSelect.js
+++ b/static/js/pandora/ui/viewSelect.js
@@ -1,4 +1,4 @@
-// vim: et:ts=4:sw=4:sts=4:ft=js
+// vim: et:ts=4:sw=4:sts=4:ft=javascript
 pandora.ui.viewSelect = function() {
     var that = Ox.Select({
             id: 'viewSelect',