Merge pull request #892 from binaryoutcast/pmTreeCleanup

PR to resolve #889 - Clean up the Pale Moon tree

117 files changed, 791 insertions, 793 deletions

diff --git a/application/palemoon/app/moz.build b/application/palemoon/app/moz.build
index 8b358b622..c11f4c37e 100644
--- a/application/palemoon/app/moz.build
+++ b/application/palemoon/app/moz.build
@@ -6,7 +6,6 @@
 
 DIRS += ['profile/extensions']
 
-
 GeckoProgram(CONFIG['MOZ_APP_NAME'])
 
 JS_PREFERENCE_PP_FILES += [
@@ -18,18 +17,14 @@ if CONFIG['LIBXUL_SDK']:
         'profile/channel-prefs.js',
     ]
 
-SOURCES += [
-    'nsBrowserApp.cpp',
-]
+SOURCES += ['nsBrowserApp.cpp']
 
 FINAL_TARGET_FILES += ['blocklist.xml']
 FINAL_TARGET_FILES.defaults.profile += ['profile/prefs.js']
 
 DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 
-LOCAL_INCLUDES += [
-    '!/build',
-]
+LOCAL_INCLUDES += ['!/build']
 
 LOCAL_INCLUDES += [
     '/toolkit/xre',
@@ -37,9 +32,7 @@ LOCAL_INCLUDES += [
     '/xpcom/build',
 ]
 
-USE_LIBS += [
-    'mozglue',
-]
+USE_LIBS += ['mozglue']
 
 if CONFIG['_MSC_VER']:
     # Always enter a Windows program through wmain, whether or not we're
diff --git a/application/palemoon/base/jar.mn b/application/palemoon/base/jar.mn
index d8c3f4b21..8931c0260 100644
--- a/application/palemoon/base/jar.mn
+++ b/application/palemoon/base/jar.mn
@@ -2,135 +2,81 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 browser.jar:
-%  content browser %content/browser/ contentaccessible=yes
+% content browser %content/browser/ contentaccessible=yes
 #ifdef XP_MACOSX
-%  overlay chrome://mozapps/content/downloads/downloads.xul chrome://browser/content/downloadManagerOverlay.xul
-%  overlay chrome://global/content/console.xul chrome://browser/content/jsConsoleOverlay.xul
-%  overlay chrome://mozapps/content/update/updates.xul chrome://browser/content/softwareUpdateOverlay.xul
+% overlay chrome://mozapps/content/downloads/downloads.xul chrome://browser/content/downloadManagerOverlay.xul
+% overlay chrome://global/content/console.xul chrome://browser/content/jsConsoleOverlay.xul
+% overlay chrome://mozapps/content/update/updates.xul chrome://browser/content/softwareUpdateOverlay.xul
 #endif
 #ifdef XP_WIN
-%  overlay chrome://browser/content/browser.xul chrome://browser/content/win6BrowserOverlay.xul os=WINNT osversion>=6
+% overlay chrome://browser/content/browser.xul chrome://browser/content/win6BrowserOverlay.xul os=WINNT osversion>=6
 #endif
-%  overlay chrome://global/content/viewSource.xul chrome://browser/content/viewSourceOverlay.xul
-%  overlay chrome://global/content/viewPartialSource.xul chrome://browser/content/viewSourceOverlay.xul
-%  style chrome://global/content/customizeToolbar.xul chrome://browser/content/browser.css
-%  style chrome://global/content/customizeToolbar.xul chrome://browser/skin/
-*       content/browser/aboutDialog.xul               (content/aboutDialog.xul)
-*       content/browser/aboutDialog.js                (content/aboutDialog.js)
-        content/browser/aboutDialog.css               (content/aboutDialog.css)
-        content/browser/aboutRobots.xhtml             (content/aboutRobots.xhtml)
-        content/browser/abouthome/aboutHome.xhtml     (content/abouthome/aboutHome.xhtml)
-        content/browser/abouthome/aboutHome.js        (content/abouthome/aboutHome.js)
-*       content/browser/abouthome/aboutHome.css       (content/abouthome/aboutHome.css)
-        content/browser/abouthome/noise.png           (content/abouthome/noise.png)
-        content/browser/abouthome/snippet1.png        (content/abouthome/snippet1.png)
-        content/browser/abouthome/snippet2.png        (content/abouthome/snippet2.png)
-        content/browser/abouthome/downloads.png       (content/abouthome/downloads.png)
-        content/browser/abouthome/bookmarks.png       (content/abouthome/bookmarks.png)
-        content/browser/abouthome/history.png         (content/abouthome/history.png)
-        content/browser/abouthome/addons.png          (content/abouthome/addons.png)
-        content/browser/abouthome/sync.png            (content/abouthome/sync.png)
-        content/browser/abouthome/settings.png        (content/abouthome/settings.png)
-        content/browser/abouthome/restore.png         (content/abouthome/restore.png)
-        content/browser/abouthome/restore-large.png   (content/abouthome/restore-large.png)
-        content/browser/abouthome/snippet1@2x.png      (content/abouthome/snippet1@2x.png)
-        content/browser/abouthome/snippet2@2x.png      (content/abouthome/snippet2@2x.png)
-        content/browser/abouthome/downloads@2x.png     (content/abouthome/downloads@2x.png)
-        content/browser/abouthome/bookmarks@2x.png     (content/abouthome/bookmarks@2x.png)
-        content/browser/abouthome/history@2x.png       (content/abouthome/history@2x.png)
-        content/browser/abouthome/addons@2x.png        (content/abouthome/addons@2x.png)
-        content/browser/abouthome/sync@2x.png          (content/abouthome/sync@2x.png)
-        content/browser/abouthome/settings@2x.png      (content/abouthome/settings@2x.png)
-        content/browser/abouthome/restore@2x.png       (content/abouthome/restore@2x.png)
-        content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png)
-        content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
-        content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
-        content/browser/autorecovery.js               (content/autorecovery.js)
-        content/browser/autorecovery.xul              (content/autorecovery.xul)
-*       content/browser/browser.css                   (content/browser.css)
-        content/browser/browser-menudragging.xul      (content/browser-menudragging.xul)
-        content/browser/browser-menudragging.js       (content/browser-menudragging.js)
-        content/browser/browser-title.css             (content/browser-title.css)
-*       content/browser/browser.js                    (content/browser.js)
-*       content/browser/browser.xul                   (content/browser.xul)
+% overlay chrome://global/content/viewSource.xul chrome://browser/content/viewSourceOverlay.xul
+% overlay chrome://global/content/viewPartialSource.xul chrome://browser/content/viewSourceOverlay.xul
+% style chrome://global/content/customizeToolbar.xul chrome://browser/content/browser.css
+% style chrome://global/content/customizeToolbar.xul chrome://browser/skin/
+* content/browser/aboutDialog.xul               (content/aboutDialog.xul)
+* content/browser/aboutDialog.js                (content/aboutDialog.js)
+  content/browser/aboutDialog.css               (content/aboutDialog.css)
+  content/browser/aboutRobots.xhtml             (content/aboutRobots.xhtml)
+  content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
+  content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
+  content/browser/autorecovery.js               (content/autorecovery.js)
+  content/browser/autorecovery.xul              (content/autorecovery.xul)
+* content/browser/browser.css                   (content/browser.css)
+  content/browser/browser-menudragging.xul      (content/browser-menudragging.xul)
+  content/browser/browser-menudragging.js       (content/browser-menudragging.js)
+  content/browser/browser-title.css             (content/browser-title.css)
+* content/browser/browser.js                    (content/browser.js)
+* content/browser/browser.xul                   (content/browser.xul)
 #ifdef MOZ_DEVTOOLS
-        content/browser/browser-devtools-theme.js     (content/browser-devtools-theme.js)
+  content/browser/browser-devtools-theme.js     (content/browser-devtools-theme.js)
 #endif
-*       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
-        content/browser/content.js                    (content/content.js)
-        content/browser/padlock.xul                   (content/padlock.xul)
-        content/browser/padlock.js                    (content/padlock.js)
-        content/browser/padlock.css                   (content/padlock.css)
-        content/browser/padlock_mod_ev.png            (content/padlock_mod_ev.png)
-        content/browser/padlock_mod_https.png         (content/padlock_mod_https.png)
-        content/browser/padlock_mod_low.png           (content/padlock_mod_low.png)
-        content/browser/padlock_mod_broken.png        (content/padlock_mod_broken.png)
-        content/browser/padlock_classic_ev.png        (content/padlock_classic_ev.png)
-        content/browser/padlock_classic_https.png     (content/padlock_classic_https.png)
-        content/browser/padlock_classic_low.png       (content/padlock_classic_low.png)
-        content/browser/padlock_classic_broken.png    (content/padlock_classic_broken.png)
-        content/browser/palemoon.xhtml                (content/palemoon.xhtml)
-        content/browser/newtab/newTab.xhtml           (content/newtab/newTab.xhtml)
-*       content/browser/newtab/newTab.js              (content/newtab/newTab.js)
-        content/browser/newtab/newTab.css             (content/newtab/newTab.css)
-*       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
-        content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
-        content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
-        content/browser/pageinfo/pageInfo.xml         (content/pageinfo/pageInfo.xml)
-        content/browser/pageinfo/feeds.js             (content/pageinfo/feeds.js)
-        content/browser/pageinfo/feeds.xml            (content/pageinfo/feeds.xml)
-        content/browser/pageinfo/permissions.js       (content/pageinfo/permissions.js)
-        content/browser/pageinfo/security.js          (content/pageinfo/security.js)
-#ifdef MOZ_SERVICES_SYNC
-        content/browser/sync/aboutSyncTabs.xul        (content/sync/aboutSyncTabs.xul)
-        content/browser/sync/aboutSyncTabs.js         (content/sync/aboutSyncTabs.js)
-        content/browser/sync/aboutSyncTabs.css        (content/sync/aboutSyncTabs.css)
-        content/browser/sync/aboutSyncTabs-bindings.xml  (content/sync/aboutSyncTabs-bindings.xml)
-        content/browser/sync/setup.xul                (content/sync/setup.xul)
-        content/browser/sync/addDevice.js             (content/sync/addDevice.js)
-        content/browser/sync/addDevice.xul            (content/sync/addDevice.xul)
-        content/browser/sync/setup.js                 (content/sync/setup.js)
-        content/browser/sync/genericChange.xul        (content/sync/genericChange.xul)
-        content/browser/sync/genericChange.js         (content/sync/genericChange.js)
-        content/browser/sync/key.xhtml                (content/sync/key.xhtml)
-        content/browser/sync/notification.xml         (content/sync/notification.xml)
-        content/browser/sync/quota.xul                (content/sync/quota.xul)
-        content/browser/sync/quota.js                 (content/sync/quota.js)
-        content/browser/sync/utils.js                 (content/sync/utils.js)
-        content/browser/sync/progress.js              (content/sync/progress.js)
-        content/browser/sync/progress.xhtml           (content/sync/progress.xhtml)
-#endif
-        content/browser/openLocation.js               (content/openLocation.js)
-        content/browser/openLocation.xul              (content/openLocation.xul)
-        content/browser/safeMode.css                  (content/safeMode.css)
-        content/browser/safeMode.js                   (content/safeMode.js)
-*       content/browser/safeMode.xul                  (content/safeMode.xul)
-*       content/browser/sanitize.js                   (content/sanitize.js)
-*       content/browser/sanitize.xul                  (content/sanitize.xul)
-*       content/browser/sanitizeDialog.js             (content/sanitizeDialog.js)
-        content/browser/sanitizeDialog.css            (content/sanitizeDialog.css)
-        content/browser/autocomplete.css              (content/autocomplete.css)
-*       content/browser/autocomplete.xml              (content/autocomplete.xml)
-        content/browser/tabbrowser.css                (content/tabbrowser.css)
-*       content/browser/tabbrowser.xml                (content/tabbrowser.xml)
-*       content/browser/urlbarBindings.xml            (content/urlbarBindings.xml)
-*       content/browser/utilityOverlay.js             (content/utilityOverlay.js)
-        content/browser/web-panels.js                 (content/web-panels.js)
-*       content/browser/web-panels.xul                (content/web-panels.xul)
-*       content/browser/baseMenuOverlay.xul           (content/baseMenuOverlay.xul)
-*       content/browser/nsContextMenu.js              (content/nsContextMenu.js)
+* content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
+  content/browser/content.js                    (content/content.js)
+  content/browser/padlock.xul                   (content/padlock.xul)
+  content/browser/padlock.js                    (content/padlock.js)
+  content/browser/padlock.css                   (content/padlock.css)
+  content/browser/padlock_mod_ev.png            (content/padlock_mod_ev.png)
+  content/browser/padlock_mod_https.png         (content/padlock_mod_https.png)
+  content/browser/padlock_mod_low.png           (content/padlock_mod_low.png)
+  content/browser/padlock_mod_broken.png        (content/padlock_mod_broken.png)
+  content/browser/padlock_classic_ev.png        (content/padlock_classic_ev.png)
+  content/browser/padlock_classic_https.png     (content/padlock_classic_https.png)
+  content/browser/padlock_classic_low.png       (content/padlock_classic_low.png)
+  content/browser/padlock_classic_broken.png    (content/padlock_classic_broken.png)
+  content/browser/palemoon.xhtml                (content/palemoon.xhtml)
+  content/browser/openLocation.js               (content/openLocation.js)
+  content/browser/openLocation.xul              (content/openLocation.xul)
+  content/browser/safeMode.css                  (content/safeMode.css)
+  content/browser/safeMode.js                   (content/safeMode.js)
+* content/browser/safeMode.xul                  (content/safeMode.xul)
+* content/browser/sanitize.js                   (content/sanitize.js)
+* content/browser/sanitize.xul                  (content/sanitize.xul)
+* content/browser/sanitizeDialog.js             (content/sanitizeDialog.js)
+  content/browser/sanitizeDialog.css            (content/sanitizeDialog.css)
+  content/browser/autocomplete.css              (content/autocomplete.css)
+* content/browser/autocomplete.xml              (content/autocomplete.xml)
+  content/browser/tabbrowser.css                (content/tabbrowser.css)
+* content/browser/tabbrowser.xml                (content/tabbrowser.xml)
+* content/browser/urlbarBindings.xml            (content/urlbarBindings.xml)
+* content/browser/utilityOverlay.js             (content/utilityOverlay.js)
+  content/browser/web-panels.js                 (content/web-panels.js)
+* content/browser/web-panels.xul                (content/web-panels.xul)
+* content/browser/baseMenuOverlay.xul           (content/baseMenuOverlay.xul)
+* content/browser/nsContextMenu.js              (content/nsContextMenu.js)
 # XXX: We should exclude this one as well (bug 71895)
-*       content/browser/hiddenWindow.xul              (content/hiddenWindow.xul)
+* content/browser/hiddenWindow.xul              (content/hiddenWindow.xul)
 #ifdef XP_MACOSX
-*       content/browser/macBrowserOverlay.xul         (content/macBrowserOverlay.xul)
-*       content/browser/downloadManagerOverlay.xul    (content/downloadManagerOverlay.xul)
-*       content/browser/jsConsoleOverlay.xul          (content/jsConsoleOverlay.xul)
-*       content/browser/softwareUpdateOverlay.xul  (content/softwareUpdateOverlay.xul)
+* content/browser/macBrowserOverlay.xul         (content/macBrowserOverlay.xul)
+* content/browser/downloadManagerOverlay.xul    (content/downloadManagerOverlay.xul)
+* content/browser/jsConsoleOverlay.xul          (content/jsConsoleOverlay.xul)
+* content/browser/softwareUpdateOverlay.xul     (content/softwareUpdateOverlay.xul)
 #endif
-*       content/browser/viewSourceOverlay.xul         (content/viewSourceOverlay.xul)
+* content/browser/viewSourceOverlay.xul         (content/viewSourceOverlay.xul)
 #ifdef XP_WIN
-        content/browser/win6BrowserOverlay.xul        (content/win6BrowserOverlay.xul)
+  content/browser/win6BrowserOverlay.xul        (content/win6BrowserOverlay.xul)
 #endif
 # the following files are browser-specific overrides
-*       content/browser/license.html                  (/toolkit/content/license.html)
+* content/browser/license.html                  (/toolkit/content/license.html)
 % override chrome://global/content/license.html chrome://browser/content/license.html
diff --git a/application/palemoon/branding/official/content/moz.build b/application/palemoon/branding/official/content/moz.build
index 35f6d454a..c97072bba 100644
--- a/application/palemoon/branding/official/content/moz.build
+++ b/application/palemoon/branding/official/content/moz.build
@@ -4,5 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/application/palemoon/branding/official/locales/jar.mn b/application/palemoon/branding/official/locales/jar.mn
index 79078217e..f02dd95f3 100644
--- a/application/palemoon/branding/official/locales/jar.mn
+++ b/application/palemoon/branding/official/locales/jar.mn
@@ -6,6 +6,6 @@
 
 @AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
-  locale/branding/brand.dtd        (%brand.dtd)
-  locale/branding/brand.properties (%brand.properties)
-  locale/branding/browserconfig.properties (../../shared/locales/browserconfig.properties)
+  locale/branding/brand.dtd                     (%brand.dtd)
+  locale/branding/brand.properties              (%brand.properties)
+  locale/branding/browserconfig.properties      (../../shared/locales/browserconfig.properties)
diff --git a/application/palemoon/branding/official/locales/moz.build b/application/palemoon/branding/official/locales/moz.build
index 35f6d454a..c97072bba 100644
--- a/application/palemoon/branding/official/locales/moz.build
+++ b/application/palemoon/branding/official/locales/moz.build
@@ -4,5 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/application/palemoon/branding/unofficial/content/jar.mn b/application/palemoon/branding/unofficial/content/jar.mn
index 821aa03bc..bdb1e8129 100644
--- a/application/palemoon/branding/unofficial/content/jar.mn
+++ b/application/palemoon/branding/unofficial/content/jar.mn
@@ -4,13 +4,13 @@
 
 browser.jar:
 % content branding %content/branding/ contentaccessible=yes
-  content/branding/about.png                     (about.png)
-  content/branding/about-background.png          (about-background.png)
-  content/branding/about-logo.png                (about-logo.png)
-  content/branding/about-logo@2x.png             (about-logo@2x.png)
-  content/branding/about-wordmark.svg            (about-wordmark.svg)
-  content/branding/icon48.png                    (icon48.png)
-  content/branding/icon64.png                    (icon64.png)
-  content/branding/icon16.png                    (../default16.png)
-  content/branding/icon32.png                    (../default32.png)
-  content/branding/aboutDialog.css               (aboutDialog.css)
+  content/branding/about.png                  (about.png)
+  content/branding/about-background.png       (about-background.png)
+  content/branding/about-logo.png             (about-logo.png)
+  content/branding/about-logo@2x.png          (about-logo@2x.png)
+  content/branding/about-wordmark.svg         (about-wordmark.svg)
+  content/branding/icon48.png                 (icon48.png)
+  content/branding/icon64.png                 (icon64.png)
+  content/branding/icon16.png                 (../default16.png)
+  content/branding/icon32.png                 (../default32.png)
+  content/branding/aboutDialog.css            (aboutDialog.css)
diff --git a/application/palemoon/branding/unofficial/content/moz.build b/application/palemoon/branding/unofficial/content/moz.build
index 35f6d454a..c97072bba 100644
--- a/application/palemoon/branding/unofficial/content/moz.build
+++ b/application/palemoon/branding/unofficial/content/moz.build
@@ -4,5 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/application/palemoon/branding/unofficial/locales/jar.mn b/application/palemoon/branding/unofficial/locales/jar.mn
index 88aa07434..9de6cfc83 100644
--- a/application/palemoon/branding/unofficial/locales/jar.mn
+++ b/application/palemoon/branding/unofficial/locales/jar.mn
@@ -7,6 +7,6 @@
 @AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
 # Unofficial branding only exists in en-US
-  locale/branding/brand.dtd        (en-US/brand.dtd)
-  locale/branding/brand.properties (en-US/brand.properties)
-  locale/branding/browserconfig.properties (../../shared/locales/browserconfig.properties)
+  locale/branding/brand.dtd                   (en-US/brand.dtd)
+  locale/branding/brand.properties            (en-US/brand.properties)
+  locale/branding/browserconfig.properties    (../../shared/locales/browserconfig.properties)
diff --git a/application/palemoon/branding/unstable/content/jar.mn b/application/palemoon/branding/unstable/content/jar.mn
index d8038bf9e..6903e9ac5 100644
--- a/application/palemoon/branding/unstable/content/jar.mn
+++ b/application/palemoon/branding/unstable/content/jar.mn
@@ -4,13 +4,13 @@
 
 browser.jar:
 % content branding %content/branding/ contentaccessible=yes
-  content/branding/about.png                     (about.png)
-  content/branding/about-background.png          (about-background.png)
-  content/branding/about-logo.png                (about-logo.png)
-  content/branding/about-logo@2x.png             (about-logo@2x.png)
-  content/branding/about-wordmark.png            (about-wordmark.png)
-  content/branding/icon48.png                    (icon48.png)
-  content/branding/icon64.png                    (icon64.png)
-  content/branding/icon16.png                    (../default16.png)
-  content/branding/icon32.png                    (../default32.png)
-  content/branding/aboutDialog.css               (aboutDialog.css)
+  content/branding/about.png                (about.png)
+  content/branding/about-background.png     (about-background.png)
+  content/branding/about-logo.png           (about-logo.png)
+  content/branding/about-logo@2x.png        (about-logo@2x.png)
+  content/branding/about-wordmark.png       (about-wordmark.png)
+  content/branding/icon48.png               (icon48.png)
+  content/branding/icon64.png               (icon64.png)
+  content/branding/icon16.png               (../default16.png)
+  content/branding/icon32.png               (../default32.png)
+  content/branding/aboutDialog.css          (aboutDialog.css)
diff --git a/application/palemoon/branding/unstable/content/moz.build b/application/palemoon/branding/unstable/content/moz.build
index 35f6d454a..c97072bba 100644
--- a/application/palemoon/branding/unstable/content/moz.build
+++ b/application/palemoon/branding/unstable/content/moz.build
@@ -4,5 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/application/palemoon/branding/unstable/locales/jar.mn b/application/palemoon/branding/unstable/locales/jar.mn
index 88aa07434..9de6cfc83 100644
--- a/application/palemoon/branding/unstable/locales/jar.mn
+++ b/application/palemoon/branding/unstable/locales/jar.mn
@@ -7,6 +7,6 @@
 @AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
 # Unofficial branding only exists in en-US
-  locale/branding/brand.dtd        (en-US/brand.dtd)
-  locale/branding/brand.properties (en-US/brand.properties)
-  locale/branding/browserconfig.properties (../../shared/locales/browserconfig.properties)
+  locale/branding/brand.dtd                   (en-US/brand.dtd)
+  locale/branding/brand.properties            (en-US/brand.properties)
+  locale/branding/browserconfig.properties    (../../shared/locales/browserconfig.properties)
diff --git a/application/palemoon/base/content/abouthome/aboutHome.css b/application/palemoon/components/abouthome/aboutHome.css
index 73c686202..73c686202 100644
--- a/application/palemoon/base/content/abouthome/aboutHome.css
+++ b/application/palemoon/components/abouthome/aboutHome.css
diff --git a/application/palemoon/base/content/abouthome/aboutHome.js b/application/palemoon/components/abouthome/aboutHome.js
index 6ff8eee98..6ff8eee98 100644
--- a/application/palemoon/base/content/abouthome/aboutHome.js
+++ b/application/palemoon/components/abouthome/aboutHome.js
diff --git a/application/palemoon/base/content/abouthome/aboutHome.xhtml b/application/palemoon/components/abouthome/aboutHome.xhtml
index cb3fa634a..cb3fa634a 100644
--- a/application/palemoon/base/content/abouthome/aboutHome.xhtml
+++ b/application/palemoon/components/abouthome/aboutHome.xhtml
diff --git a/application/palemoon/base/content/abouthome/addons.png b/application/palemoon/components/abouthome/addons.png
index 41519ce49..41519ce49 100644
--- a/application/palemoon/base/content/abouthome/addons.png
+++ b/application/palemoon/components/abouthome/addons.png
diff --git a/application/palemoon/base/content/abouthome/addons@2x.png b/application/palemoon/components/abouthome/addons@2x.png
index d4d04ee8c..d4d04ee8c 100644
--- a/application/palemoon/base/content/abouthome/addons@2x.png
+++ b/application/palemoon/components/abouthome/addons@2x.png
diff --git a/application/palemoon/base/content/abouthome/bookmarks.png b/application/palemoon/components/abouthome/bookmarks.png
index 5c7e194a6..5c7e194a6 100644
--- a/application/palemoon/base/content/abouthome/bookmarks.png
+++ b/application/palemoon/components/abouthome/bookmarks.png
diff --git a/application/palemoon/base/content/abouthome/bookmarks@2x.png b/application/palemoon/components/abouthome/bookmarks@2x.png
index 7ede00744..7ede00744 100644
--- a/application/palemoon/base/content/abouthome/bookmarks@2x.png
+++ b/application/palemoon/components/abouthome/bookmarks@2x.png
diff --git a/application/palemoon/base/content/abouthome/downloads.png b/application/palemoon/components/abouthome/downloads.png
index 3d4d10e7a..3d4d10e7a 100644
--- a/application/palemoon/base/content/abouthome/downloads.png
+++ b/application/palemoon/components/abouthome/downloads.png
diff --git a/application/palemoon/base/content/abouthome/downloads@2x.png b/application/palemoon/components/abouthome/downloads@2x.png
index d384a22c6..d384a22c6 100644
--- a/application/palemoon/base/content/abouthome/downloads@2x.png
+++ b/application/palemoon/components/abouthome/downloads@2x.png
diff --git a/application/palemoon/base/content/abouthome/history.png b/application/palemoon/components/abouthome/history.png
index ae742b1aa..ae742b1aa 100644
--- a/application/palemoon/base/content/abouthome/history.png
+++ b/application/palemoon/components/abouthome/history.png
diff --git a/application/palemoon/base/content/abouthome/history@2x.png b/application/palemoon/components/abouthome/history@2x.png
index 696902e7c..696902e7c 100644
--- a/application/palemoon/base/content/abouthome/history@2x.png
+++ b/application/palemoon/components/abouthome/history@2x.png
diff --git a/application/palemoon/components/abouthome/jar.mn b/application/palemoon/components/abouthome/jar.mn
new file mode 100644
index 000000000..d44583665
--- /dev/null
+++ b/application/palemoon/components/abouthome/jar.mn
@@ -0,0 +1,29 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+browser.jar:
+  content/browser/abouthome/aboutHome.xhtml
+  content/browser/abouthome/aboutHome.js
+* content/browser/abouthome/aboutHome.css
+  content/browser/abouthome/noise.png
+  content/browser/abouthome/snippet1.png
+  content/browser/abouthome/snippet2.png
+  content/browser/abouthome/downloads.png
+  content/browser/abouthome/bookmarks.png
+  content/browser/abouthome/history.png
+  content/browser/abouthome/addons.png
+  content/browser/abouthome/sync.png
+  content/browser/abouthome/settings.png
+  content/browser/abouthome/restore.png
+  content/browser/abouthome/restore-large.png
+  content/browser/abouthome/snippet1@2x.png
+  content/browser/abouthome/snippet2@2x.png
+  content/browser/abouthome/downloads@2x.png
+  content/browser/abouthome/bookmarks@2x.png
+  content/browser/abouthome/history@2x.png
+  content/browser/abouthome/addons@2x.png
+  content/browser/abouthome/sync@2x.png
+  content/browser/abouthome/settings@2x.png
+  content/browser/abouthome/restore@2x.png
+  content/browser/abouthome/restore-large@2x.png
\ No newline at end of file
diff --git a/application/palemoon/components/abouthome/moz.build b/application/palemoon/components/abouthome/moz.build
new file mode 100644
index 000000000..2d64d506c
--- /dev/null
+++ b/application/palemoon/components/abouthome/moz.build
@@ -0,0 +1,8 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn']
+
diff --git a/application/palemoon/base/content/abouthome/noise.png b/application/palemoon/components/abouthome/noise.png
index 3467cf4d4..3467cf4d4 100644
--- a/application/palemoon/base/content/abouthome/noise.png
+++ b/application/palemoon/components/abouthome/noise.png
diff --git a/application/palemoon/base/content/abouthome/restore-large.png b/application/palemoon/components/abouthome/restore-large.png
index ef593e6e1..ef593e6e1 100644
--- a/application/palemoon/base/content/abouthome/restore-large.png
+++ b/application/palemoon/components/abouthome/restore-large.png
diff --git a/application/palemoon/base/content/abouthome/restore-large@2x.png b/application/palemoon/components/abouthome/restore-large@2x.png
index d5c71d0b0..d5c71d0b0 100644
--- a/application/palemoon/base/content/abouthome/restore-large@2x.png
+++ b/application/palemoon/components/abouthome/restore-large@2x.png
diff --git a/application/palemoon/base/content/abouthome/restore.png b/application/palemoon/components/abouthome/restore.png
index 5c3d6f437..5c3d6f437 100644
--- a/application/palemoon/base/content/abouthome/restore.png
+++ b/application/palemoon/components/abouthome/restore.png
diff --git a/application/palemoon/base/content/abouthome/restore@2x.png b/application/palemoon/components/abouthome/restore@2x.png
index 5acb63052..5acb63052 100644
--- a/application/palemoon/base/content/abouthome/restore@2x.png
+++ b/application/palemoon/components/abouthome/restore@2x.png
diff --git a/application/palemoon/base/content/abouthome/settings.png b/application/palemoon/components/abouthome/settings.png
index 4b0c30990..4b0c30990 100644
--- a/application/palemoon/base/content/abouthome/settings.png
+++ b/application/palemoon/components/abouthome/settings.png
diff --git a/application/palemoon/base/content/abouthome/settings@2x.png b/application/palemoon/components/abouthome/settings@2x.png
index c77cb9a92..c77cb9a92 100644
--- a/application/palemoon/base/content/abouthome/settings@2x.png
+++ b/application/palemoon/components/abouthome/settings@2x.png
diff --git a/application/palemoon/base/content/abouthome/snippet1.png b/application/palemoon/components/abouthome/snippet1.png
index ce2ec55c2..ce2ec55c2 100644
--- a/application/palemoon/base/content/abouthome/snippet1.png
+++ b/application/palemoon/components/abouthome/snippet1.png
diff --git a/application/palemoon/base/content/abouthome/snippet1@2x.png b/application/palemoon/components/abouthome/snippet1@2x.png
index f57cd0a82..f57cd0a82 100644
--- a/application/palemoon/base/content/abouthome/snippet1@2x.png
+++ b/application/palemoon/components/abouthome/snippet1@2x.png
diff --git a/application/palemoon/base/content/abouthome/snippet2.png b/application/palemoon/components/abouthome/snippet2.png
index e0724fb6d..e0724fb6d 100644
--- a/application/palemoon/base/content/abouthome/snippet2.png
+++ b/application/palemoon/components/abouthome/snippet2.png
diff --git a/application/palemoon/base/content/abouthome/snippet2@2x.png b/application/palemoon/components/abouthome/snippet2@2x.png
index 40577f52f..40577f52f 100644
--- a/application/palemoon/base/content/abouthome/snippet2@2x.png
+++ b/application/palemoon/components/abouthome/snippet2@2x.png
diff --git a/application/palemoon/base/content/abouthome/sync.png b/application/palemoon/components/abouthome/sync.png
index 11e40cc93..11e40cc93 100644
--- a/application/palemoon/base/content/abouthome/sync.png
+++ b/application/palemoon/components/abouthome/sync.png
diff --git a/application/palemoon/base/content/abouthome/sync@2x.png b/application/palemoon/components/abouthome/sync@2x.png
index 6354f5bf9..6354f5bf9 100644
--- a/application/palemoon/base/content/abouthome/sync@2x.png
+++ b/application/palemoon/components/abouthome/sync@2x.png
diff --git a/application/palemoon/components/build/moz.build b/application/palemoon/components/build/moz.build
index d2b200968..ea1f77163 100644
--- a/application/palemoon/components/build/moz.build
+++ b/application/palemoon/components/build/moz.build
@@ -4,13 +4,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-EXPORTS += [
-    'nsBrowserCompsCID.h',
-]
+EXPORTS += ['nsBrowserCompsCID.h']
 
-SOURCES += [
-    'nsModule.cpp',
-]
+SOURCES += ['nsModule.cpp']
 
 XPCOMBinaryComponent('browsercomps')
 
diff --git a/application/palemoon/components/certerror/jar.mn b/application/palemoon/components/certerror/jar.mn
index 64aecae92..08e071027 100644
--- a/application/palemoon/components/certerror/jar.mn
+++ b/application/palemoon/components/certerror/jar.mn
@@ -3,5 +3,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-  content/browser/certerror/aboutCertError.xhtml               (content/aboutCertError.xhtml)
-  content/browser/certerror/aboutCertError.css                 (content/aboutCertError.css)
+  content/browser/certerror/aboutCertError.xhtml      (content/aboutCertError.xhtml)
+  content/browser/certerror/aboutCertError.css        (content/aboutCertError.css)
diff --git a/application/palemoon/components/certerror/moz.build b/application/palemoon/components/certerror/moz.build
index 35f6d454a..c97072bba 100644
--- a/application/palemoon/components/certerror/moz.build
+++ b/application/palemoon/components/certerror/moz.build
@@ -4,5 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/application/palemoon/components/dirprovider/moz.build b/application/palemoon/components/dirprovider/moz.build
index e51e63449..b01c4a3bc 100644
--- a/application/palemoon/components/dirprovider/moz.build
+++ b/application/palemoon/components/dirprovider/moz.build
@@ -4,16 +4,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-EXPORTS.mozilla.browser += [
-    'DirectoryProvider.h',
-]
+EXPORTS.mozilla.browser += ['DirectoryProvider.h']
 
-SOURCES += [
-    'DirectoryProvider.cpp',
-]
+SOURCES += ['DirectoryProvider.cpp']
 
 FINAL_LIBRARY = 'browsercomps'
 
-LOCAL_INCLUDES += [
-    '../build'
-]
+LOCAL_INCLUDES += ['../build']
diff --git a/application/palemoon/components/downloads/jar.mn b/application/palemoon/components/downloads/jar.mn
index 8f8c66dd7..8c0b51902 100644
--- a/application/palemoon/components/downloads/jar.mn
+++ b/application/palemoon/components/downloads/jar.mn
@@ -3,16 +3,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-*       content/browser/downloads/download.xml           (content/download.xml)
-        content/browser/downloads/download.css           (content/download.css)
-        content/browser/downloads/downloads.css          (content/downloads.css)
-*       content/browser/downloads/downloads.js           (content/downloads.js)
-*       content/browser/downloads/downloadsOverlay.xul   (content/downloadsOverlay.xul)
-        content/browser/downloads/indicator.js           (content/indicator.js)
-        content/browser/downloads/indicatorOverlay.xul   (content/indicatorOverlay.xul)
-*       content/browser/downloads/allDownloadsViewOverlay.xul (content/allDownloadsViewOverlay.xul)
-        content/browser/downloads/allDownloadsViewOverlay.js  (content/allDownloadsViewOverlay.js)
-        content/browser/downloads/allDownloadsViewOverlay.css (content/allDownloadsViewOverlay.css)
-*       content/browser/downloads/contentAreaDownloadsView.xul (content/contentAreaDownloadsView.xul)
-        content/browser/downloads/contentAreaDownloadsView.js  (content/contentAreaDownloadsView.js)
-        content/browser/downloads/contentAreaDownloadsView.css (content/contentAreaDownloadsView.css)
+* content/browser/downloads/download.xml                      (content/download.xml)
+  content/browser/downloads/download.css                      (content/download.css)
+  content/browser/downloads/downloads.css                     (content/downloads.css)
+* content/browser/downloads/downloads.js                      (content/downloads.js)
+* content/browser/downloads/downloadsOverlay.xul              (content/downloadsOverlay.xul)
+  content/browser/downloads/indicator.js                      (content/indicator.js)
+  content/browser/downloads/indicatorOverlay.xul              (content/indicatorOverlay.xul)
+* content/browser/downloads/allDownloadsViewOverlay.xul       (content/allDownloadsViewOverlay.xul)
+  content/browser/downloads/allDownloadsViewOverlay.js        (content/allDownloadsViewOverlay.js)
+  content/browser/downloads/allDownloadsViewOverlay.css       (content/allDownloadsViewOverlay.css)
+* content/browser/downloads/contentAreaDownloadsView.xul      (content/contentAreaDownloadsView.xul)
+  content/browser/downloads/contentAreaDownloadsView.js       (content/contentAreaDownloadsView.js)
+  content/browser/downloads/contentAreaDownloadsView.css      (content/contentAreaDownloadsView.css)
diff --git a/application/palemoon/components/feeds/jar.mn b/application/palemoon/components/feeds/jar.mn
index 2fae7efae..f8896f877 100644
--- a/application/palemoon/components/feeds/jar.mn
+++ b/application/palemoon/components/feeds/jar.mn
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-    content/browser/feeds/subscribe.xhtml               (content/subscribe.xhtml) 
-    content/browser/feeds/subscribe.js                  (content/subscribe.js)
-    content/browser/feeds/subscribe.xml                 (content/subscribe.xml)
-    content/browser/feeds/subscribe.css                 (content/subscribe.css)
+  content/browser/feeds/subscribe.xhtml       (content/subscribe.xhtml) 
+  content/browser/feeds/subscribe.js          (content/subscribe.js)
+  content/browser/feeds/subscribe.xml         (content/subscribe.xml)
+  content/browser/feeds/subscribe.css         (content/subscribe.css)
diff --git a/application/palemoon/components/feeds/moz.build b/application/palemoon/components/feeds/moz.build
index 7ae9141aa..736920a73 100644
--- a/application/palemoon/components/feeds/moz.build
+++ b/application/palemoon/components/feeds/moz.build
@@ -13,9 +13,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'browser-feeds'
 
-SOURCES += [
-    'nsFeedSniffer.cpp',
-]
+SOURCES += ['nsFeedSniffer.cpp']
 
 EXTRA_COMPONENTS += [
     'BrowserFeeds.manifest',
@@ -32,6 +30,4 @@ FINAL_LIBRARY = 'browsercomps'
 for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
     DEFINES[var] = CONFIG[var]
 
-LOCAL_INCLUDES += [
-    '../build',
-]
+LOCAL_INCLUDES += ['../build']
diff --git a/application/palemoon/components/fuel/moz.build b/application/palemoon/components/fuel/moz.build
index e78eda088..5c468f27d 100644
--- a/application/palemoon/components/fuel/moz.build
+++ b/application/palemoon/components/fuel/moz.build
@@ -4,17 +4,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-XPIDL_SOURCES += [
-    'fuelIApplication.idl',
-]
+XPIDL_SOURCES += ['fuelIApplication.idl']
 
 XPIDL_MODULE = 'fuel'
 
-EXTRA_COMPONENTS += [
-    'fuelApplication.manifest',
-]
+EXTRA_COMPONENTS += ['fuelApplication.manifest']
 
-EXTRA_PP_COMPONENTS += [
-    'fuelApplication.js',
-]
+EXTRA_PP_COMPONENTS += ['fuelApplication.js']
 
diff --git a/application/palemoon/components/moz.build b/application/palemoon/components/moz.build
index b9df76330..eb2771c48 100644
--- a/application/palemoon/components/moz.build
+++ b/application/palemoon/components/moz.build
@@ -5,11 +5,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
+    'abouthome',
     'certerror',
     'dirprovider',
     'downloads',
     'feeds',
     'fuel',
+    'newtab',
+    'pageinfo',
     'places',
     'permissions',
     'preferences',
@@ -22,6 +25,9 @@ DIRS += [
 if CONFIG['MOZ_BROWSER_STATUSBAR']:
     DIRS += ['statusbar']
 
+if CONFIG['MOZ_SERVICES_SYNC']:
+    DIRS += ['sync']
+
 DIRS += ['build']
 
 XPIDL_SOURCES += [
diff --git a/application/palemoon/base/content/newtab/cells.js b/application/palemoon/components/newtab/cells.js
index 47d4ef52d..47d4ef52d 100644
--- a/application/palemoon/base/content/newtab/cells.js
+++ b/application/palemoon/components/newtab/cells.js
diff --git a/application/palemoon/base/content/newtab/drag.js b/application/palemoon/components/newtab/drag.js
index e3928ebd0..e3928ebd0 100644
--- a/application/palemoon/base/content/newtab/drag.js
+++ b/application/palemoon/components/newtab/drag.js
diff --git a/application/palemoon/base/content/newtab/dragDataHelper.js b/application/palemoon/components/newtab/dragDataHelper.js
index 675ff2671..675ff2671 100644
--- a/application/palemoon/base/content/newtab/dragDataHelper.js
+++ b/application/palemoon/components/newtab/dragDataHelper.js
diff --git a/application/palemoon/base/content/newtab/drop.js b/application/palemoon/components/newtab/drop.js
index 748652455..748652455 100644
--- a/application/palemoon/base/content/newtab/drop.js
+++ b/application/palemoon/components/newtab/drop.js
diff --git a/application/palemoon/base/content/newtab/dropPreview.js b/application/palemoon/components/newtab/dropPreview.js
index fd7587a35..fd7587a35 100644
--- a/application/palemoon/base/content/newtab/dropPreview.js
+++ b/application/palemoon/components/newtab/dropPreview.js
diff --git a/application/palemoon/base/content/newtab/dropTargetShim.js b/application/palemoon/components/newtab/dropTargetShim.js
index 57a97fa00..57a97fa00 100644
--- a/application/palemoon/base/content/newtab/dropTargetShim.js
+++ b/application/palemoon/components/newtab/dropTargetShim.js
diff --git a/application/palemoon/base/content/newtab/grid.js b/application/palemoon/components/newtab/grid.js
index db3d319c3..db3d319c3 100644
--- a/application/palemoon/base/content/newtab/grid.js
+++ b/application/palemoon/components/newtab/grid.js
diff --git a/application/palemoon/components/newtab/jar.mn b/application/palemoon/components/newtab/jar.mn
new file mode 100644
index 000000000..2d6291422
--- /dev/null
+++ b/application/palemoon/components/newtab/jar.mn
@@ -0,0 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+browser.jar:
+  content/browser/newtab/newTab.xhtml
+* content/browser/newtab/newTab.js
+  content/browser/newtab/newTab.css
\ No newline at end of file
diff --git a/application/palemoon/components/newtab/moz.build b/application/palemoon/components/newtab/moz.build
new file mode 100644
index 000000000..2d64d506c
--- /dev/null
+++ b/application/palemoon/components/newtab/moz.build
@@ -0,0 +1,8 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn']
+
diff --git a/application/palemoon/base/content/newtab/newTab.css b/application/palemoon/components/newtab/newTab.css
index 3c7cfa102..3c7cfa102 100644
--- a/application/palemoon/base/content/newtab/newTab.css
+++ b/application/palemoon/components/newtab/newTab.css
diff --git a/application/palemoon/base/content/newtab/newTab.js b/application/palemoon/components/newtab/newTab.js
index 0022f21bb..0022f21bb 100644
--- a/application/palemoon/base/content/newtab/newTab.js
+++ b/application/palemoon/components/newtab/newTab.js
diff --git a/application/palemoon/base/content/newtab/newTab.xhtml b/application/palemoon/components/newtab/newTab.xhtml
index de000e723..de000e723 100644
--- a/application/palemoon/base/content/newtab/newTab.xhtml
+++ b/application/palemoon/components/newtab/newTab.xhtml
diff --git a/application/palemoon/base/content/newtab/page.js b/application/palemoon/components/newtab/page.js
index 7117d4527..7117d4527 100644
--- a/application/palemoon/base/content/newtab/page.js
+++ b/application/palemoon/components/newtab/page.js
diff --git a/application/palemoon/base/content/newtab/search.js b/application/palemoon/components/newtab/search.js
index 8bc959eee..8bc959eee 100644
--- a/application/palemoon/base/content/newtab/search.js
+++ b/application/palemoon/components/newtab/search.js
diff --git a/application/palemoon/base/content/newtab/sites.js b/application/palemoon/components/newtab/sites.js
index a368146bb..a368146bb 100644
--- a/application/palemoon/base/content/newtab/sites.js
+++ b/application/palemoon/components/newtab/sites.js
diff --git a/application/palemoon/base/content/newtab/transformations.js b/application/palemoon/components/newtab/transformations.js
index f7db0ad84..f7db0ad84 100644
--- a/application/palemoon/base/content/newtab/transformations.js
+++ b/application/palemoon/components/newtab/transformations.js
diff --git a/application/palemoon/base/content/newtab/undo.js b/application/palemoon/components/newtab/undo.js
index b856914d2..b856914d2 100644
--- a/application/palemoon/base/content/newtab/undo.js
+++ b/application/palemoon/components/newtab/undo.js
diff --git a/application/palemoon/base/content/newtab/updater.js b/application/palemoon/components/newtab/updater.js
index 2bab74d70..2bab74d70 100644
--- a/application/palemoon/base/content/newtab/updater.js
+++ b/application/palemoon/components/newtab/updater.js
diff --git a/application/palemoon/base/content/pageinfo/feeds.js b/application/palemoon/components/pageinfo/feeds.js
index 468d8c19d..468d8c19d 100644
--- a/application/palemoon/base/content/pageinfo/feeds.js
+++ b/application/palemoon/components/pageinfo/feeds.js
diff --git a/application/palemoon/base/content/pageinfo/feeds.xml b/application/palemoon/components/pageinfo/feeds.xml
index 782c05a73..782c05a73 100644
--- a/application/palemoon/base/content/pageinfo/feeds.xml
+++ b/application/palemoon/components/pageinfo/feeds.xml
diff --git a/application/palemoon/components/pageinfo/jar.mn b/application/palemoon/components/pageinfo/jar.mn
new file mode 100644
index 000000000..229f99168
--- /dev/null
+++ b/application/palemoon/components/pageinfo/jar.mn
@@ -0,0 +1,13 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+browser.jar:
+* content/browser/pageinfo/pageInfo.xul
+  content/browser/pageinfo/pageInfo.js
+  content/browser/pageinfo/pageInfo.css
+  content/browser/pageinfo/pageInfo.xml
+  content/browser/pageinfo/feeds.js
+  content/browser/pageinfo/feeds.xml
+  content/browser/pageinfo/permissions.js
+  content/browser/pageinfo/security.js
\ No newline at end of file
diff --git a/application/palemoon/components/pageinfo/moz.build b/application/palemoon/components/pageinfo/moz.build
new file mode 100644
index 000000000..2d64d506c
--- /dev/null
+++ b/application/palemoon/components/pageinfo/moz.build
@@ -0,0 +1,8 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn']
+
diff --git a/application/palemoon/base/content/pageinfo/pageInfo.css b/application/palemoon/components/pageinfo/pageInfo.css
index 622b56bb5..622b56bb5 100644
--- a/application/palemoon/base/content/pageinfo/pageInfo.css
+++ b/application/palemoon/components/pageinfo/pageInfo.css
diff --git a/application/palemoon/base/content/pageinfo/pageInfo.js b/application/palemoon/components/pageinfo/pageInfo.js
index 600174ad9..600174ad9 100644
--- a/application/palemoon/base/content/pageinfo/pageInfo.js
+++ b/application/palemoon/components/pageinfo/pageInfo.js
diff --git a/application/palemoon/base/content/pageinfo/pageInfo.xml b/application/palemoon/components/pageinfo/pageInfo.xml
index 20d330046..20d330046 100644
--- a/application/palemoon/base/content/pageinfo/pageInfo.xml
+++ b/application/palemoon/components/pageinfo/pageInfo.xml
diff --git a/application/palemoon/base/content/pageinfo/pageInfo.xul b/application/palemoon/components/pageinfo/pageInfo.xul
index e3a61d31e..c7c486ab9 100644
--- a/application/palemoon/base/content/pageinfo/pageInfo.xul
+++ b/application/palemoon/components/pageinfo/pageInfo.xul
@@ -501,7 +501,7 @@
   </deck>
 
 #ifdef XP_MACOSX
-#include ../browserMountPoints.inc
+#include ../../base/content/browserMountPoints.inc
 #endif
 
 </window>
diff --git a/application/palemoon/base/content/pageinfo/permissions.js b/application/palemoon/components/pageinfo/permissions.js
index 4f8382f66..4f8382f66 100644
--- a/application/palemoon/base/content/pageinfo/permissions.js
+++ b/application/palemoon/components/pageinfo/permissions.js
diff --git a/application/palemoon/base/content/pageinfo/security.js b/application/palemoon/components/pageinfo/security.js
index e791ab92a..e791ab92a 100644
--- a/application/palemoon/base/content/pageinfo/security.js
+++ b/application/palemoon/components/pageinfo/security.js
diff --git a/application/palemoon/components/permissions/jar.mn b/application/palemoon/components/permissions/jar.mn
index 53fb2b41e..c78893837 100644
--- a/application/palemoon/components/permissions/jar.mn
+++ b/application/palemoon/components/permissions/jar.mn
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-    content/browser/permissions/aboutPermissions.xul
-    content/browser/permissions/aboutPermissions.js
-    content/browser/permissions/aboutPermissions.css
-    content/browser/permissions/aboutPermissions.xml
+  content/browser/permissions/aboutPermissions.xul
+  content/browser/permissions/aboutPermissions.js
+  content/browser/permissions/aboutPermissions.css
+  content/browser/permissions/aboutPermissions.xml
diff --git a/application/palemoon/components/permissions/moz.build b/application/palemoon/components/permissions/moz.build
index a4c26de89..3bbe67297 100644
--- a/application/palemoon/components/permissions/moz.build
+++ b/application/palemoon/components/permissions/moz.build
@@ -4,5 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 JAR_MANIFESTS += ['jar.mn']
diff --git a/application/palemoon/components/places/jar.mn b/application/palemoon/components/places/jar.mn
index 44ae61fd3..41222e156 100644
--- a/application/palemoon/components/places/jar.mn
+++ b/application/palemoon/components/places/jar.mn
@@ -6,29 +6,29 @@ browser.jar:
 % overlay chrome://browser/content/places/places.xul chrome://browser/content/places/downloadsViewOverlay.xul
 # Provide another URI for the bookmarkProperties dialog so we can persist the
 # attributes separately
-    content/browser/places/bookmarkProperties2.xul       (content/bookmarkProperties.xul)
-*   content/browser/places/places.xul                    (content/places.xul) 
-*   content/browser/places/places.js                     (content/places.js)
-    content/browser/places/places.css                    (content/places.css)
-    content/browser/places/organizer.css                 (content/organizer.css)
-    content/browser/places/bookmarkProperties.xul        (content/bookmarkProperties.xul)
-    content/browser/places/bookmarkProperties.js         (content/bookmarkProperties.js)
-    content/browser/places/placesOverlay.xul             (content/placesOverlay.xul)
-*   content/browser/places/menu.xml                      (content/menu.xml)
-    content/browser/places/tree.xml                      (content/tree.xml)
-    content/browser/places/controller.js                 (content/controller.js)
-    content/browser/places/treeView.js                   (content/treeView.js)
-*   content/browser/places/browserPlacesViews.js         (content/browserPlacesViews.js)
+  content/browser/places/bookmarkProperties2.xul       (content/bookmarkProperties.xul)
+* content/browser/places/places.xul                    (content/places.xul) 
+* content/browser/places/places.js                     (content/places.js)
+  content/browser/places/places.css                    (content/places.css)
+  content/browser/places/organizer.css                 (content/organizer.css)
+  content/browser/places/bookmarkProperties.xul        (content/bookmarkProperties.xul)
+  content/browser/places/bookmarkProperties.js         (content/bookmarkProperties.js)
+  content/browser/places/placesOverlay.xul             (content/placesOverlay.xul)
+* content/browser/places/menu.xml                      (content/menu.xml)
+  content/browser/places/tree.xml                      (content/tree.xml)
+  content/browser/places/controller.js                 (content/controller.js)
+  content/browser/places/treeView.js                   (content/treeView.js)
+* content/browser/places/browserPlacesViews.js         (content/browserPlacesViews.js)
 # keep the Places version of the history sidebar at history/history-panel.xul 
 # to prevent having to worry about between versions of the browser
-*   content/browser/history/history-panel.xul            (content/history-panel.xul) 
-    content/browser/places/history-panel.js              (content/history-panel.js)
+* content/browser/history/history-panel.xul            (content/history-panel.xul) 
+  content/browser/places/history-panel.js              (content/history-panel.js)
 # ditto for the bookmarks sidebar
-    content/browser/bookmarks/bookmarksPanel.xul         (content/bookmarksPanel.xul)
-    content/browser/bookmarks/bookmarksPanel.js          (content/bookmarksPanel.js)
-*   content/browser/bookmarks/sidebarUtils.js            (content/sidebarUtils.js)
-    content/browser/places/moveBookmarks.xul             (content/moveBookmarks.xul)
-    content/browser/places/moveBookmarks.js              (content/moveBookmarks.js)
-    content/browser/places/editBookmarkOverlay.xul       (content/editBookmarkOverlay.xul)
-    content/browser/places/editBookmarkOverlay.js        (content/editBookmarkOverlay.js)
-*   content/browser/places/downloadsViewOverlay.xul      (content/downloadsViewOverlay.xul)
+  content/browser/bookmarks/bookmarksPanel.xul         (content/bookmarksPanel.xul)
+  content/browser/bookmarks/bookmarksPanel.js          (content/bookmarksPanel.js)
+* content/browser/bookmarks/sidebarUtils.js            (content/sidebarUtils.js)
+  content/browser/places/moveBookmarks.xul             (content/moveBookmarks.xul)
+  content/browser/places/moveBookmarks.js              (content/moveBookmarks.js)
+  content/browser/places/editBookmarkOverlay.xul       (content/editBookmarkOverlay.xul)
+  content/browser/places/editBookmarkOverlay.js        (content/editBookmarkOverlay.js)
+* content/browser/places/downloadsViewOverlay.xul      (content/downloadsViewOverlay.xul)
diff --git a/application/palemoon/components/places/moz.build b/application/palemoon/components/places/moz.build
index 2e35e1951..f8b0d125d 100644
--- a/application/palemoon/components/places/moz.build
+++ b/application/palemoon/components/places/moz.build
@@ -7,4 +7,3 @@
 JAR_MANIFESTS += ['jar.mn']
 
 EXTRA_JS_MODULES += [ 'PlacesUIUtils.jsm' ]
-
diff --git a/application/palemoon/components/preferences/jar.mn b/application/palemoon/components/preferences/jar.mn
index 47909ddc9..6e143dea3 100644
--- a/application/palemoon/components/preferences/jar.mn
+++ b/application/palemoon/components/preferences/jar.mn
@@ -3,42 +3,42 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-*   content/browser/preferences/advanced.xul
-*   content/browser/preferences/advanced.js
-    content/browser/preferences/applications.xul
-*   content/browser/preferences/applications.js
-    content/browser/preferences/applicationManager.xul
-*   content/browser/preferences/applicationManager.js
-*   content/browser/preferences/colors.xul
-*   content/browser/preferences/cookies.xul
-*   content/browser/preferences/cookies.js
-    content/browser/preferences/content.xul
-    content/browser/preferences/content.js
-*   content/browser/preferences/connection.xul
-    content/browser/preferences/connection.js
-*   content/browser/preferences/fonts.xul
-    content/browser/preferences/fonts.js
-    content/browser/preferences/handlers.xml
-    content/browser/preferences/handlers.css
-*   content/browser/preferences/languages.xul
-    content/browser/preferences/languages.js
-*   content/browser/preferences/main.xul
-    content/browser/preferences/main.js
-    content/browser/preferences/newtaburl.js
-    content/browser/preferences/permissions.xul
-*   content/browser/preferences/permissions.js
-*   content/browser/preferences/preferences.xul
-    content/browser/preferences/privacy.xul
-    content/browser/preferences/privacy.js
-    content/browser/preferences/sanitize.xul
-    content/browser/preferences/sanitize.js
-    content/browser/preferences/security.xul
-    content/browser/preferences/security.js
-    content/browser/preferences/selectBookmark.xul
-    content/browser/preferences/selectBookmark.js
+* content/browser/preferences/advanced.xul
+* content/browser/preferences/advanced.js
+  content/browser/preferences/applications.xul
+* content/browser/preferences/applications.js
+  content/browser/preferences/applicationManager.xul
+* content/browser/preferences/applicationManager.js
+* content/browser/preferences/colors.xul
+* content/browser/preferences/cookies.xul
+* content/browser/preferences/cookies.js
+  content/browser/preferences/content.xul
+  content/browser/preferences/content.js
+* content/browser/preferences/connection.xul
+  content/browser/preferences/connection.js
+* content/browser/preferences/fonts.xul
+  content/browser/preferences/fonts.js
+  content/browser/preferences/handlers.xml
+  content/browser/preferences/handlers.css
+* content/browser/preferences/languages.xul
+  content/browser/preferences/languages.js
+* content/browser/preferences/main.xul
+  content/browser/preferences/main.js
+  content/browser/preferences/newtaburl.js
+  content/browser/preferences/permissions.xul
+* content/browser/preferences/permissions.js
+* content/browser/preferences/preferences.xul
+  content/browser/preferences/privacy.xul
+  content/browser/preferences/privacy.js
+  content/browser/preferences/sanitize.xul
+  content/browser/preferences/sanitize.js
+  content/browser/preferences/security.xul
+  content/browser/preferences/security.js
+  content/browser/preferences/selectBookmark.xul
+  content/browser/preferences/selectBookmark.js
 #ifdef MOZ_SERVICES_SYNC
-    content/browser/preferences/sync.xul
-    content/browser/preferences/sync.js
+  content/browser/preferences/sync.xul
+  content/browser/preferences/sync.js
 #endif
-*   content/browser/preferences/tabs.xul
-*   content/browser/preferences/tabs.js
+* content/browser/preferences/tabs.xul
+* content/browser/preferences/tabs.js
diff --git a/application/palemoon/components/privatebrowsing/jar.mn b/application/palemoon/components/privatebrowsing/jar.mn
index a01b7f0d3..75e985c13 100644
--- a/application/palemoon/components/privatebrowsing/jar.mn
+++ b/application/palemoon/components/privatebrowsing/jar.mn
@@ -3,4 +3,4 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-*   content/browser/aboutPrivateBrowsing.xhtml            (content/aboutPrivateBrowsing.xhtml) 
+* content/browser/aboutPrivateBrowsing.xhtml      (content/aboutPrivateBrowsing.xhtml) 
diff --git a/application/palemoon/components/search/jar.mn b/application/palemoon/components/search/jar.mn
index 88a33a98c..e6c42f97d 100644
--- a/application/palemoon/components/search/jar.mn
+++ b/application/palemoon/components/search/jar.mn
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-*       content/browser/search/search.xml                           (content/search.xml)
-        content/browser/search/searchbarBindings.css                (content/searchbarBindings.css)
-        content/browser/search/engineManager.xul                    (content/engineManager.xul)
-        content/browser/search/engineManager.js                     (content/engineManager.js)
+* content/browser/search/search.xml                 (content/search.xml)
+  content/browser/search/searchbarBindings.css      (content/searchbarBindings.css)
+  content/browser/search/engineManager.xul          (content/engineManager.xul)
+  content/browser/search/engineManager.js           (content/engineManager.js)
diff --git a/application/palemoon/components/search/moz.build b/application/palemoon/components/search/moz.build
index 35f6d454a..c97072bba 100644
--- a/application/palemoon/components/search/moz.build
+++ b/application/palemoon/components/search/moz.build
@@ -4,5 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/application/palemoon/components/sessionstore/jar.mn b/application/palemoon/components/sessionstore/jar.mn
index 529692e7e..825b00fbb 100644
--- a/application/palemoon/components/sessionstore/jar.mn
+++ b/application/palemoon/components/sessionstore/jar.mn
@@ -3,6 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-*   content/browser/aboutSessionRestore.xhtml             (content/aboutSessionRestore.xhtml)
-*   content/browser/aboutSessionRestore.js                (content/aboutSessionRestore.js)
-    content/browser/content-sessionStore.js               (content/content-sessionStore.js)
+* content/browser/aboutSessionRestore.xhtml             (content/aboutSessionRestore.xhtml)
+* content/browser/aboutSessionRestore.js                (content/aboutSessionRestore.js)
+  content/browser/content-sessionStore.js               (content/content-sessionStore.js)
diff --git a/application/palemoon/components/sessionstore/moz.build b/application/palemoon/components/sessionstore/moz.build
index 8b38aeba5..84278dafa 100644
--- a/application/palemoon/components/sessionstore/moz.build
+++ b/application/palemoon/components/sessionstore/moz.build
@@ -26,6 +26,4 @@ EXTRA_JS_MODULES.sessionstore = [
     'XPathGenerator.jsm',
 ]
 
-EXTRA_PP_JS_MODULES.sessionstore += [
-    'SessionStore.jsm',
-]
\ No newline at end of file
+EXTRA_PP_JS_MODULES.sessionstore += ['SessionStore.jsm']
\ No newline at end of file
diff --git a/application/palemoon/components/shell/jar.mn b/application/palemoon/components/shell/jar.mn
index 1f33b5d56..0864e1b30 100644
--- a/application/palemoon/components/shell/jar.mn
+++ b/application/palemoon/components/shell/jar.mn
@@ -3,5 +3,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-*       content/browser/setDesktopBackground.xul              (content/setDesktopBackground.xul)
-        content/browser/setDesktopBackground.js               (content/setDesktopBackground.js)
+* content/browser/setDesktopBackground.xul      (content/setDesktopBackground.xul)
+  content/browser/setDesktopBackground.js       (content/setDesktopBackground.js)
diff --git a/application/palemoon/components/shell/moz.build b/application/palemoon/components/shell/moz.build
index 94ec88571..16bffd7d9 100644
--- a/application/palemoon/components/shell/moz.build
+++ b/application/palemoon/components/shell/moz.build
@@ -6,37 +6,23 @@
 
 JAR_MANIFESTS += ['jar.mn']
 
-XPIDL_SOURCES += [
-    'nsIShellService.idl',
-]
+XPIDL_SOURCES += ['nsIShellService.idl']
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    XPIDL_SOURCES += [
-        'nsIWindowsShellService.idl',
-    ]
+    XPIDL_SOURCES += ['nsIWindowsShellService.idl']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    XPIDL_SOURCES += [
-        'nsIMacShellService.idl',
-    ]
+    XPIDL_SOURCES += ['nsIMacShellService.idl']
 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
-    XPIDL_SOURCES += [
-        'nsIGNOMEShellService.idl',
-    ]
+    XPIDL_SOURCES += ['nsIGNOMEShellService.idl']
 
 XPIDL_MODULE = 'shellservice'
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    SOURCES += [
-        'nsWindowsShellService.cpp',
-    ]
+    SOURCES += ['nsWindowsShellService.cpp']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    SOURCES += [
-        'nsMacShellService.cpp',
-    ]
+    SOURCES += ['nsMacShellService.cpp']
 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
-    SOURCES += [
-        'nsGNOMEShellService.cpp',
-    ]
+    SOURCES += ['nsGNOMEShellService.cpp']
 
 if SOURCES:
     FINAL_LIBRARY = 'browsercomps'
@@ -46,9 +32,7 @@ EXTRA_COMPONENTS += [
     'nsSetDefaultBrowser.manifest',
 ]
 
-EXTRA_JS_MODULES += [
-    'ShellService.jsm',
-]
+EXTRA_JS_MODULES += ['ShellService.jsm']
 
 for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION'):
     DEFINES[var] = '"%s"' % CONFIG[var]
diff --git a/application/palemoon/components/statusbar/jar.mn b/application/palemoon/components/statusbar/jar.mn
index db7f278c7..b5a8d09b2 100644
--- a/application/palemoon/components/statusbar/jar.mn
+++ b/application/palemoon/components/statusbar/jar.mn
@@ -3,13 +3,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-% overlay chrome://browser/content/browser.xul                  chrome://browser/content/statusbar/overlay.xul
-% style chrome://global/content/customizeToolbar.xul            chrome://browser/skin/statusbar/overlay.css
-        content/browser/statusbar/overlay.js                    (content/overlay.js)
-        content/browser/statusbar/prefs.js                      (content/prefs.js)
-        content/browser/statusbar/prefs.xml                     (content/prefs.xml)
-        content/browser/statusbar/tabbrowser.xml                (content/tabbrowser.xml)
-        content/browser/statusbar/overlay.xul                   (content/overlay.xul)
-        content/browser/statusbar/prefs.xul                     (content/prefs.xul)
-        content/browser/statusbar/overlay.css                   (content/overlay.css)
-        content/browser/statusbar/prefs.css                     (content/prefs.css)
\ No newline at end of file
+% overlay chrome://browser/content/browser.xul chrome://browser/content/statusbar/overlay.xul
+% style chrome://global/content/customizeToolbar.xul chrome://browser/skin/statusbar/overlay.css
+  content/browser/statusbar/overlay.js          (content/overlay.js)
+  content/browser/statusbar/prefs.js            (content/prefs.js)
+  content/browser/statusbar/prefs.xml           (content/prefs.xml)
+  content/browser/statusbar/tabbrowser.xml      (content/tabbrowser.xml)
+  content/browser/statusbar/overlay.xul         (content/overlay.xul)
+  content/browser/statusbar/prefs.xul           (content/prefs.xul)
+  content/browser/statusbar/overlay.css         (content/overlay.css)
+  content/browser/statusbar/prefs.css           (content/prefs.css)
\ No newline at end of file
diff --git a/application/palemoon/base/content/sync/aboutSyncTabs-bindings.xml b/application/palemoon/components/sync/aboutSyncTabs-bindings.xml
index e6108209a..e6108209a 100644
--- a/application/palemoon/base/content/sync/aboutSyncTabs-bindings.xml
+++ b/application/palemoon/components/sync/aboutSyncTabs-bindings.xml
diff --git a/application/palemoon/base/content/sync/aboutSyncTabs.css b/application/palemoon/components/sync/aboutSyncTabs.css
index 5a353175b..5a353175b 100644
--- a/application/palemoon/base/content/sync/aboutSyncTabs.css
+++ b/application/palemoon/components/sync/aboutSyncTabs.css
diff --git a/application/palemoon/base/content/sync/aboutSyncTabs.js b/application/palemoon/components/sync/aboutSyncTabs.js
index 410494b5b..410494b5b 100644
--- a/application/palemoon/base/content/sync/aboutSyncTabs.js
+++ b/application/palemoon/components/sync/aboutSyncTabs.js
diff --git a/application/palemoon/base/content/sync/aboutSyncTabs.xul b/application/palemoon/components/sync/aboutSyncTabs.xul
index a4aa0032f..a4aa0032f 100644
--- a/application/palemoon/base/content/sync/aboutSyncTabs.xul
+++ b/application/palemoon/components/sync/aboutSyncTabs.xul
diff --git a/application/palemoon/base/content/sync/addDevice.js b/application/palemoon/components/sync/addDevice.js
index 0390d4397..0390d4397 100644
--- a/application/palemoon/base/content/sync/addDevice.js
+++ b/application/palemoon/components/sync/addDevice.js
diff --git a/application/palemoon/base/content/sync/addDevice.xul b/application/palemoon/components/sync/addDevice.xul
index f2371aad0..f2371aad0 100644
--- a/application/palemoon/base/content/sync/addDevice.xul
+++ b/application/palemoon/components/sync/addDevice.xul
diff --git a/application/palemoon/base/content/sync/genericChange.js b/application/palemoon/components/sync/genericChange.js
index df6639178..df6639178 100644
--- a/application/palemoon/base/content/sync/genericChange.js
+++ b/application/palemoon/components/sync/genericChange.js
diff --git a/application/palemoon/base/content/sync/genericChange.xul b/application/palemoon/components/sync/genericChange.xul
index 3c0b2cd6c..3c0b2cd6c 100644
--- a/application/palemoon/base/content/sync/genericChange.xul
+++ b/application/palemoon/components/sync/genericChange.xul
diff --git a/application/palemoon/components/sync/jar.mn b/application/palemoon/components/sync/jar.mn
new file mode 100644
index 000000000..3782038cd
--- /dev/null
+++ b/application/palemoon/components/sync/jar.mn
@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+browser.jar:
+  content/browser/sync/aboutSyncTabs.xul
+  content/browser/sync/aboutSyncTabs.js
+  content/browser/sync/aboutSyncTabs.css
+  content/browser/sync/aboutSyncTabs-bindings.xml
+  content/browser/sync/setup.xul
+  content/browser/sync/addDevice.js
+  content/browser/sync/addDevice.xul
+  content/browser/sync/setup.js
+  content/browser/sync/genericChange.xul
+  content/browser/sync/genericChange.js
+  content/browser/sync/key.xhtml
+  content/browser/sync/notification.xml
+  content/browser/sync/quota.xul
+  content/browser/sync/quota.js
+  content/browser/sync/utils.js
+  content/browser/sync/progress.js
+  content/browser/sync/progress.xhtml
\ No newline at end of file
diff --git a/application/palemoon/base/content/sync/key.xhtml b/application/palemoon/components/sync/key.xhtml
index 92abf0ee6..92abf0ee6 100644
--- a/application/palemoon/base/content/sync/key.xhtml
+++ b/application/palemoon/components/sync/key.xhtml
diff --git a/application/palemoon/components/sync/moz.build b/application/palemoon/components/sync/moz.build
new file mode 100644
index 000000000..2d64d506c
--- /dev/null
+++ b/application/palemoon/components/sync/moz.build
@@ -0,0 +1,8 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn']
+
diff --git a/application/palemoon/base/content/sync/notification.xml b/application/palemoon/components/sync/notification.xml
index 8ac881e08..8ac881e08 100644
--- a/application/palemoon/base/content/sync/notification.xml
+++ b/application/palemoon/components/sync/notification.xml
diff --git a/application/palemoon/base/content/sync/progress.js b/application/palemoon/components/sync/progress.js
index 101160fa8..101160fa8 100644
--- a/application/palemoon/base/content/sync/progress.js
+++ b/application/palemoon/components/sync/progress.js
diff --git a/application/palemoon/base/content/sync/progress.xhtml b/application/palemoon/components/sync/progress.xhtml
index d403cb20d..d403cb20d 100644
--- a/application/palemoon/base/content/sync/progress.xhtml
+++ b/application/palemoon/components/sync/progress.xhtml
diff --git a/application/palemoon/base/content/sync/quota.js b/application/palemoon/components/sync/quota.js
index 1285a8d54..1285a8d54 100644
--- a/application/palemoon/base/content/sync/quota.js
+++ b/application/palemoon/components/sync/quota.js
diff --git a/application/palemoon/base/content/sync/quota.xul b/application/palemoon/components/sync/quota.xul
index 99e6ed78b..99e6ed78b 100644
--- a/application/palemoon/base/content/sync/quota.xul
+++ b/application/palemoon/components/sync/quota.xul
diff --git a/application/palemoon/base/content/sync/setup.js b/application/palemoon/components/sync/setup.js
index e8d67a5f6..e8d67a5f6 100644
--- a/application/palemoon/base/content/sync/setup.js
+++ b/application/palemoon/components/sync/setup.js
diff --git a/application/palemoon/base/content/sync/setup.xul b/application/palemoon/components/sync/setup.xul
index cf2cc77e4..cf2cc77e4 100644
--- a/application/palemoon/base/content/sync/setup.xul
+++ b/application/palemoon/components/sync/setup.xul
diff --git a/application/palemoon/base/content/sync/utils.js b/application/palemoon/components/sync/utils.js
index d41ecf18a..d41ecf18a 100644
--- a/application/palemoon/base/content/sync/utils.js
+++ b/application/palemoon/components/sync/utils.js
diff --git a/application/palemoon/fonts/moz.build b/application/palemoon/fonts/moz.build
index 02c027c46..8840a87f8 100644
--- a/application/palemoon/fonts/moz.build
+++ b/application/palemoon/fonts/moz.build
@@ -6,6 +6,4 @@
 
 if CONFIG['OS_ARCH'] in ('WINNT', 'Linux'):
     DIST_SUBDIR = ''
-    FINAL_TARGET_FILES.fonts += [
-        'TwemojiMozilla.ttf'
-    ]
+    FINAL_TARGET_FILES.fonts += ['TwemojiMozilla.ttf']
diff --git a/application/palemoon/locales/jar.mn b/application/palemoon/locales/jar.mn
index e3477c320..ff79db1ec 100644
--- a/application/palemoon/locales/jar.mn
+++ b/application/palemoon/locales/jar.mn
@@ -6,93 +6,93 @@
 
 @AB_CD@.jar:
 % locale browser @AB_CD@ %locale/browser/
-    locale/browser/aboutCertError.dtd              (%chrome/browser/aboutCertError.dtd)
-    locale/browser/aboutDialog.dtd                 (%chrome/browser/aboutDialog.dtd)
-    locale/browser/aboutPrivateBrowsing.dtd        (%chrome/browser/aboutPrivateBrowsing.dtd)
-    locale/browser/aboutRobots.dtd                 (%chrome/browser/aboutRobots.dtd)
-    locale/browser/aboutHome.dtd                   (%chrome/browser/aboutHome.dtd)
-    locale/browser/aboutSessionRestore.dtd         (%chrome/browser/aboutSessionRestore.dtd)
+  locale/browser/aboutCertError.dtd                             (%chrome/browser/aboutCertError.dtd)
+  locale/browser/aboutDialog.dtd                                (%chrome/browser/aboutDialog.dtd)
+  locale/browser/aboutPrivateBrowsing.dtd                       (%chrome/browser/aboutPrivateBrowsing.dtd)
+  locale/browser/aboutRobots.dtd                                (%chrome/browser/aboutRobots.dtd)
+  locale/browser/aboutHome.dtd                                  (%chrome/browser/aboutHome.dtd)
+  locale/browser/aboutSessionRestore.dtd                        (%chrome/browser/aboutSessionRestore.dtd)
 #ifdef MOZ_SERVICES_SYNC
-    locale/browser/syncProgress.dtd                (%chrome/browser/syncProgress.dtd)
-    locale/browser/aboutSyncTabs.dtd               (%chrome/browser/aboutSyncTabs.dtd)
+  locale/browser/syncProgress.dtd                               (%chrome/browser/syncProgress.dtd)
+  locale/browser/aboutSyncTabs.dtd                              (%chrome/browser/aboutSyncTabs.dtd)
 #endif
-*   locale/browser/browser.dtd                     (%chrome/browser/browser.dtd)
-    locale/browser/baseMenuOverlay.dtd             (%chrome/browser/baseMenuOverlay.dtd)
-    locale/browser/charsetOverlay.dtd              (%chrome/browser/charsetOverlay.dtd)
-    locale/browser/browser.properties              (%chrome/browser/browser.properties)
-    locale/browser/charsetMenu.properties          (%chrome/browser/charsetMenu.properties)
-    locale/browser/charsetMenu.dtd                 (%chrome/browser/charsetMenu.dtd)
-    locale/browser/newTab.dtd                      (%chrome/browser/newTab.dtd)
-    locale/browser/newTab.properties               (%chrome/browser/newTab.properties)
-    locale/browser/openLocation.dtd                (%chrome/browser/openLocation.dtd)
-    locale/browser/openLocation.properties         (%chrome/browser/openLocation.properties)
-    locale/browser/pageInfo.dtd                    (%chrome/browser/pageInfo.dtd)
-    locale/browser/pageInfo.properties             (%chrome/browser/pageInfo.properties)
-    locale/browser/palemoon.dtd                    (%chrome/browser/palemoon.dtd)
-    locale/browser/quitDialog.properties           (%chrome/browser/quitDialog.properties)
-    locale/browser/safeMode.dtd                    (%chrome/browser/safeMode.dtd)
-    locale/browser/sanitize.dtd                    (%chrome/browser/sanitize.dtd)
-    locale/browser/search.properties               (%chrome/browser/search.properties)
-    locale/browser/searchbar.dtd                   (%chrome/browser/searchbar.dtd)
-    locale/browser/engineManager.dtd               (%chrome/browser/engineManager.dtd)
-    locale/browser/engineManager.properties        (%chrome/browser/engineManager.properties)
-    locale/browser/setDesktopBackground.dtd        (%chrome/browser/setDesktopBackground.dtd)
-    locale/browser/shellservice.properties         (%chrome/browser/shellservice.properties)
-    locale/browser/statusbar/statusbar-overlay.dtd (%chrome/browser/statusbar/statusbar-overlay.dtd)
-    locale/browser/statusbar/statusbar-prefs.dtd   (%chrome/browser/statusbar/statusbar-prefs.dtd)
-    locale/browser/statusbar/meta.properties       (%chrome/browser/statusbar/meta.properties)
-    locale/browser/statusbar/overlay.properties    (%chrome/browser/statusbar/overlay.properties)
-    locale/browser/statusbar/prefs.properties      (%chrome/browser/statusbar/prefs.properties)
-    locale/browser/tabbrowser.dtd                  (%chrome/browser/tabbrowser.dtd)
-    locale/browser/tabbrowser.properties           (%chrome/browser/tabbrowser.properties)
-    locale/browser/taskbar.properties              (%chrome/browser/taskbar.properties)
-    locale/browser/downloads/downloads.dtd         (%chrome/browser/downloads/downloads.dtd)
-    locale/browser/downloads/downloads.properties  (%chrome/browser/downloads/downloads.properties)
-    locale/browser/places/places.dtd               (%chrome/browser/places/places.dtd)
-    locale/browser/places/places.properties        (%chrome/browser/places/places.properties)
-    locale/browser/places/editBookmarkOverlay.dtd  (%chrome/browser/places/editBookmarkOverlay.dtd)
-    locale/browser/places/bookmarkProperties.properties (%chrome/browser/places/bookmarkProperties.properties)
-    locale/browser/preferences/selectBookmark.dtd  (%chrome/browser/preferences/selectBookmark.dtd)
-    locale/browser/places/moveBookmarks.dtd        (%chrome/browser/places/moveBookmarks.dtd)
-    locale/browser/feeds/subscribe.dtd              (%chrome/browser/feeds/subscribe.dtd)
-    locale/browser/feeds/subscribe.properties       (%chrome/browser/feeds/subscribe.properties)
-    locale/browser/permissions/aboutPermissions.dtd          (%chrome/browser/permissions/aboutPermissions.dtd)
-    locale/browser/permissions/aboutPermissions.properties   (%chrome/browser/permissions/aboutPermissions.properties)
-    locale/browser/preferences/advanced.dtd           (%chrome/browser/preferences/advanced.dtd)
-    locale/browser/preferences/applicationManager.dtd        (%chrome/browser/preferences/applicationManager.dtd)
-    locale/browser/preferences/applicationManager.properties (%chrome/browser/preferences/applicationManager.properties)
-    locale/browser/preferences/colors.dtd             (%chrome/browser/preferences/colors.dtd)
-    locale/browser/preferences/cookies.dtd            (%chrome/browser/preferences/cookies.dtd)
-    locale/browser/preferences/content.dtd            (%chrome/browser/preferences/content.dtd)
-    locale/browser/preferences/connection.dtd         (%chrome/browser/preferences/connection.dtd)
-    locale/browser/preferences/applications.dtd       (%chrome/browser/preferences/applications.dtd)
-    locale/browser/preferences/fonts.dtd              (%chrome/browser/preferences/fonts.dtd)
-    locale/browser/preferences/main.dtd               (%chrome/browser/preferences/main.dtd)
-    locale/browser/preferences/languages.dtd          (%chrome/browser/preferences/languages.dtd)
-    locale/browser/preferences/permissions.dtd        (%chrome/browser/preferences/permissions.dtd)
-    locale/browser/preferences/preferences.dtd        (%chrome/browser/preferences/preferences.dtd)
-    locale/browser/preferences/preferences.properties (%chrome/browser/preferences/preferences.properties)
-    locale/browser/preferences/privacy.dtd            (%chrome/browser/preferences/privacy.dtd)
-    locale/browser/preferences/security.dtd           (%chrome/browser/preferences/security.dtd)
+* locale/browser/browser.dtd                                    (%chrome/browser/browser.dtd)
+  locale/browser/baseMenuOverlay.dtd                            (%chrome/browser/baseMenuOverlay.dtd)
+  locale/browser/charsetOverlay.dtd                             (%chrome/browser/charsetOverlay.dtd)
+  locale/browser/browser.properties                             (%chrome/browser/browser.properties)
+  locale/browser/charsetMenu.properties                         (%chrome/browser/charsetMenu.properties)
+  locale/browser/charsetMenu.dtd                                (%chrome/browser/charsetMenu.dtd)
+  locale/browser/newTab.dtd                                     (%chrome/browser/newTab.dtd)
+  locale/browser/newTab.properties                              (%chrome/browser/newTab.properties)
+  locale/browser/openLocation.dtd                               (%chrome/browser/openLocation.dtd)
+  locale/browser/openLocation.properties                        (%chrome/browser/openLocation.properties)
+  locale/browser/pageInfo.dtd                                   (%chrome/browser/pageInfo.dtd)
+  locale/browser/pageInfo.properties                            (%chrome/browser/pageInfo.properties)
+  locale/browser/palemoon.dtd                                   (%chrome/browser/palemoon.dtd)
+  locale/browser/quitDialog.properties                          (%chrome/browser/quitDialog.properties)
+  locale/browser/safeMode.dtd                                   (%chrome/browser/safeMode.dtd)
+  locale/browser/sanitize.dtd                                   (%chrome/browser/sanitize.dtd)
+  locale/browser/search.properties                              (%chrome/browser/search.properties)
+  locale/browser/searchbar.dtd                                  (%chrome/browser/searchbar.dtd)
+  locale/browser/engineManager.dtd                              (%chrome/browser/engineManager.dtd)
+  locale/browser/engineManager.properties                       (%chrome/browser/engineManager.properties)
+  locale/browser/setDesktopBackground.dtd                       (%chrome/browser/setDesktopBackground.dtd)
+  locale/browser/shellservice.properties                        (%chrome/browser/shellservice.properties)
+  locale/browser/statusbar/statusbar-overlay.dtd                (%chrome/browser/statusbar/statusbar-overlay.dtd)
+  locale/browser/statusbar/statusbar-prefs.dtd                  (%chrome/browser/statusbar/statusbar-prefs.dtd)
+  locale/browser/statusbar/meta.properties                      (%chrome/browser/statusbar/meta.properties)
+  locale/browser/statusbar/overlay.properties                   (%chrome/browser/statusbar/overlay.properties)
+  locale/browser/statusbar/prefs.properties                     (%chrome/browser/statusbar/prefs.properties)
+  locale/browser/tabbrowser.dtd                                 (%chrome/browser/tabbrowser.dtd)
+  locale/browser/tabbrowser.properties                          (%chrome/browser/tabbrowser.properties)
+  locale/browser/taskbar.properties                             (%chrome/browser/taskbar.properties)
+  locale/browser/downloads/downloads.dtd                        (%chrome/browser/downloads/downloads.dtd)
+  locale/browser/downloads/downloads.properties                 (%chrome/browser/downloads/downloads.properties)
+  locale/browser/places/places.dtd                              (%chrome/browser/places/places.dtd)
+  locale/browser/places/places.properties                       (%chrome/browser/places/places.properties)
+  locale/browser/places/editBookmarkOverlay.dtd                 (%chrome/browser/places/editBookmarkOverlay.dtd)
+  locale/browser/places/bookmarkProperties.properties           (%chrome/browser/places/bookmarkProperties.properties)
+  locale/browser/preferences/selectBookmark.dtd                 (%chrome/browser/preferences/selectBookmark.dtd)
+  locale/browser/places/moveBookmarks.dtd                       (%chrome/browser/places/moveBookmarks.dtd)
+  locale/browser/feeds/subscribe.dtd                            (%chrome/browser/feeds/subscribe.dtd)
+  locale/browser/feeds/subscribe.properties                     (%chrome/browser/feeds/subscribe.properties)
+  locale/browser/permissions/aboutPermissions.dtd               (%chrome/browser/permissions/aboutPermissions.dtd)
+  locale/browser/permissions/aboutPermissions.properties        (%chrome/browser/permissions/aboutPermissions.properties)
+  locale/browser/preferences/advanced.dtd                       (%chrome/browser/preferences/advanced.dtd)
+  locale/browser/preferences/applicationManager.dtd             (%chrome/browser/preferences/applicationManager.dtd)
+  locale/browser/preferences/applicationManager.properties      (%chrome/browser/preferences/applicationManager.properties)
+  locale/browser/preferences/colors.dtd                         (%chrome/browser/preferences/colors.dtd)
+  locale/browser/preferences/cookies.dtd                        (%chrome/browser/preferences/cookies.dtd)
+  locale/browser/preferences/content.dtd                        (%chrome/browser/preferences/content.dtd)
+  locale/browser/preferences/connection.dtd                     (%chrome/browser/preferences/connection.dtd)
+  locale/browser/preferences/applications.dtd                   (%chrome/browser/preferences/applications.dtd)
+  locale/browser/preferences/fonts.dtd                          (%chrome/browser/preferences/fonts.dtd)
+  locale/browser/preferences/main.dtd                           (%chrome/browser/preferences/main.dtd)
+  locale/browser/preferences/languages.dtd                      (%chrome/browser/preferences/languages.dtd)
+  locale/browser/preferences/permissions.dtd                    (%chrome/browser/preferences/permissions.dtd)
+  locale/browser/preferences/preferences.dtd                    (%chrome/browser/preferences/preferences.dtd)
+  locale/browser/preferences/preferences.properties             (%chrome/browser/preferences/preferences.properties)
+  locale/browser/preferences/privacy.dtd                        (%chrome/browser/preferences/privacy.dtd)
+  locale/browser/preferences/security.dtd                       (%chrome/browser/preferences/security.dtd)
 #ifdef MOZ_SERVICES_SYNC
-    locale/browser/preferences/sync.dtd               (%chrome/browser/preferences/sync.dtd)
+  locale/browser/preferences/sync.dtd                           (%chrome/browser/preferences/sync.dtd)
 #endif
-    locale/browser/preferences/tabs.dtd               (%chrome/browser/preferences/tabs.dtd)
+  locale/browser/preferences/tabs.dtd                           (%chrome/browser/preferences/tabs.dtd)
 #ifdef MOZ_SERVICES_SYNC
-    locale/browser/syncBrand.dtd                (%chrome/browser/syncBrand.dtd)
-    locale/browser/syncSetup.dtd                (%chrome/browser/syncSetup.dtd)
-    locale/browser/syncSetup.properties         (%chrome/browser/syncSetup.properties)
-    locale/browser/syncGenericChange.properties         (%chrome/browser/syncGenericChange.properties)
-    locale/browser/syncKey.dtd                  (%chrome/browser/syncKey.dtd)
-    locale/browser/syncQuota.dtd                (%chrome/browser/syncQuota.dtd)
-    locale/browser/syncQuota.properties         (%chrome/browser/syncQuota.properties)
+  locale/browser/syncBrand.dtd                                  (%chrome/browser/syncBrand.dtd)
+  locale/browser/syncSetup.dtd                                  (%chrome/browser/syncSetup.dtd)
+  locale/browser/syncSetup.properties                           (%chrome/browser/syncSetup.properties)
+  locale/browser/syncGenericChange.properties                   (%chrome/browser/syncGenericChange.properties)
+  locale/browser/syncKey.dtd                                    (%chrome/browser/syncKey.dtd)
+  locale/browser/syncQuota.dtd                                  (%chrome/browser/syncQuota.dtd)
+  locale/browser/syncQuota.properties                           (%chrome/browser/syncQuota.properties)
 #endif
 % locale browser-region @AB_CD@ %locale/browser-region/
-    locale/browser-region/region.properties        (%chrome/browser-region/region.properties)
+  locale/browser-region/region.properties                       (%chrome/browser-region/region.properties)
 # the following files are browser-specific overrides
-    locale/browser/netError.dtd                (%chrome/overrides/netError.dtd)
-    locale/browser/appstrings.properties       (%chrome/overrides/appstrings.properties)
-    locale/browser/downloads/settingsChange.dtd  (%chrome/overrides/settingsChange.dtd)
+  locale/browser/netError.dtd                                   (%chrome/overrides/netError.dtd)
+  locale/browser/appstrings.properties                          (%chrome/overrides/appstrings.properties)
+  locale/browser/downloads/settingsChange.dtd                   (%chrome/overrides/settingsChange.dtd)
 % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
 % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
 % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
diff --git a/application/palemoon/modules/moz.build b/application/palemoon/modules/moz.build
index 8032930b2..12a3ece2e 100644
--- a/application/palemoon/modules/moz.build
+++ b/application/palemoon/modules/moz.build
@@ -4,7 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 EXTRA_JS_MODULES += [
     'AutoCompletePopup.jsm',
     'BrowserNewTabPreloader.jsm',
@@ -38,5 +37,6 @@ EXTRA_PP_JS_MODULES += [
 # Pass down 'official build' flags
 if CONFIG['MC_OFFICIAL']:
     DEFINES['MC_OFFICIAL'] = 1
+
 if CONFIG['MOZILLA_OFFICIAL']:
     DEFINES['MOZILLA_OFFICIAL'] = 1
diff --git a/application/palemoon/moz.build b/application/palemoon/moz.build
index 2b9d8f09b..72e37673c 100644
--- a/application/palemoon/moz.build
+++ b/application/palemoon/moz.build
@@ -15,9 +15,7 @@ DIRS += [
     'themes',
 ]
 
-DIRS += [
-    'app',
-]
+DIRS += ['app']
 
 if CONFIG['MAKENSISU']:
     DIRS += ['installer/windows']
diff --git a/application/palemoon/themes/linux/communicator/jar.mn b/application/palemoon/themes/linux/communicator/jar.mn
index dfd20c523..612d13335 100644
--- a/application/palemoon/themes/linux/communicator/jar.mn
+++ b/application/palemoon/themes/linux/communicator/jar.mn
@@ -4,4 +4,4 @@
 
 browser.jar:
 % skin communicator classic/1.0 %skin/classic/communicator/
-        skin/classic/communicator/communicator.css
+  skin/classic/communicator/communicator.css
diff --git a/application/palemoon/themes/linux/jar.mn b/application/palemoon/themes/linux/jar.mn
index 8cb6878e8..a79487c7f 100644
--- a/application/palemoon/themes/linux/jar.mn
+++ b/application/palemoon/themes/linux/jar.mn
@@ -59,72 +59,72 @@ browser.jar:
   skin/classic/browser/webRTC-shareDevice-64.png
   skin/classic/browser/webRTC-sharingDevice-16.png
 #endif
-  skin/classic/browser/downloads/buttons.png          (downloads/buttons.png)
-  skin/classic/browser/downloads/download-glow.png    (downloads/download-glow.png)
-  skin/classic/browser/downloads/download-glow-small.png (downloads/download-glow-small.png)
-  skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png)
-  skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png)
-  skin/classic/browser/downloads/download-summary.png (downloads/download-summary.png)
-  skin/classic/browser/downloads/downloads.css        (downloads/downloads.css)
-  skin/classic/browser/downloads/allDownloadsViewOverlay.css   (downloads/allDownloadsViewOverlay.css)
-  skin/classic/browser/downloads/contentAreaDownloadsView.css  (downloads/contentAreaDownloadsView.css)
-  skin/classic/browser/feeds/feedIcon.png             (feeds/feedIcon.png)
-  skin/classic/browser/feeds/feedIcon16.png           (feeds/feedIcon16.png)
-  skin/classic/browser/feeds/videoFeedIcon.png        (feeds/feedIcon.png)
-  skin/classic/browser/feeds/videoFeedIcon16.png      (feeds/feedIcon16.png)
-  skin/classic/browser/feeds/audioFeedIcon.png        (feeds/feedIcon.png)
-  skin/classic/browser/feeds/audioFeedIcon16.png      (feeds/feedIcon16.png)
-  skin/classic/browser/feeds/subscribe.css            (feeds/subscribe.css)
-  skin/classic/browser/feeds/subscribe-ui.css         (feeds/subscribe-ui.css)
-* skin/classic/browser/newtab/newTab.css              (newtab/newTab.css)
-  skin/classic/browser/newtab/controls.png            (../shared/newtab/controls.png)
-  skin/classic/browser/newtab/noise.png               (../shared/newtab/noise.png)
-  skin/classic/browser/newtab/pinned.png              (../shared/newtab/pinned.png)
-  skin/classic/browser/places/bookmarksMenu.png       (places/bookmarksMenu.png)
-  skin/classic/browser/places/bookmarksToolbar.png    (places/bookmarksToolbar.png)
-  skin/classic/browser/places/calendar.png            (places/calendar.png)
-* skin/classic/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css)
-  skin/classic/browser/places/livemark-item.png       (places/livemark-item.png)
-  skin/classic/browser/places/pageStarred.png         (places/pageStarred.png)
-  skin/classic/browser/places/star-icons.png          (places/star-icons.png)
-  skin/classic/browser/places/starred48.png           (places/starred48.png)
-  skin/classic/browser/places/unstarred48.png         (places/unstarred48.png)
-  skin/classic/browser/places/places.css              (places/places.css)
-  skin/classic/browser/places/organizer.css           (places/organizer.css)
-  skin/classic/browser/places/organizer.xml           (places/organizer.xml)
-  skin/classic/browser/places/query.png               (places/query.png)
-  skin/classic/browser/places/starPage.png            (places/starPage.png)
-  skin/classic/browser/places/tag.png                 (places/tag.png)
-  skin/classic/browser/places/toolbarDropMarker.png   (places/toolbarDropMarker.png)
-  skin/classic/browser/places/unsortedBookmarks.png   (places/unsortedBookmarks.png)
-  skin/classic/browser/places/downloads.png           (places/downloads.png)
-  skin/classic/browser/permissions/aboutPermissions.css (permissions/aboutPermissions.css)
-  skin/classic/browser/preferences/alwaysAsk.png      (preferences/alwaysAsk.png)
-  skin/classic/browser/preferences/mail.png           (preferences/mail.png)
-  skin/classic/browser/preferences/Options.png        (preferences/Options.png)
+  skin/classic/browser/downloads/buttons.png                          (downloads/buttons.png)
+  skin/classic/browser/downloads/download-glow.png                    (downloads/download-glow.png)
+  skin/classic/browser/downloads/download-glow-small.png              (downloads/download-glow-small.png)
+  skin/classic/browser/downloads/download-notification-finish.png     (downloads/download-notification-finish.png)
+  skin/classic/browser/downloads/download-notification-start.png      (downloads/download-notification-start.png)
+  skin/classic/browser/downloads/download-summary.png                 (downloads/download-summary.png)
+  skin/classic/browser/downloads/downloads.css                        (downloads/downloads.css)
+  skin/classic/browser/downloads/allDownloadsViewOverlay.css          (downloads/allDownloadsViewOverlay.css)
+  skin/classic/browser/downloads/contentAreaDownloadsView.css         (downloads/contentAreaDownloadsView.css)
+  skin/classic/browser/feeds/feedIcon.png                             (feeds/feedIcon.png)
+  skin/classic/browser/feeds/feedIcon16.png                           (feeds/feedIcon16.png)
+  skin/classic/browser/feeds/videoFeedIcon.png                        (feeds/feedIcon.png)
+  skin/classic/browser/feeds/videoFeedIcon16.png                      (feeds/feedIcon16.png)
+  skin/classic/browser/feeds/audioFeedIcon.png                        (feeds/feedIcon.png)
+  skin/classic/browser/feeds/audioFeedIcon16.png                      (feeds/feedIcon16.png)
+  skin/classic/browser/feeds/subscribe.css                            (feeds/subscribe.css)
+  skin/classic/browser/feeds/subscribe-ui.css                         (feeds/subscribe-ui.css)
+* skin/classic/browser/newtab/newTab.css                              (newtab/newTab.css)
+  skin/classic/browser/newtab/controls.png                            (../shared/newtab/controls.png)
+  skin/classic/browser/newtab/noise.png                               (../shared/newtab/noise.png)
+  skin/classic/browser/newtab/pinned.png                              (../shared/newtab/pinned.png)
+  skin/classic/browser/places/bookmarksMenu.png                       (places/bookmarksMenu.png)
+  skin/classic/browser/places/bookmarksToolbar.png                    (places/bookmarksToolbar.png)
+  skin/classic/browser/places/calendar.png                            (places/calendar.png)
+* skin/classic/browser/places/editBookmarkOverlay.css                 (places/editBookmarkOverlay.css)
+  skin/classic/browser/places/livemark-item.png                       (places/livemark-item.png)
+  skin/classic/browser/places/pageStarred.png                         (places/pageStarred.png)
+  skin/classic/browser/places/star-icons.png                          (places/star-icons.png)
+  skin/classic/browser/places/starred48.png                           (places/starred48.png)
+  skin/classic/browser/places/unstarred48.png                         (places/unstarred48.png)
+  skin/classic/browser/places/places.css                              (places/places.css)
+  skin/classic/browser/places/organizer.css                           (places/organizer.css)
+  skin/classic/browser/places/organizer.xml                           (places/organizer.xml)
+  skin/classic/browser/places/query.png                               (places/query.png)
+  skin/classic/browser/places/starPage.png                            (places/starPage.png)
+  skin/classic/browser/places/tag.png                                 (places/tag.png)
+  skin/classic/browser/places/toolbarDropMarker.png                   (places/toolbarDropMarker.png)
+  skin/classic/browser/places/unsortedBookmarks.png                   (places/unsortedBookmarks.png)
+  skin/classic/browser/places/downloads.png                           (places/downloads.png)
+  skin/classic/browser/permissions/aboutPermissions.css               (permissions/aboutPermissions.css)
+  skin/classic/browser/preferences/alwaysAsk.png                      (preferences/alwaysAsk.png)
+  skin/classic/browser/preferences/mail.png                           (preferences/mail.png)
+  skin/classic/browser/preferences/Options.png                        (preferences/Options.png)
 #ifdef MOZ_SERVICES_SYNC
-  skin/classic/browser/preferences/Options-sync.png   (preferences/Options-sync.png)
+  skin/classic/browser/preferences/Options-sync.png                   (preferences/Options-sync.png)
 #endif
-* skin/classic/browser/preferences/preferences.css    (preferences/preferences.css)
-  skin/classic/browser/preferences/applications.css   (preferences/applications.css)
+* skin/classic/browser/preferences/preferences.css                    (preferences/preferences.css)
+  skin/classic/browser/preferences/applications.css                   (preferences/applications.css)
 #ifdef MOZ_BROWSER_STATUSBAR
-  skin/classic/browser/statusbar/dynamic.css                   (../shared/statusbar/dynamic.css)
-* skin/classic/browser/statusbar/overlay.css                   (statusbar/overlay.css)
-* skin/classic/browser/statusbar/prefs.css                     (statusbar/prefs.css)
-  skin/classic/browser/statusbar/pulse.png                     (../shared/statusbar/pulse.png)
-  skin/classic/browser/statusbar/pms16.png                     (../shared/statusbar/pms16.png)
-  skin/classic/browser/statusbar/pms24.png                     (../shared/statusbar/pms24.png)
-  skin/classic/browser/statusbar/throbber-idle.png             (../shared/statusbar/throbber-idle.png)
-  skin/classic/browser/statusbar/throbberStatic.png            (../shared/statusbar/throbberStatic.png)
+  skin/classic/browser/statusbar/dynamic.css                          (../shared/statusbar/dynamic.css)
+* skin/classic/browser/statusbar/overlay.css                          (statusbar/overlay.css)
+* skin/classic/browser/statusbar/prefs.css                            (statusbar/prefs.css)
+  skin/classic/browser/statusbar/pulse.png                            (../shared/statusbar/pulse.png)
+  skin/classic/browser/statusbar/pms16.png                            (../shared/statusbar/pms16.png)
+  skin/classic/browser/statusbar/pms24.png                            (../shared/statusbar/pms24.png)
+  skin/classic/browser/statusbar/throbber-idle.png                    (../shared/statusbar/throbber-idle.png)
+  skin/classic/browser/statusbar/throbberStatic.png                   (../shared/statusbar/throbberStatic.png)
 #endif
-  skin/classic/browser/tabbrowser/alltabs.png         (tabbrowser/alltabs.png)
-  skin/classic/browser/tabbrowser/connecting.png      (tabbrowser/connecting.png)
-  skin/classic/browser/tabbrowser/loading.png         (tabbrowser/loading.png)
-  skin/classic/browser/tabbrowser/tab.png             (tabbrowser/tab.png)
-  skin/classic/browser/tabbrowser/tab-overflow-border.png (tabbrowser/tab-overflow-border.png)
-  skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)
-  skin/classic/browser/tabbrowser/tab-audio.svg       (../shared/tabbrowser/tab-audio.svg)
-  skin/classic/browser/tabbrowser/tab-audio-small.svg (../shared/tabbrowser/tab-audio-small.svg)
+  skin/classic/browser/tabbrowser/alltabs.png                         (tabbrowser/alltabs.png)
+  skin/classic/browser/tabbrowser/connecting.png                      (tabbrowser/connecting.png)
+  skin/classic/browser/tabbrowser/loading.png                         (tabbrowser/loading.png)
+  skin/classic/browser/tabbrowser/tab.png                             (tabbrowser/tab.png)
+  skin/classic/browser/tabbrowser/tab-overflow-border.png             (tabbrowser/tab-overflow-border.png)
+  skin/classic/browser/tabbrowser/tabDragIndicator.png                (tabbrowser/tabDragIndicator.png)
+  skin/classic/browser/tabbrowser/tab-audio.svg                       (../shared/tabbrowser/tab-audio.svg)
+  skin/classic/browser/tabbrowser/tab-audio-small.svg                 (../shared/tabbrowser/tab-audio-small.svg)
 #ifdef MOZ_SERVICES_SYNC
   skin/classic/browser/sync-16-throbber.png
   skin/classic/browser/sync-16.png
@@ -139,6 +139,6 @@ browser.jar:
   skin/classic/browser/syncQuota.css
   skin/classic/browser/syncProgress.css
 #endif
-  skin/classic/browser/notification-pluginNormal.png  (../shared/plugins/notification-pluginNormal.png)
-  skin/classic/browser/notification-pluginAlert.png   (../shared/plugins/notification-pluginAlert.png)
-  skin/classic/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png)
+  skin/classic/browser/notification-pluginNormal.png                  (../shared/plugins/notification-pluginNormal.png)
+  skin/classic/browser/notification-pluginAlert.png                   (../shared/plugins/notification-pluginAlert.png)
+  skin/classic/browser/notification-pluginBlocked.png                 (../shared/plugins/notification-pluginBlocked.png)
diff --git a/application/palemoon/themes/moz.build b/application/palemoon/themes/moz.build
index d82bda3ef..5040c10c1 100644
--- a/application/palemoon/themes/moz.build
+++ b/application/palemoon/themes/moz.build
@@ -12,4 +12,3 @@ elif toolkit in ('gtk2', 'gtk3', 'qt'):
     DIRS += ['linux']
 else:
     DIRS += ['windows']
-    
diff --git a/application/palemoon/themes/osx/communicator/jar.mn b/application/palemoon/themes/osx/communicator/jar.mn
index dfd20c523..612d13335 100644
--- a/application/palemoon/themes/osx/communicator/jar.mn
+++ b/application/palemoon/themes/osx/communicator/jar.mn
@@ -4,4 +4,4 @@
 
 browser.jar:
 % skin communicator classic/1.0 %skin/classic/communicator/
-        skin/classic/communicator/communicator.css
+  skin/classic/communicator/communicator.css
diff --git a/application/palemoon/themes/osx/jar.mn b/application/palemoon/themes/osx/jar.mn
index 1a11d0a30..c59fb1c72 100644
--- a/application/palemoon/themes/osx/jar.mn
+++ b/application/palemoon/themes/osx/jar.mn
@@ -4,180 +4,180 @@
 
 browser.jar:
 % skin browser classic/1.0 %skin/classic/browser/
-        skin/classic/browser/sanitizeDialog.css
-*       skin/classic/browser/aboutPrivateBrowsing.css
-*       skin/classic/browser/aboutSessionRestore.css
-        skin/classic/browser/aboutSessionRestore-window-icon.png     (preferences/application.png)
-        skin/classic/browser/aboutCertError.css
-        skin/classic/browser/aboutCertError_sectionCollapsed.png
-        skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png
-        skin/classic/browser/aboutCertError_sectionExpanded.png
+  skin/classic/browser/sanitizeDialog.css
+* skin/classic/browser/aboutPrivateBrowsing.css
+* skin/classic/browser/aboutSessionRestore.css
+  skin/classic/browser/aboutSessionRestore-window-icon.png     (preferences/application.png)
+  skin/classic/browser/aboutCertError.css
+  skin/classic/browser/aboutCertError_sectionCollapsed.png
+  skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png
+  skin/classic/browser/aboutCertError_sectionExpanded.png
 #ifdef MOZ_SERVICES_SYNC
-        skin/classic/browser/aboutSyncTabs.css
+  skin/classic/browser/aboutSyncTabs.css
 #endif
-*       skin/classic/browser/autocomplete.css
-        skin/classic/browser/actionicon-tab.png
-        skin/classic/browser/appmenu-icons.png
-        skin/classic/browser/appmenu-dropmarker.png
-*       skin/classic/browser/browser.css
-        skin/classic/browser/click-to-play-warning-stripes.png
-*       skin/classic/browser/engineManager.css
-        skin/classic/browser/Geolocation-16.png
-        skin/classic/browser/Geolocation-64.png
-        skin/classic/browser/Info.png
-        skin/classic/browser/identity.png
-        skin/classic/browser/imagedocument.png 
-        skin/classic/browser/identity-icons-generic.png
-        skin/classic/browser/identity-icons-https.png
-        skin/classic/browser/identity-icons-https-ev.png
-        skin/classic/browser/identity-icons-https-mixed-active.png
-        skin/classic/browser/keyhole-forward-mask.svg
-        skin/classic/browser/KUI-background.png
-        skin/classic/browser/KUI-close.png
-        skin/classic/browser/livemark-folder.png
-        skin/classic/browser/menu-back.png
-        skin/classic/browser/menu-forward.png
-        skin/classic/browser/mixed-content-blocked-16.png
-        skin/classic/browser/mixed-content-blocked-64.png
-        skin/classic/browser/monitor.png
-        skin/classic/browser/monitor_16-10.png
+* skin/classic/browser/autocomplete.css
+  skin/classic/browser/actionicon-tab.png
+  skin/classic/browser/appmenu-icons.png
+  skin/classic/browser/appmenu-dropmarker.png
+* skin/classic/browser/browser.css
+  skin/classic/browser/click-to-play-warning-stripes.png
+* skin/classic/browser/engineManager.css
+  skin/classic/browser/Geolocation-16.png
+  skin/classic/browser/Geolocation-64.png
+  skin/classic/browser/Info.png
+  skin/classic/browser/identity.png
+  skin/classic/browser/imagedocument.png 
+  skin/classic/browser/identity-icons-generic.png
+  skin/classic/browser/identity-icons-https.png
+  skin/classic/browser/identity-icons-https-ev.png
+  skin/classic/browser/identity-icons-https-mixed-active.png
+  skin/classic/browser/keyhole-forward-mask.svg
+  skin/classic/browser/KUI-background.png
+  skin/classic/browser/KUI-close.png
+  skin/classic/browser/livemark-folder.png
+  skin/classic/browser/menu-back.png
+  skin/classic/browser/menu-forward.png
+  skin/classic/browser/mixed-content-blocked-16.png
+  skin/classic/browser/mixed-content-blocked-64.png
+  skin/classic/browser/monitor.png
+  skin/classic/browser/monitor_16-10.png
   skin/classic/browser/panel-expander-closed.png
   skin/classic/browser/panel-expander-closed@2x.png
   skin/classic/browser/panel-expander-open.png
   skin/classic/browser/panel-expander-open@2x.png
   skin/classic/browser/panel-plus-sign.png
-        skin/classic/browser/pageInfo.css
-        skin/classic/browser/pageInfo.png
-        skin/classic/browser/page-livemarks.png
-        skin/classic/browser/page-livemarks@2x.png
-        skin/classic/browser/pointerLock-16.png
-        skin/classic/browser/pointerLock-64.png
-        skin/classic/browser/Privacy-16.png
-        skin/classic/browser/Privacy-32.png
-        skin/classic/browser/Privacy-48.png
+  skin/classic/browser/pageInfo.css
+  skin/classic/browser/pageInfo.png
+  skin/classic/browser/page-livemarks.png
+  skin/classic/browser/page-livemarks@2x.png
+  skin/classic/browser/pointerLock-16.png
+  skin/classic/browser/pointerLock-64.png
+  skin/classic/browser/Privacy-16.png
+  skin/classic/browser/Privacy-32.png
+  skin/classic/browser/Privacy-48.png
   skin/classic/browser/privatebrowsing-mask.png
   skin/classic/browser/privatebrowsing-mask@2x.png
-        skin/classic/browser/privatebrowsing-light.png
-        skin/classic/browser/privatebrowsing-dark.png
-        skin/classic/browser/reload-stop-go.png
-        skin/classic/browser/Search-glass.png
-        skin/classic/browser/searchbar.css
-        skin/classic/browser/searchbar-dropdown-arrow.png
-        skin/classic/browser/Secure24.png
-        skin/classic/browser/setDesktopBackground.css
-        skin/classic/browser/slowStartup-16.png
-        skin/classic/browser/Toolbar.png
-        skin/classic/browser/Toolbar-inverted.png
-        skin/classic/browser/toolbarbutton-dropdown-arrow.png
-        skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png
-        skin/classic/browser/urlbar-arrow.png
-        skin/classic/browser/urlbar-popup-blocked.png
-        skin/classic/browser/urlbar-history-dropmarker.png
-        skin/classic/browser/web-notifications-icon.svg
-        skin/classic/browser/web-notifications-tray.svg
-        skin/classic/browser/notification-pluginNormal.png           (../shared/plugins/notification-pluginNormal.png)
-        skin/classic/browser/notification-pluginAlert.png            (../shared/plugins/notification-pluginAlert.png)
-        skin/classic/browser/notification-pluginBlocked.png          (../shared/plugins/notification-pluginBlocked.png)
+  skin/classic/browser/privatebrowsing-light.png
+  skin/classic/browser/privatebrowsing-dark.png
+  skin/classic/browser/reload-stop-go.png
+  skin/classic/browser/Search-glass.png
+  skin/classic/browser/searchbar.css
+  skin/classic/browser/searchbar-dropdown-arrow.png
+  skin/classic/browser/Secure24.png
+  skin/classic/browser/setDesktopBackground.css
+  skin/classic/browser/slowStartup-16.png
+  skin/classic/browser/Toolbar.png
+  skin/classic/browser/Toolbar-inverted.png
+  skin/classic/browser/toolbarbutton-dropdown-arrow.png
+  skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png
+  skin/classic/browser/urlbar-arrow.png
+  skin/classic/browser/urlbar-popup-blocked.png
+  skin/classic/browser/urlbar-history-dropmarker.png
+  skin/classic/browser/web-notifications-icon.svg
+  skin/classic/browser/web-notifications-tray.svg
+  skin/classic/browser/notification-pluginNormal.png                  (../shared/plugins/notification-pluginNormal.png)
+  skin/classic/browser/notification-pluginAlert.png                   (../shared/plugins/notification-pluginAlert.png)
+  skin/classic/browser/notification-pluginBlocked.png                 (../shared/plugins/notification-pluginBlocked.png)
 #ifdef MOZ_WEBRTC
-        skin/classic/browser/webRTC-shareDevice-16.png
-        skin/classic/browser/webRTC-shareDevice-64.png
-        skin/classic/browser/webRTC-sharingDevice-16.png
+  skin/classic/browser/webRTC-shareDevice-16.png
+  skin/classic/browser/webRTC-shareDevice-64.png
+  skin/classic/browser/webRTC-sharingDevice-16.png
 #endif
-        skin/classic/browser/downloads/buttons.png                   (downloads/buttons.png)
-        skin/classic/browser/downloads/download-glow.png             (downloads/download-glow.png)
-        skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png)
-        skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png)
-        skin/classic/browser/downloads/download-summary.png          (downloads/download-summary.png)
-*       skin/classic/browser/downloads/downloads.css                 (downloads/downloads.css)
-*       skin/classic/browser/downloads/allDownloadsViewOverlay.css   (downloads/allDownloadsViewOverlay.css)
-        skin/classic/browser/downloads/contentAreaDownloadsView.css  (downloads/contentAreaDownloadsView.css)
-        skin/classic/browser/feeds/feedIcon.png                      (feeds/feedIcon.png)
-        skin/classic/browser/feeds/feedIcon16.png                    (feeds/feedIcon16.png)
-        skin/classic/browser/feeds/feed-icons-16.png                 (feeds/feed-icons-16.png)
-        skin/classic/browser/feeds/audioFeedIcon.png                 (feeds/feedIcon.png)
-        skin/classic/browser/feeds/audioFeedIcon16.png               (feeds/feedIcon16.png)
-        skin/classic/browser/feeds/videoFeedIcon.png                 (feeds/feedIcon.png)
-        skin/classic/browser/feeds/videoFeedIcon16.png               (feeds/feedIcon16.png)
-        skin/classic/browser/feeds/subscribe.css                     (feeds/subscribe.css)
-        skin/classic/browser/feeds/subscribe-ui.css                  (feeds/subscribe-ui.css)
-*       skin/classic/browser/newtab/newTab.css                       (newtab/newTab.css)
-        skin/classic/browser/newtab/controls.png                     (../shared/newtab/controls.png)
-        skin/classic/browser/newtab/noise.png                        (../shared/newtab/noise.png)
-        skin/classic/browser/newtab/pinned.png                       (../shared/newtab/pinned.png)
-        skin/classic/browser/places/places.css                       (places/places.css)
-*       skin/classic/browser/places/organizer.css                    (places/organizer.css)
-        skin/classic/browser/places/editBookmark.png                 (places/editBookmark.png)
-        skin/classic/browser/places/bookmark.png                     (places/bookmark.png)
-        skin/classic/browser/places/query.png                        (places/query.png)
-        skin/classic/browser/places/query@2x.png                     (places/query@2x.png)
-        skin/classic/browser/places/bookmarksMenu.png                (places/bookmarksMenu.png)
-        skin/classic/browser/places/bookmarksToolbar.png             (places/bookmarksToolbar.png)
-        skin/classic/browser/places/bookmarksToolbar@2x.png          (places/bookmarksToolbar@2x.png)
-        skin/classic/browser/places/calendar.png                     (places/calendar.png)
-        skin/classic/browser/places/folderDropArrow.png              (places/folderDropArrow.png)
-        skin/classic/browser/places/folderDropArrow@2x.png           (places/folderDropArrow@2x.png)
-        skin/classic/browser/places/toolbarDropMarker.png            (places/toolbarDropMarker.png)
-        skin/classic/browser/places/editBookmarkOverlay.css          (places/editBookmarkOverlay.css)
-        skin/classic/browser/places/libraryToolbar.png               (places/libraryToolbar.png)
-        skin/classic/browser/places/starred48.png                    (places/starred48.png)
-        skin/classic/browser/places/unstarred48.png                  (places/unstarred48.png)
-  skin/classic/browser/places/unfiledBookmarks.png          (places/unfiledBookmarks.png)
-  skin/classic/browser/places/unfiledBookmarks@2x.png       (places/unfiledBookmarks@2x.png)
-        skin/classic/browser/places/tag.png                          (places/tag.png)
-        skin/classic/browser/places/tag@2x.png                       (places/tag@2x.png)
-        skin/classic/browser/places/history.png                      (places/history.png)
-        skin/classic/browser/places/history@2x.png                   (places/history@2x.png)
-        skin/classic/browser/places/allBookmarks.png                 (places/allBookmarks.png)
-        skin/classic/browser/places/unsortedBookmarks.png            (places/unsortedBookmarks.png)
-        skin/classic/browser/places/downloads.png                    (places/downloads.png)
-  skin/classic/browser/places/expander-closed-active.png    (places/expander-closed-active.png)
-  skin/classic/browser/places/expander-open-active.png      (places/expander-open-active.png)
-        skin/classic/browser/places/livemark-item.png                (places/livemark-item.png)
-        skin/classic/browser/places/expander-closed.png              (places/expander-closed.png)
-        skin/classic/browser/places/expander-open.png                (places/expander-open.png)
-        skin/classic/browser/permissions/aboutPermissions.css        (permissions/aboutPermissions.css)
-        skin/classic/browser/preferences/alwaysAsk.png               (preferences/alwaysAsk.png)
-        skin/classic/browser/preferences/application.png             (preferences/application.png)
-        skin/classic/browser/preferences/mail.png                    (preferences/mail.png)
-        skin/classic/browser/preferences/Options.png                 (preferences/Options.png)
+  skin/classic/browser/downloads/buttons.png                          (downloads/buttons.png)
+  skin/classic/browser/downloads/download-glow.png                    (downloads/download-glow.png)
+  skin/classic/browser/downloads/download-notification-finish.png     (downloads/download-notification-finish.png)
+  skin/classic/browser/downloads/download-notification-start.png      (downloads/download-notification-start.png)
+  skin/classic/browser/downloads/download-summary.png                 (downloads/download-summary.png)
+* skin/classic/browser/downloads/downloads.css                        (downloads/downloads.css)
+* skin/classic/browser/downloads/allDownloadsViewOverlay.css          (downloads/allDownloadsViewOverlay.css)
+  skin/classic/browser/downloads/contentAreaDownloadsView.css         (downloads/contentAreaDownloadsView.css)
+  skin/classic/browser/feeds/feedIcon.png                             (feeds/feedIcon.png)
+  skin/classic/browser/feeds/feedIcon16.png                           (feeds/feedIcon16.png)
+  skin/classic/browser/feeds/feed-icons-16.png                        (feeds/feed-icons-16.png)
+  skin/classic/browser/feeds/audioFeedIcon.png                        (feeds/feedIcon.png)
+  skin/classic/browser/feeds/audioFeedIcon16.png                      (feeds/feedIcon16.png)
+  skin/classic/browser/feeds/videoFeedIcon.png                        (feeds/feedIcon.png)
+  skin/classic/browser/feeds/videoFeedIcon16.png                      (feeds/feedIcon16.png)
+  skin/classic/browser/feeds/subscribe.css                            (feeds/subscribe.css)
+  skin/classic/browser/feeds/subscribe-ui.css                         (feeds/subscribe-ui.css)
+* skin/classic/browser/newtab/newTab.css                              (newtab/newTab.css)
+  skin/classic/browser/newtab/controls.png                            (../shared/newtab/controls.png)
+  skin/classic/browser/newtab/noise.png                               (../shared/newtab/noise.png)
+  skin/classic/browser/newtab/pinned.png                              (../shared/newtab/pinned.png)
+  skin/classic/browser/places/places.css                              (places/places.css)
+* skin/classic/browser/places/organizer.css                           (places/organizer.css)
+  skin/classic/browser/places/editBookmark.png                        (places/editBookmark.png)
+  skin/classic/browser/places/bookmark.png                            (places/bookmark.png)
+  skin/classic/browser/places/query.png                               (places/query.png)
+  skin/classic/browser/places/query@2x.png                            (places/query@2x.png)
+  skin/classic/browser/places/bookmarksMenu.png                       (places/bookmarksMenu.png)
+  skin/classic/browser/places/bookmarksToolbar.png                    (places/bookmarksToolbar.png)
+  skin/classic/browser/places/bookmarksToolbar@2x.png                 (places/bookmarksToolbar@2x.png)
+  skin/classic/browser/places/calendar.png                            (places/calendar.png)
+  skin/classic/browser/places/folderDropArrow.png                     (places/folderDropArrow.png)
+  skin/classic/browser/places/folderDropArrow@2x.png                  (places/folderDropArrow@2x.png)
+  skin/classic/browser/places/toolbarDropMarker.png                   (places/toolbarDropMarker.png)
+  skin/classic/browser/places/editBookmarkOverlay.css                 (places/editBookmarkOverlay.css)
+  skin/classic/browser/places/libraryToolbar.png                      (places/libraryToolbar.png)
+  skin/classic/browser/places/starred48.png                           (places/starred48.png)
+  skin/classic/browser/places/unstarred48.png                         (places/unstarred48.png)
+  skin/classic/browser/places/unfiledBookmarks.png                    (places/unfiledBookmarks.png)
+  skin/classic/browser/places/unfiledBookmarks@2x.png                 (places/unfiledBookmarks@2x.png)
+  skin/classic/browser/places/tag.png                                 (places/tag.png)
+  skin/classic/browser/places/tag@2x.png                              (places/tag@2x.png)
+  skin/classic/browser/places/history.png                             (places/history.png)
+  skin/classic/browser/places/history@2x.png                          (places/history@2x.png)
+  skin/classic/browser/places/allBookmarks.png                        (places/allBookmarks.png)
+  skin/classic/browser/places/unsortedBookmarks.png                   (places/unsortedBookmarks.png)
+  skin/classic/browser/places/downloads.png                           (places/downloads.png)
+  skin/classic/browser/places/expander-closed-active.png              (places/expander-closed-active.png)
+  skin/classic/browser/places/expander-open-active.png                (places/expander-open-active.png)
+  skin/classic/browser/places/livemark-item.png                       (places/livemark-item.png)
+  skin/classic/browser/places/expander-closed.png                     (places/expander-closed.png)
+  skin/classic/browser/places/expander-open.png                       (places/expander-open.png)
+  skin/classic/browser/permissions/aboutPermissions.css               (permissions/aboutPermissions.css)
+  skin/classic/browser/preferences/alwaysAsk.png                      (preferences/alwaysAsk.png)
+  skin/classic/browser/preferences/application.png                    (preferences/application.png)
+  skin/classic/browser/preferences/mail.png                           (preferences/mail.png)
+  skin/classic/browser/preferences/Options.png                        (preferences/Options.png)
 #ifdef MOZ_SERVICES_SYNC
-        skin/classic/browser/preferences/Options-sync.png            (preferences/Options-sync.png)
+  skin/classic/browser/preferences/Options-sync.png                   (preferences/Options-sync.png)
 #endif
-        skin/classic/browser/preferences/saveFile.png                (preferences/saveFile.png)
-*       skin/classic/browser/preferences/preferences.css             (preferences/preferences.css)
-        skin/classic/browser/preferences/applications.css            (preferences/applications.css)
+  skin/classic/browser/preferences/saveFile.png                       (preferences/saveFile.png)
+* skin/classic/browser/preferences/preferences.css                    (preferences/preferences.css)
+  skin/classic/browser/preferences/applications.css                   (preferences/applications.css)
 #ifdef MOZ_BROWSER_STATUSBAR
-        skin/classic/browser/statusbar/dynamic.css                   (../shared/statusbar/dynamic.css)
-*       skin/classic/browser/statusbar/overlay.css                   (statusbar/overlay.css)
-*       skin/classic/browser/statusbar/prefs.css                     (statusbar/prefs.css)
-        skin/classic/browser/statusbar/pulse.png                     (../shared/statusbar/pulse.png)
-        skin/classic/browser/statusbar/pms16.png                     (../shared/statusbar/pms16.png)
-        skin/classic/browser/statusbar/pms24.png                     (../shared/statusbar/pms24.png)
-        skin/classic/browser/statusbar/throbber-idle.png             (../shared/statusbar/throbber-idle.png)
-        skin/classic/browser/statusbar/throbberStatic.png            (../shared/statusbar/throbberStatic.png)
+  skin/classic/browser/statusbar/dynamic.css                          (../shared/statusbar/dynamic.css)
+* skin/classic/browser/statusbar/overlay.css                          (statusbar/overlay.css)
+* skin/classic/browser/statusbar/prefs.css                            (statusbar/prefs.css)
+  skin/classic/browser/statusbar/pulse.png                            (../shared/statusbar/pulse.png)
+  skin/classic/browser/statusbar/pms16.png                            (../shared/statusbar/pms16.png)
+  skin/classic/browser/statusbar/pms24.png                            (../shared/statusbar/pms24.png)
+  skin/classic/browser/statusbar/throbber-idle.png                    (../shared/statusbar/throbber-idle.png)
+  skin/classic/browser/statusbar/throbberStatic.png                   (../shared/statusbar/throbberStatic.png)
 #endif
-        skin/classic/browser/tabbrowser/alltabs.png                  (tabbrowser/alltabs.png)
-        skin/classic/browser/tabbrowser/alltabs-inverted.png         (tabbrowser/alltabs-inverted.png)
-        skin/classic/browser/tabbrowser/newtab.png                   (tabbrowser/newtab.png)
-        skin/classic/browser/tabbrowser/newtab-inverted.png          (tabbrowser/newtab-inverted.png)
-        skin/classic/browser/tabbrowser/connecting.png               (tabbrowser/connecting.png)
-        skin/classic/browser/tabbrowser/loading.png                  (tabbrowser/loading.png)
-        skin/classic/browser/tabbrowser/tab-arrow-left.png           (tabbrowser/tab-arrow-left.png)
-        skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png  (tabbrowser/tab-arrow-left-inverted.png)
-        skin/classic/browser/tabbrowser/tab-overflow-border.png      (tabbrowser/tab-overflow-border.png)
-        skin/classic/browser/tabbrowser/tabDragIndicator.png         (tabbrowser/tabDragIndicator.png)
-        skin/classic/browser/tabbrowser/tab-audio.svg                (../shared/tabbrowser/tab-audio.svg)
-        skin/classic/browser/tabbrowser/tab-audio-small.svg          (../shared/tabbrowser/tab-audio-small.svg)
+  skin/classic/browser/tabbrowser/alltabs.png                         (tabbrowser/alltabs.png)
+  skin/classic/browser/tabbrowser/alltabs-inverted.png                (tabbrowser/alltabs-inverted.png)
+  skin/classic/browser/tabbrowser/newtab.png                          (tabbrowser/newtab.png)
+  skin/classic/browser/tabbrowser/newtab-inverted.png                 (tabbrowser/newtab-inverted.png)
+  skin/classic/browser/tabbrowser/connecting.png                      (tabbrowser/connecting.png)
+  skin/classic/browser/tabbrowser/loading.png                         (tabbrowser/loading.png)
+  skin/classic/browser/tabbrowser/tab-arrow-left.png                  (tabbrowser/tab-arrow-left.png)
+  skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png         (tabbrowser/tab-arrow-left-inverted.png)
+  skin/classic/browser/tabbrowser/tab-overflow-border.png             (tabbrowser/tab-overflow-border.png)
+  skin/classic/browser/tabbrowser/tabDragIndicator.png                (tabbrowser/tabDragIndicator.png)
+  skin/classic/browser/tabbrowser/tab-audio.svg                       (../shared/tabbrowser/tab-audio.svg)
+  skin/classic/browser/tabbrowser/tab-audio-small.svg                 (../shared/tabbrowser/tab-audio-small.svg)
 #ifdef MOZ_SERVICES_SYNC
-        skin/classic/browser/sync-throbber.png
-        skin/classic/browser/sync-16.png
-        skin/classic/browser/sync-32.png
-        skin/classic/browser/sync-128.png
-        skin/classic/browser/sync-bg.png
-        skin/classic/browser/sync-desktopIcon.png
-        skin/classic/browser/sync-mobileIcon.png
-        skin/classic/browser/syncSetup.css
-        skin/classic/browser/syncCommon.css
-        skin/classic/browser/syncQuota.css
-        skin/classic/browser/syncProgress.css
+  skin/classic/browser/sync-throbber.png
+  skin/classic/browser/sync-16.png
+  skin/classic/browser/sync-32.png
+  skin/classic/browser/sync-128.png
+  skin/classic/browser/sync-bg.png
+  skin/classic/browser/sync-desktopIcon.png
+  skin/classic/browser/sync-mobileIcon.png
+  skin/classic/browser/syncSetup.css
+  skin/classic/browser/syncCommon.css
+  skin/classic/browser/syncQuota.css
+  skin/classic/browser/syncProgress.css
 #endif
diff --git a/application/palemoon/themes/windows/communicator/jar.mn b/application/palemoon/themes/windows/communicator/jar.mn
index dfd20c523..612d13335 100644
--- a/application/palemoon/themes/windows/communicator/jar.mn
+++ b/application/palemoon/themes/windows/communicator/jar.mn
@@ -4,4 +4,4 @@
 
 browser.jar:
 % skin communicator classic/1.0 %skin/classic/communicator/
-        skin/classic/communicator/communicator.css
+  skin/classic/communicator/communicator.css
diff --git a/application/palemoon/themes/windows/jar.mn b/application/palemoon/themes/windows/jar.mn
index 724bac689..8a00d8b70 100644
--- a/application/palemoon/themes/windows/jar.mn
+++ b/application/palemoon/themes/windows/jar.mn
@@ -4,164 +4,164 @@
 
 browser.jar:
 % skin browser classic/1.0 %skin/classic/browser/
-        skin/classic/browser/sanitizeDialog.css
-*       skin/classic/browser/aboutPrivateBrowsing.css
-*       skin/classic/browser/aboutSessionRestore.css
-        skin/classic/browser/aboutSessionRestore-window-icon.png
-        skin/classic/browser/aboutCertError.css
-        skin/classic/browser/aboutCertError_sectionCollapsed.png
-        skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png
-        skin/classic/browser/aboutCertError_sectionExpanded.png
+  skin/classic/browser/sanitizeDialog.css
+* skin/classic/browser/aboutPrivateBrowsing.css
+* skin/classic/browser/aboutSessionRestore.css
+  skin/classic/browser/aboutSessionRestore-window-icon.png
+  skin/classic/browser/aboutCertError.css
+  skin/classic/browser/aboutCertError_sectionCollapsed.png
+  skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png
+  skin/classic/browser/aboutCertError_sectionExpanded.png
 #ifdef MOZ_SERVICES_SYNC
-        skin/classic/browser/aboutSyncTabs.css
+  skin/classic/browser/aboutSyncTabs.css
 #endif
-*       skin/classic/browser/autocomplete.css
-        skin/classic/browser/actionicon-tab.png
-        skin/classic/browser/appmenu-icons.png
-        skin/classic/browser/appmenu-dropmarker.png
-*       skin/classic/browser/browser.css
-        skin/classic/browser/caption-buttons.svg
-        skin/classic/browser/click-to-play-warning-stripes.png
-*       skin/classic/browser/engineManager.css
-        skin/classic/browser/Geolocation-16.png
-        skin/classic/browser/Geolocation-64.png
-        skin/classic/browser/Info.png
-        skin/classic/browser/identity.png
-        skin/classic/browser/imagedocument.png					
-        skin/classic/browser/identity-icons-generic.png
-        skin/classic/browser/identity-icons-https.png
-        skin/classic/browser/identity-icons-https-ev.png
-        skin/classic/browser/identity-icons-https-mixed-active.png
-        skin/classic/browser/keyhole-forward-mask.svg
-        skin/classic/browser/KUI-background.png
-        skin/classic/browser/KUI-close.png
-        skin/classic/browser/livemark-folder.png
-        skin/classic/browser/menu-back.png
-        skin/classic/browser/menu-forward.png
-        skin/classic/browser/mixed-content-blocked-16.png
-        skin/classic/browser/mixed-content-blocked-64.png
-        skin/classic/browser/monitor.png
-        skin/classic/browser/monitor_16-10.png
-        skin/classic/browser/pageInfo.css
-        skin/classic/browser/pageInfo.png
-        skin/classic/browser/page-livemarks.png                      (feeds/feedIcon16.png)
-        skin/classic/browser/pointerLock-16.png
-        skin/classic/browser/pointerLock-64.png
-        skin/classic/browser/Privacy-16.png
-        skin/classic/browser/Privacy-32.png
-        skin/classic/browser/Privacy-48.png
-        skin/classic/browser/Privacy-64.png
-        skin/classic/browser/privatebrowsing-light.png
-        skin/classic/browser/privatebrowsing-dark.png
-        skin/classic/browser/reload-stop-go.png
-        skin/classic/browser/sanitize.png
-        skin/classic/browser/searchbar.css
-        skin/classic/browser/searchbar-dropdown-arrow.png
-        skin/classic/browser/Secure24.png
-        skin/classic/browser/setDesktopBackground.css
-        skin/classic/browser/slowStartup-16.png
-        skin/classic/browser/Toolbar.svg
-        skin/classic/browser/Toolbar-glass.svg
-        skin/classic/browser/Toolbar-inverted.svg
-        skin/classic/browser/toolbarbutton-dropdown-arrow.png
-        skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png
-        skin/classic/browser/urlbar-arrow.png
-        skin/classic/browser/urlbar-popup-blocked.png
-        skin/classic/browser/urlbar-history-dropmarker.png
-        skin/classic/browser/web-notifications-icon.svg
-        skin/classic/browser/web-notifications-tray.svg
-        skin/classic/browser/notification-pluginNormal.png           (../shared/plugins/notification-pluginNormal.png)
-        skin/classic/browser/notification-pluginAlert.png            (../shared/plugins/notification-pluginAlert.png)
-        skin/classic/browser/notification-pluginBlocked.png          (../shared/plugins/notification-pluginBlocked.png)
+* skin/classic/browser/autocomplete.css
+  skin/classic/browser/actionicon-tab.png
+  skin/classic/browser/appmenu-icons.png
+  skin/classic/browser/appmenu-dropmarker.png
+* skin/classic/browser/browser.css
+  skin/classic/browser/caption-buttons.svg
+  skin/classic/browser/click-to-play-warning-stripes.png
+* skin/classic/browser/engineManager.css
+  skin/classic/browser/Geolocation-16.png
+  skin/classic/browser/Geolocation-64.png
+  skin/classic/browser/Info.png
+  skin/classic/browser/identity.png
+  skin/classic/browser/imagedocument.png					
+  skin/classic/browser/identity-icons-generic.png
+  skin/classic/browser/identity-icons-https.png
+  skin/classic/browser/identity-icons-https-ev.png
+  skin/classic/browser/identity-icons-https-mixed-active.png
+  skin/classic/browser/keyhole-forward-mask.svg
+  skin/classic/browser/KUI-background.png
+  skin/classic/browser/KUI-close.png
+  skin/classic/browser/livemark-folder.png
+  skin/classic/browser/menu-back.png
+  skin/classic/browser/menu-forward.png
+  skin/classic/browser/mixed-content-blocked-16.png
+  skin/classic/browser/mixed-content-blocked-64.png
+  skin/classic/browser/monitor.png
+  skin/classic/browser/monitor_16-10.png
+  skin/classic/browser/pageInfo.css
+  skin/classic/browser/pageInfo.png
+  skin/classic/browser/page-livemarks.png                             (feeds/feedIcon16.png)
+  skin/classic/browser/pointerLock-16.png
+  skin/classic/browser/pointerLock-64.png
+  skin/classic/browser/Privacy-16.png
+  skin/classic/browser/Privacy-32.png
+  skin/classic/browser/Privacy-48.png
+  skin/classic/browser/Privacy-64.png
+  skin/classic/browser/privatebrowsing-light.png
+  skin/classic/browser/privatebrowsing-dark.png
+  skin/classic/browser/reload-stop-go.png
+  skin/classic/browser/sanitize.png
+  skin/classic/browser/searchbar.css
+  skin/classic/browser/searchbar-dropdown-arrow.png
+  skin/classic/browser/Secure24.png
+  skin/classic/browser/setDesktopBackground.css
+  skin/classic/browser/slowStartup-16.png
+  skin/classic/browser/Toolbar.svg
+  skin/classic/browser/Toolbar-glass.svg
+  skin/classic/browser/Toolbar-inverted.svg
+  skin/classic/browser/toolbarbutton-dropdown-arrow.png
+  skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png
+  skin/classic/browser/urlbar-arrow.png
+  skin/classic/browser/urlbar-popup-blocked.png
+  skin/classic/browser/urlbar-history-dropmarker.png
+  skin/classic/browser/web-notifications-icon.svg
+  skin/classic/browser/web-notifications-tray.svg
+  skin/classic/browser/notification-pluginNormal.png                  (../shared/plugins/notification-pluginNormal.png)
+  skin/classic/browser/notification-pluginAlert.png                   (../shared/plugins/notification-pluginAlert.png)
+  skin/classic/browser/notification-pluginBlocked.png                 (../shared/plugins/notification-pluginBlocked.png)
 #ifdef MOZ_WEBRTC
-        skin/classic/browser/webRTC-shareDevice-16.png
-        skin/classic/browser/webRTC-shareDevice-64.png
-        skin/classic/browser/webRTC-sharingDevice-16.png
+  skin/classic/browser/webRTC-shareDevice-16.png
+  skin/classic/browser/webRTC-shareDevice-64.png
+  skin/classic/browser/webRTC-sharingDevice-16.png
 #endif
-        skin/classic/browser/downloads/buttons.png                   (downloads/buttons.png)
-        skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png)
-        skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png)
-        skin/classic/browser/downloads/download-summary.png          (downloads/download-summary.png)
-        skin/classic/browser/downloads/downloads.css                 (downloads/downloads.css)
-        skin/classic/browser/downloads/allDownloadsViewOverlay.css   (downloads/allDownloadsViewOverlay.css)
-        skin/classic/browser/downloads/contentAreaDownloadsView.css  (downloads/contentAreaDownloadsView.css)
-        skin/classic/browser/feeds/feedIcon.png                      (feeds/feedIcon.png)
-        skin/classic/browser/feeds/feedIcon16.png                    (feeds/feedIcon16.png)
-        skin/classic/browser/feeds/videoFeedIcon.png                 (feeds/feedIcon.png)
-        skin/classic/browser/feeds/videoFeedIcon16.png               (feeds/feedIcon16.png)
-        skin/classic/browser/feeds/audioFeedIcon.png                 (feeds/feedIcon.png)
-        skin/classic/browser/feeds/audioFeedIcon16.png               (feeds/feedIcon16.png)
-        skin/classic/browser/feeds/feed-icons-16.png                 (feeds/feed-icons-16.png)
-        skin/classic/browser/feeds/subscribe.css                     (feeds/subscribe.css)
-        skin/classic/browser/feeds/subscribe-ui.css                  (feeds/subscribe-ui.css)
-*       skin/classic/browser/newtab/newTab.css                       (newtab/newTab.css)
-        skin/classic/browser/newtab/controls.png                     (../shared/newtab/controls.png)
-        skin/classic/browser/newtab/noise.png                        (../shared/newtab/noise.png)
-        skin/classic/browser/newtab/pinned.png                       (../shared/newtab/pinned.png)
-        skin/classic/browser/places/places.css                       (places/places.css)
-*       skin/classic/browser/places/organizer.css                    (places/organizer.css)
-        skin/classic/browser/places/editBookmark.png                 (places/editBookmark.png)
-        skin/classic/browser/places/bookmark.png                     (places/bookmark.png)
-        skin/classic/browser/places/query.png                        (places/query.png)
-        skin/classic/browser/places/bookmarksMenu.png                (places/bookmarksMenu.png)
-        skin/classic/browser/places/bookmarksToolbar.png             (places/bookmarksToolbar.png)
-        skin/classic/browser/places/calendar.png                     (places/calendar.png)
-        skin/classic/browser/places/toolbarDropMarker.png            (places/toolbarDropMarker.png)
-        skin/classic/browser/places/editBookmarkOverlay.css          (places/editBookmarkOverlay.css)
-        skin/classic/browser/places/libraryToolbar.png               (places/libraryToolbar.png)
-        skin/classic/browser/places/starred48.png                    (places/starred48.png)
-        skin/classic/browser/places/unstarred48.png                  (places/unstarred48.png)
-        skin/classic/browser/places/tag.png                          (places/tag.png)
-        skin/classic/browser/places/history.png                      (places/history.png)
-        skin/classic/browser/places/allBookmarks.png                 (places/allBookmarks.png)
-        skin/classic/browser/places/unsortedBookmarks.png            (places/unsortedBookmarks.png)
-        skin/classic/browser/places/downloads.png                    (places/downloads.png)
-        skin/classic/browser/places/livemark-item.png                (places/livemark-item.png)
-        skin/classic/browser/permissions/aboutPermissions.css        (permissions/aboutPermissions.css)
-        skin/classic/browser/preferences/alwaysAsk.png               (preferences/alwaysAsk.png)
-        skin/classic/browser/preferences/application.png             (preferences/application.png)
-        skin/classic/browser/preferences/mail.png                    (preferences/mail.png)
-        skin/classic/browser/preferences/Options.png                 (preferences/Options.png)
+  skin/classic/browser/downloads/buttons.png                          (downloads/buttons.png)
+  skin/classic/browser/downloads/download-notification-finish.png     (downloads/download-notification-finish.png)
+  skin/classic/browser/downloads/download-notification-start.png      (downloads/download-notification-start.png)
+  skin/classic/browser/downloads/download-summary.png                 (downloads/download-summary.png)
+  skin/classic/browser/downloads/downloads.css                        (downloads/downloads.css)
+  skin/classic/browser/downloads/allDownloadsViewOverlay.css          (downloads/allDownloadsViewOverlay.css)
+  skin/classic/browser/downloads/contentAreaDownloadsView.css         (downloads/contentAreaDownloadsView.css)
+  skin/classic/browser/feeds/feedIcon.png                             (feeds/feedIcon.png)
+  skin/classic/browser/feeds/feedIcon16.png                           (feeds/feedIcon16.png)
+  skin/classic/browser/feeds/videoFeedIcon.png                        (feeds/feedIcon.png)
+  skin/classic/browser/feeds/videoFeedIcon16.png                      (feeds/feedIcon16.png)
+  skin/classic/browser/feeds/audioFeedIcon.png                        (feeds/feedIcon.png)
+  skin/classic/browser/feeds/audioFeedIcon16.png                      (feeds/feedIcon16.png)
+  skin/classic/browser/feeds/feed-icons-16.png                        (feeds/feed-icons-16.png)
+  skin/classic/browser/feeds/subscribe.css                            (feeds/subscribe.css)
+  skin/classic/browser/feeds/subscribe-ui.css                         (feeds/subscribe-ui.css)
+* skin/classic/browser/newtab/newTab.css                              (newtab/newTab.css)
+  skin/classic/browser/newtab/controls.png                            (../shared/newtab/controls.png)
+  skin/classic/browser/newtab/noise.png                               (../shared/newtab/noise.png)
+  skin/classic/browser/newtab/pinned.png                              (../shared/newtab/pinned.png)
+  skin/classic/browser/places/places.css                              (places/places.css)
+* skin/classic/browser/places/organizer.css                           (places/organizer.css)
+  skin/classic/browser/places/editBookmark.png                        (places/editBookmark.png)
+  skin/classic/browser/places/bookmark.png                            (places/bookmark.png)
+  skin/classic/browser/places/query.png                               (places/query.png)
+  skin/classic/browser/places/bookmarksMenu.png                       (places/bookmarksMenu.png)
+  skin/classic/browser/places/bookmarksToolbar.png                    (places/bookmarksToolbar.png)
+  skin/classic/browser/places/calendar.png                            (places/calendar.png)
+  skin/classic/browser/places/toolbarDropMarker.png                   (places/toolbarDropMarker.png)
+  skin/classic/browser/places/editBookmarkOverlay.css                 (places/editBookmarkOverlay.css)
+  skin/classic/browser/places/libraryToolbar.png                      (places/libraryToolbar.png)
+  skin/classic/browser/places/starred48.png                           (places/starred48.png)
+  skin/classic/browser/places/unstarred48.png                         (places/unstarred48.png)
+  skin/classic/browser/places/tag.png                                 (places/tag.png)
+  skin/classic/browser/places/history.png                             (places/history.png)
+  skin/classic/browser/places/allBookmarks.png                        (places/allBookmarks.png)
+  skin/classic/browser/places/unsortedBookmarks.png                   (places/unsortedBookmarks.png)
+  skin/classic/browser/places/downloads.png                           (places/downloads.png)
+  skin/classic/browser/places/livemark-item.png                       (places/livemark-item.png)
+  skin/classic/browser/permissions/aboutPermissions.css               (permissions/aboutPermissions.css)
+  skin/classic/browser/preferences/alwaysAsk.png                      (preferences/alwaysAsk.png)
+  skin/classic/browser/preferences/application.png                    (preferences/application.png)
+  skin/classic/browser/preferences/mail.png                           (preferences/mail.png)
+  skin/classic/browser/preferences/Options.png                        (preferences/Options.png)
 #ifdef MOZ_SERVICES_SYNC
-        skin/classic/browser/preferences/Options-sync.png            (preferences/Options-sync.png)
+  skin/classic/browser/preferences/Options-sync.png                   (preferences/Options-sync.png)
 #endif
-        skin/classic/browser/preferences/saveFile.png                (preferences/saveFile.png)
-*       skin/classic/browser/preferences/preferences.css             (preferences/preferences.css)
-        skin/classic/browser/preferences/applications.css            (preferences/applications.css)
+  skin/classic/browser/preferences/saveFile.png                       (preferences/saveFile.png)
+* skin/classic/browser/preferences/preferences.css                    (preferences/preferences.css)
+  skin/classic/browser/preferences/applications.css                   (preferences/applications.css)
 #ifdef MOZ_BROWSER_STATUSBAR
-        skin/classic/browser/statusbar/dynamic.css                   (../shared/statusbar/dynamic.css)
-*       skin/classic/browser/statusbar/overlay.css                   (statusbar/overlay.css)
-*       skin/classic/browser/statusbar/prefs.css                     (statusbar/prefs.css)
-        skin/classic/browser/statusbar/pulse.png                     (../shared/statusbar/pulse.png)
-        skin/classic/browser/statusbar/pms16.png                     (../shared/statusbar/pms16.png)
-        skin/classic/browser/statusbar/pms24.png                     (../shared/statusbar/pms24.png)
-        skin/classic/browser/statusbar/throbber-idle.png             (../shared/statusbar/throbber-idle.png)
-        skin/classic/browser/statusbar/throbberStatic.png            (../shared/statusbar/throbberStatic.png)
+  skin/classic/browser/statusbar/dynamic.css                          (../shared/statusbar/dynamic.css)
+* skin/classic/browser/statusbar/overlay.css                          (statusbar/overlay.css)
+* skin/classic/browser/statusbar/prefs.css                            (statusbar/prefs.css)
+  skin/classic/browser/statusbar/pulse.png                            (../shared/statusbar/pulse.png)
+  skin/classic/browser/statusbar/pms16.png                            (../shared/statusbar/pms16.png)
+  skin/classic/browser/statusbar/pms24.png                            (../shared/statusbar/pms24.png)
+  skin/classic/browser/statusbar/throbber-idle.png                    (../shared/statusbar/throbber-idle.png)
+  skin/classic/browser/statusbar/throbberStatic.png                   (../shared/statusbar/throbberStatic.png)
 #endif
-        skin/classic/browser/tabbrowser/alltabs.png                  (tabbrowser/alltabs.png)
-        skin/classic/browser/tabbrowser/alltabs-inverted.png         (tabbrowser/alltabs-inverted.png)
-        skin/classic/browser/tabbrowser/newtab.png                   (tabbrowser/newtab.png)
-        skin/classic/browser/tabbrowser/newtab-glass.png             (tabbrowser/newtab-glass.png)
-        skin/classic/browser/tabbrowser/newtab-inverted.png          (tabbrowser/newtab-inverted.png)
-        skin/classic/browser/tabbrowser/connecting.png               (tabbrowser/connecting.png)
-        skin/classic/browser/tabbrowser/loading.png                  (tabbrowser/loading.png)
-        skin/classic/browser/tabbrowser/tab-arrow-left.png           (tabbrowser/tab-arrow-left.png)
-        skin/classic/browser/tabbrowser/tab-arrow-left-glass.png     (tabbrowser/tab-arrow-left-glass.png)
-        skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png  (tabbrowser/tab-arrow-left-inverted.png)
-        skin/classic/browser/tabbrowser/tab-overflow-border.png      (tabbrowser/tab-overflow-border.png)
-        skin/classic/browser/tabbrowser/tabDragIndicator.png         (tabbrowser/tabDragIndicator.png)
-        skin/classic/browser/tabbrowser/tab-audio.svg                (../shared/tabbrowser/tab-audio.svg)
-        skin/classic/browser/tabbrowser/tab-audio-small.svg          (../shared/tabbrowser/tab-audio-small.svg)
+  skin/classic/browser/tabbrowser/alltabs.png                         (tabbrowser/alltabs.png)
+  skin/classic/browser/tabbrowser/alltabs-inverted.png                (tabbrowser/alltabs-inverted.png)
+  skin/classic/browser/tabbrowser/newtab.png                          (tabbrowser/newtab.png)
+  skin/classic/browser/tabbrowser/newtab-glass.png                    (tabbrowser/newtab-glass.png)
+  skin/classic/browser/tabbrowser/newtab-inverted.png                 (tabbrowser/newtab-inverted.png)
+  skin/classic/browser/tabbrowser/connecting.png                      (tabbrowser/connecting.png)
+  skin/classic/browser/tabbrowser/loading.png                         (tabbrowser/loading.png)
+  skin/classic/browser/tabbrowser/tab-arrow-left.png                  (tabbrowser/tab-arrow-left.png)
+  skin/classic/browser/tabbrowser/tab-arrow-left-glass.png            (tabbrowser/tab-arrow-left-glass.png)
+  skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png         (tabbrowser/tab-arrow-left-inverted.png)
+  skin/classic/browser/tabbrowser/tab-overflow-border.png             (tabbrowser/tab-overflow-border.png)
+  skin/classic/browser/tabbrowser/tabDragIndicator.png                (tabbrowser/tabDragIndicator.png)
+  skin/classic/browser/tabbrowser/tab-audio.svg                       (../shared/tabbrowser/tab-audio.svg)
+  skin/classic/browser/tabbrowser/tab-audio-small.svg                 (../shared/tabbrowser/tab-audio-small.svg)
 #ifdef MOZ_SERVICES_SYNC
-        skin/classic/browser/sync-throbber.png
-        skin/classic/browser/sync-16.png
-        skin/classic/browser/sync-32.png
-        skin/classic/browser/sync-128.png
-        skin/classic/browser/sync-bg.png
-        skin/classic/browser/sync-desktopIcon.png
-        skin/classic/browser/sync-mobileIcon.png
-        skin/classic/browser/syncSetup.css
-        skin/classic/browser/syncCommon.css
-        skin/classic/browser/syncQuota.css
-        skin/classic/browser/syncProgress.css
+  skin/classic/browser/sync-throbber.png
+  skin/classic/browser/sync-16.png
+  skin/classic/browser/sync-32.png
+  skin/classic/browser/sync-128.png
+  skin/classic/browser/sync-bg.png
+  skin/classic/browser/sync-desktopIcon.png
+  skin/classic/browser/sync-mobileIcon.png
+  skin/classic/browser/syncSetup.css
+  skin/classic/browser/syncCommon.css
+  skin/classic/browser/syncQuota.css
+  skin/classic/browser/syncProgress.css
 #endif