Merge remote-tracking branch 'origin/master' into custom

2026-09-05 07:18:39 +09:00 · 2021-05-10 10:08:49 +08:00 · 2021-05-10 10:08:49 +08:00 · 1d77ae7705
commit 1d77ae7705
parent 8eb3a2701c 214ac352e5
359 changed files with 10 additions and 52627 deletions
--- a/application/palemoon/base/moz.build
+++ b/application/palemoon/base/moz.build
@ -6,11 +6,9 @@
 DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
    DEFINES['HAVE_SHELL_SERVICE'] = 1
    DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
    DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1

 JAR_MANIFESTS += ['jar.mn']
--- a/application/palemoon/branding/shared/branding.mozbuild
+++ b/application/palemoon/branding/shared/branding.mozbuild
@ -30,14 +30,6 @@ def ApplicationBranding():
            'wizHeaderRTL.bmp',
            'wizWatermark.bmp',
        ]
-    elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-        BRANDING_FILES += [
-            '../shared/background.png',
-            'disk.icns',
-            'document.icns',
-            'dsstore',
-            'firefox.icns',
-        ]
    elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
        BRANDING_FILES += [
            'default16.png',
--- a/application/palemoon/branding/unofficial/disk.icns
+++ b/application/palemoon/branding/unofficial/disk.icns
--- a/application/palemoon/branding/unofficial/document.icns
+++ b/application/palemoon/branding/unofficial/document.icns
--- a/application/palemoon/branding/unofficial/dsstore
+++ b/application/palemoon/branding/unofficial/dsstore
--- a/application/palemoon/branding/unofficial/firefox.icns
+++ b/application/palemoon/branding/unofficial/firefox.icns
--- a/application/palemoon/components/build/moz.build
+++ b/application/palemoon/components/build/moz.build
@ -29,7 +29,6 @@ if CONFIG['OS_ARCH'] == 'WINNT':
        'netapi32.dll',
    ]

-# Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
-# GTK2: Need to link with glib for GNOME shell service
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'gtk2', 'gtk3'):
+# GTK: Need to link with glib for GNOME shell service
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
    OS_LIBS += CONFIG['TK_LIBS']
--- a/application/palemoon/components/preferences/moz.build
+++ b/application/palemoon/components/preferences/moz.build
@ -7,7 +7,7 @@
 for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
    DEFINES[var] = CONFIG[var]

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
    DEFINES['HAVE_SHELL_SERVICE'] = 1

 JAR_MANIFESTS += ['jar.mn']
--- a/application/palemoon/components/shell/moz.build
+++ b/application/palemoon/components/shell/moz.build
@ -9,8 +9,6 @@ XPIDL_SOURCES += ['nsIShellService.idl']

 if CONFIG['OS_ARCH'] == 'WINNT':
    XPIDL_SOURCES += ['nsIWindowsShellService.idl']
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    XPIDL_SOURCES += ['nsIMacShellService.idl']
 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
    XPIDL_SOURCES += ['nsIGNOMEShellService.idl']

@ -18,8 +16,6 @@ XPIDL_MODULE = 'shellservice'

 if CONFIG['OS_ARCH'] == 'WINNT':
    SOURCES += ['nsWindowsShellService.cpp']
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    SOURCES += ['nsMacShellService.cpp']
 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
    SOURCES += ['nsGNOMEShellService.cpp']

--- a/application/palemoon/components/shell/nsIMacShellService.idl
+++ b/application/palemoon/components/shell/nsIMacShellService.idl
@ -1,15 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/. */
-
-#include "nsIShellService.idl"
-
-[scriptable, uuid(387fdc80-0077-4b60-a0d9-d9e80a83ba64)]
-interface nsIMacShellService : nsIShellService
-{
-  const long APPLICATION_KEYCHAIN_ACCESS  = 2;
-  const long APPLICATION_NETWORK          = 3;
-  const long APPLICATION_DESKTOP          = 4;
-};
-
--- a/application/palemoon/components/shell/nsMacShellService.cpp
+++ b/application/palemoon/components/shell/nsMacShellService.cpp
@ -1,434 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/. */
-
-#include "nsDirectoryServiceDefs.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMHTMLImageElement.h"
-#include "nsIImageLoadingContent.h"
-#include "nsIDocument.h"
-#include "nsIContent.h"
-#include "nsILocalFileMac.h"
-#include "nsIObserverService.h"
-#include "nsIPrefService.h"
-#include "nsIServiceManager.h"
-#include "nsIStringBundle.h"
-#include "nsIURL.h"
-#include "nsIWebBrowserPersist.h"
-#include "nsMacShellService.h"
-#include "nsIProperties.h"
-#include "nsServiceManagerUtils.h"
-#include "nsShellService.h"
-#include "nsStringAPI.h"
-#include "nsIDocShell.h"
-#include "nsILoadContext.h"
-
-#include <CoreFoundation/CoreFoundation.h>
-#include <ApplicationServices/ApplicationServices.h>
-
-#define NETWORK_PREFPANE NS_LITERAL_CSTRING("/System/Library/PreferencePanes/Network.prefPane")
-#define DESKTOP_PREFPANE NS_LITERAL_CSTRING("/System/Library/PreferencePanes/DesktopScreenEffectsPref.prefPane")
-
-#define SAFARI_BUNDLE_IDENTIFIER "com.apple.Safari"
-
-NS_IMPL_ISUPPORTS(nsMacShellService, nsIMacShellService, nsIShellService, nsIWebProgressListener)
-
-NS_IMETHODIMP
-nsMacShellService::IsDefaultBrowser(bool aStartupCheck,
-                                    bool aForAllTypes,
-                                    bool* aIsDefaultBrowser)
-{
-  *aIsDefaultBrowser = false;
-
-  CFStringRef firefoxID = ::CFBundleGetIdentifier(::CFBundleGetMainBundle());
-  if (!firefoxID) {
-    // CFBundleGetIdentifier is expected to return nullptr only if the specified
-    // bundle doesn't have a bundle identifier in its plist. In this case, that
-    // means a failure, since our bundle does have an identifier.
-    return NS_ERROR_FAILURE;
-  }
-
-  // Get the default http handler's bundle ID (or nullptr if it has not been
-  // explicitly set)
-  CFStringRef defaultBrowserID = ::LSCopyDefaultHandlerForURLScheme(CFSTR("http"));
-  if (defaultBrowserID) {
-    *aIsDefaultBrowser = ::CFStringCompare(firefoxID, defaultBrowserID, 0) == kCFCompareEqualTo;
-    ::CFRelease(defaultBrowserID);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::SetDefaultBrowser(bool aClaimAllTypes, bool aForAllUsers)
-{
-  // Note: We don't support aForAllUsers on Mac OS X.
-
-  CFStringRef firefoxID = ::CFBundleGetIdentifier(::CFBundleGetMainBundle());
-  if (!firefoxID) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (::LSSetDefaultHandlerForURLScheme(CFSTR("http"), firefoxID) != noErr) {
-    return NS_ERROR_FAILURE;
-  }
-  if (::LSSetDefaultHandlerForURLScheme(CFSTR("https"), firefoxID) != noErr) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (aClaimAllTypes) {
-    if (::LSSetDefaultHandlerForURLScheme(CFSTR("ftp"), firefoxID) != noErr) {
-      return NS_ERROR_FAILURE;
-    }
-    if (::LSSetDefaultRoleHandlerForContentType(kUTTypeHTML, kLSRolesAll, firefoxID) != noErr) {
-      return NS_ERROR_FAILURE;
-    }
-  }
-
-  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
-  if (prefs) {
-    (void) prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, true);
-    // Reset the number of times the dialog should be shown
-    // before it is silenced.
-    (void) prefs->SetIntPref(PREF_DEFAULTBROWSERCHECKCOUNT, 0);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::SetDesktopBackground(nsIDOMElement* aElement, 
-                                        int32_t aPosition)
-{
-  // Note: We don't support aPosition on OS X.
-
-  // Get the image URI:
-  nsresult rv;
-  nsCOMPtr<nsIImageLoadingContent> imageContent = do_QueryInterface(aElement,
-                                                                    &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-  nsCOMPtr<nsIURI> imageURI;
-  rv = imageContent->GetCurrentURI(getter_AddRefs(imageURI));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // We need the referer URI for nsIWebBrowserPersist::saveURI
-  nsCOMPtr<nsIContent> content = do_QueryInterface(aElement, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsIURI *docURI = content->OwnerDoc()->GetDocumentURI();
-  if (!docURI)
-    return NS_ERROR_FAILURE;
-
-  // Get the desired image file name
-  nsCOMPtr<nsIURL> imageURL(do_QueryInterface(imageURI));
-  if (!imageURL) {
-    // XXXmano (bug 300293): Non-URL images (e.g. the data: protocol) are not
-    // yet supported. What filename should we take here?
-    return NS_ERROR_NOT_IMPLEMENTED;
-  }
-
-  nsAutoCString fileName;
-  imageURL->GetFileName(fileName);
-  nsCOMPtr<nsIProperties> fileLocator
-    (do_GetService("@mozilla.org/file/directory_service;1", &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Get the current user's "Pictures" folder (That's ~/Pictures):
-  fileLocator->Get(NS_OSX_PICTURE_DOCUMENTS_DIR, NS_GET_IID(nsIFile),
-                   getter_AddRefs(mBackgroundFile));
-  if (!mBackgroundFile)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  nsAutoString fileNameUnicode;
-  CopyUTF8toUTF16(fileName, fileNameUnicode);
-
-  // and add the imgage file name itself:
-  mBackgroundFile->Append(fileNameUnicode);
-
-  // Download the image; the desktop background will be set in OnStateChange()
-  nsCOMPtr<nsIWebBrowserPersist> wbp
-    (do_CreateInstance("@mozilla.org/embedding/browser/nsWebBrowserPersist;1", &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  uint32_t flags = nsIWebBrowserPersist::PERSIST_FLAGS_NO_CONVERSION | 
-                   nsIWebBrowserPersist::PERSIST_FLAGS_REPLACE_EXISTING_FILES |
-                   nsIWebBrowserPersist::PERSIST_FLAGS_FROM_CACHE;
-
-  wbp->SetPersistFlags(flags);
-  wbp->SetProgressListener(this);
-
-  nsCOMPtr<nsILoadContext> loadContext;
-  nsCOMPtr<nsISupports> container = content->OwnerDoc()->GetContainer();
-  nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
-  if (docShell) {
-    loadContext = do_QueryInterface(docShell);
-  }
-
-  return wbp->SaveURI(imageURI, nullptr,
-                      docURI, content->OwnerDoc()->GetReferrerPolicy(),
-                      nullptr, nullptr,
-                      mBackgroundFile, loadContext);
-}
-
-NS_IMETHODIMP
-nsMacShellService::OnProgressChange(nsIWebProgress* aWebProgress,
-                                    nsIRequest* aRequest,
-                                    int32_t aCurSelfProgress,
-                                    int32_t aMaxSelfProgress,
-                                    int32_t aCurTotalProgress,
-                                    int32_t aMaxTotalProgress)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OnLocationChange(nsIWebProgress* aWebProgress,
-                                    nsIRequest* aRequest,
-                                    nsIURI* aLocation,
-                                    uint32_t aFlags)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OnStatusChange(nsIWebProgress* aWebProgress,
-                                  nsIRequest* aRequest,
-                                  nsresult aStatus,
-                                  const char16_t* aMessage)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OnSecurityChange(nsIWebProgress* aWebProgress,
-                                    nsIRequest* aRequest,
-                                    uint32_t aState)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OnStateChange(nsIWebProgress* aWebProgress,
-                                 nsIRequest* aRequest,
-                                 uint32_t aStateFlags,
-                                 nsresult aStatus)
-{
-  if (aStateFlags & STATE_STOP) {
-    nsCOMPtr<nsIObserverService> os(do_GetService("@mozilla.org/observer-service;1"));
-    if (os)
-      os->NotifyObservers(nullptr, "shell:desktop-background-changed", nullptr);
-
-    bool exists = false;
-    mBackgroundFile->Exists(&exists);
-    if (!exists)
-      return NS_OK;
-
-    nsAutoCString nativePath;
-    mBackgroundFile->GetNativePath(nativePath);
-
-    AEDesc tAEDesc = { typeNull, nil };
-    OSErr err = noErr;
-    AliasHandle aliasHandle = nil;
-    FSRef pictureRef;
-    OSStatus status;
-
-    // Convert the path into a FSRef
-    status = ::FSPathMakeRef((const UInt8*)nativePath.get(), &pictureRef,
-                             nullptr);
-    if (status == noErr) {
-      err = ::FSNewAlias(nil, &pictureRef, &aliasHandle);
-      if (err == noErr && aliasHandle == nil)
-        err = paramErr;
-
-      if (err == noErr) {
-        // We need the descriptor (based on the picture file reference)
-        // for the 'Set Desktop Picture' apple event.
-        char handleState = ::HGetState((Handle)aliasHandle);
-        ::HLock((Handle)aliasHandle);
-        err = ::AECreateDesc(typeAlias, *aliasHandle,
-                             GetHandleSize((Handle)aliasHandle), &tAEDesc);
-        // unlock the alias handler
-        ::HSetState((Handle)aliasHandle, handleState);
-        ::DisposeHandle((Handle)aliasHandle);
-      }
-      if (err == noErr) {
-        AppleEvent tAppleEvent;
-        OSType sig = 'MACS';
-        AEBuildError tAEBuildError;
-        // Create a 'Set Desktop Pictue' Apple Event
-        err = ::AEBuildAppleEvent(kAECoreSuite, kAESetData, typeApplSignature,
-                                  &sig, sizeof(OSType), kAutoGenerateReturnID,
-                                  kAnyTransactionID, &tAppleEvent, &tAEBuildError,
-                                  "'----':'obj '{want:type (prop),form:prop" \
-                                  ",seld:type('dpic'),from:'null'()},data:(@)",
-                                  &tAEDesc);
-        if (err == noErr) {
-          AppleEvent reply = { typeNull, nil };
-          // Sent the event we built, the reply event isn't necessary
-          err = ::AESend(&tAppleEvent, &reply, kAENoReply, kAENormalPriority,
-                         kNoTimeOut, nil, nil);
-          ::AEDisposeDesc(&tAppleEvent);
-        }
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OpenApplication(int32_t aApplication)
-{
-  nsresult rv = NS_OK;
-  CFURLRef appURL = nil;
-  OSStatus err = noErr;
-
-  switch (aApplication) {
-  case nsIShellService::APPLICATION_MAIL:
-    {
-      CFURLRef tempURL = ::CFURLCreateWithString(kCFAllocatorDefault,
-                                                 CFSTR("mailto:"), nullptr);
-      err = ::LSGetApplicationForURL(tempURL, kLSRolesAll, nullptr, &appURL);
-      ::CFRelease(tempURL);
-    }
-    break;
-  case nsIShellService::APPLICATION_NEWS:
-    {
-      CFURLRef tempURL = ::CFURLCreateWithString(kCFAllocatorDefault,
-                                                 CFSTR("news:"), nullptr);
-      err = ::LSGetApplicationForURL(tempURL, kLSRolesAll, nullptr, &appURL);
-      ::CFRelease(tempURL);
-    }
-    break;
-  case nsIMacShellService::APPLICATION_KEYCHAIN_ACCESS:
-    err = ::LSGetApplicationForInfo('APPL', 'kcmr', nullptr, kLSRolesAll,
-                                    nullptr, &appURL);
-    break;
-  case nsIMacShellService::APPLICATION_NETWORK:
-    {
-      nsCOMPtr<nsIFile> lf;
-      rv = NS_NewNativeLocalFile(NETWORK_PREFPANE, true, getter_AddRefs(lf));
-      NS_ENSURE_SUCCESS(rv, rv);
-      bool exists;
-      lf->Exists(&exists);
-      if (!exists)
-        return NS_ERROR_FILE_NOT_FOUND;
-      return lf->Launch();
-    }
-  case nsIMacShellService::APPLICATION_DESKTOP:
-    {
-      nsCOMPtr<nsIFile> lf;
-      rv = NS_NewNativeLocalFile(DESKTOP_PREFPANE, true, getter_AddRefs(lf));
-      NS_ENSURE_SUCCESS(rv, rv);
-      bool exists;
-      lf->Exists(&exists);
-      if (!exists)
-        return NS_ERROR_FILE_NOT_FOUND;
-      return lf->Launch();
-    }
-  }
-
-  if (appURL && err == noErr) {
-    err = ::LSOpenCFURLRef(appURL, nullptr);
-    rv = err != noErr ? NS_ERROR_FAILURE : NS_OK;
-
-    ::CFRelease(appURL);
-  }
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsMacShellService::GetDesktopBackgroundColor(uint32_t *aColor)
-{
-  // This method and |SetDesktopBackgroundColor| has no meaning on Mac OS X.
-  // The mac desktop preferences UI uses pictures for the few solid colors it
-  // supports.
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMacShellService::SetDesktopBackgroundColor(uint32_t aColor)
-{
-  // This method and |GetDesktopBackgroundColor| has no meaning on Mac OS X.
-  // The mac desktop preferences UI uses pictures for the few solid colors it
-  // supports.
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OpenApplicationWithURI(nsIFile* aApplication, const nsACString& aURI)
-{
-  nsCOMPtr<nsILocalFileMac> lfm(do_QueryInterface(aApplication));
-  CFURLRef appURL;
-  nsresult rv = lfm->GetCFURL(&appURL);
-  if (NS_FAILED(rv))
-    return rv;
-  
-  const nsCString spec(aURI);
-  const UInt8* uriString = (const UInt8*)spec.get();
-  CFURLRef uri = ::CFURLCreateWithBytes(nullptr, uriString, aURI.Length(),
-                                        kCFStringEncodingUTF8, nullptr);
-  if (!uri) 
-    return NS_ERROR_OUT_OF_MEMORY;
-  
-  CFArrayRef uris = ::CFArrayCreate(nullptr, (const void**)&uri, 1, nullptr);
-  if (!uris) {
-    ::CFRelease(uri);
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  LSLaunchURLSpec launchSpec;
-  launchSpec.appURL = appURL;
-  launchSpec.itemURLs = uris;
-  launchSpec.passThruParams = nullptr;
-  launchSpec.launchFlags = kLSLaunchDefaults;
-  launchSpec.asyncRefCon = nullptr;
-  
-  OSErr err = ::LSOpenFromURLSpec(&launchSpec, nullptr);
-  
-  ::CFRelease(uris);
-  ::CFRelease(uri);
-  
-  return err != noErr ? NS_ERROR_FAILURE : NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::GetDefaultFeedReader(nsIFile** _retval)
-{
-  nsresult rv = NS_ERROR_FAILURE;
-  *_retval = nullptr;
-
-  CFStringRef defaultHandlerID = ::LSCopyDefaultHandlerForURLScheme(CFSTR("feed"));
-  if (!defaultHandlerID) {
-    defaultHandlerID = ::CFStringCreateWithCString(kCFAllocatorDefault,
-                                                   SAFARI_BUNDLE_IDENTIFIER,
-                                                   kCFStringEncodingASCII);
-  }
-
-  CFURLRef defaultHandlerURL = nullptr;
-  OSStatus status = ::LSFindApplicationForInfo(kLSUnknownCreator,
-                                               defaultHandlerID,
-                                               nullptr, // inName
-                                               nullptr, // outAppRef
-                                               &defaultHandlerURL);
-
-  if (status == noErr && defaultHandlerURL) {
-    nsCOMPtr<nsILocalFileMac> defaultReader =
-      do_CreateInstance("@mozilla.org/file/local;1", &rv);
-    if (NS_SUCCEEDED(rv)) {
-      rv = defaultReader->InitWithCFURL(defaultHandlerURL);
-      if (NS_SUCCEEDED(rv)) {
-        NS_ADDREF(*_retval = defaultReader);
-        rv = NS_OK;
-      }
-    }
-
-    ::CFRelease(defaultHandlerURL);
-  }
-
-  ::CFRelease(defaultHandlerID);
-
-  return rv;
-}
--- a/application/palemoon/components/shell/nsMacShellService.h
+++ b/application/palemoon/components/shell/nsMacShellService.h
@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/. */
-
-#ifndef nsmacshellservice_h____
-#define nsmacshellservice_h____
-
-#include "nsIMacShellService.h"
-#include "nsIWebProgressListener.h"
-#include "nsIFile.h"
-#include "nsCOMPtr.h"
-
-class nsMacShellService : public nsIMacShellService,
-                          public nsIWebProgressListener
-{
-public:
-  nsMacShellService() {};
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISHELLSERVICE
-  NS_DECL_NSIMACSHELLSERVICE
-  NS_DECL_NSIWEBPROGRESSLISTENER
-
-protected:
-  virtual ~nsMacShellService() {};
-
-private:
-  nsCOMPtr<nsIFile> mBackgroundFile;
-};
-
-#endif // nsmacshellservice_h____
--- a/application/palemoon/themes/moz.build
+++ b/application/palemoon/themes/moz.build
@ -5,9 +5,7 @@

 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']

-if toolkit == 'cocoa':
-    DIRS += ['osx']
-elif toolkit in ('gtk2', 'gtk3', 'qt'):
+if toolkit in ('gtk2', 'gtk3', 'qt'):
    DIRS += ['linux']
 else:
    DIRS += ['windows']
--- a/application/palemoon/themes/osx/Geolocation-16.png
+++ b/application/palemoon/themes/osx/Geolocation-16.png
--- a/application/palemoon/themes/osx/Geolocation-64.png
+++ b/application/palemoon/themes/osx/Geolocation-64.png
--- a/application/palemoon/themes/osx/Info.png
+++ b/application/palemoon/themes/osx/Info.png
--- a/application/palemoon/themes/osx/KUI-background.png
+++ b/application/palemoon/themes/osx/KUI-background.png
--- a/application/palemoon/themes/osx/KUI-close.png
+++ b/application/palemoon/themes/osx/KUI-close.png
--- a/application/palemoon/themes/osx/Makefile.in
+++ b/application/palemoon/themes/osx/Makefile.in
@ -1,7 +0,0 @@
-# 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/.
-
-ICON_FILES := icon.png
-ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-INSTALL_TARGETS += ICON
--- a/application/palemoon/themes/osx/Privacy-16.png
+++ b/application/palemoon/themes/osx/Privacy-16.png
--- a/application/palemoon/themes/osx/Privacy-32.png
+++ b/application/palemoon/themes/osx/Privacy-32.png
--- a/application/palemoon/themes/osx/Privacy-48.png
+++ b/application/palemoon/themes/osx/Privacy-48.png
--- a/application/palemoon/themes/osx/Privacy-64.png
+++ b/application/palemoon/themes/osx/Privacy-64.png
--- a/application/palemoon/themes/osx/Search.png
+++ b/application/palemoon/themes/osx/Search.png
--- a/application/palemoon/themes/osx/Secure24.png
+++ b/application/palemoon/themes/osx/Secure24.png
--- a/application/palemoon/themes/osx/Toolbar-inverted.png
+++ b/application/palemoon/themes/osx/Toolbar-inverted.png
--- a/application/palemoon/themes/osx/Toolbar-inverted.svg
+++ b/application/palemoon/themes/osx/Toolbar-inverted.svg
@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   enable-background="new 0 0 378 38"
-   viewBox="0 0 378 38"
-   height="38"
-   width="378"
-   y="0px"
-   x="0px"
-   id="strataToolbarSVG"
-   version="1.1">
-  <metadata
-     id="metadata146">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs144">
-    <filter
-       id="filter1070"
-       style="color-interpolation-filters:sRGB;">
-      <feFlood
-         id="feFlood1060"
-         result="flood"
-         flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
-      <feComposite
-         id="feComposite1062"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" />
-      <feGaussianBlur
-         id="feGaussianBlur1064"
-         result="blur"
-         stdDeviation="0.5"
-         in="composite1" />
-      <feOffset
-         id="feOffset1066"
-         result="offset"
-         dy="0"
-         dx="0" />
-      <feComposite
-         id="feComposite1068"
-         result="fbSourceGraphic"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix1072"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
-      <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039"
-         id="feFlood1074" />
-      <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
-         id="feComposite1076"
-         in2="fbSourceGraphic" />
-      <feGaussianBlur
-         result="blur"
-         stdDeviation="0.5"
-         in="composite1"
-         id="feGaussianBlur1078" />
-      <feOffset
-         result="offset"
-         dy="0"
-         dx="0"
-         id="feOffset1080" />
-      <feComposite
-         result="fbSourceGraphic"
-         operator="over"
-         in="fbSourceGraphic"
-         id="feComposite1082"
-         in2="offset" />
-      <feColorMatrix
-         id="feColorMatrix1084"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
-      <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039"
-         id="feFlood1086" />
-      <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
-         id="feComposite1088"
-         in2="fbSourceGraphic" />
-      <feGaussianBlur
-         result="blur"
-         stdDeviation="0.5"
-         in="composite1"
-         id="feGaussianBlur1090" />
-      <feOffset
-         result="offset"
-         dy="0"
-         dx="0"
-         id="feOffset1092" />
-      <feComposite
-         result="fbSourceGraphic"
-         operator="over"
-         in="fbSourceGraphic"
-         id="feComposite1094"
-         in2="offset" />
-      <feColorMatrix
-         id="feColorMatrix1096"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
-      <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039"
-         id="feFlood1098" />
-      <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
-         id="feComposite1100"
-         in2="fbSourceGraphic" />
-      <feGaussianBlur
-         result="blur"
-         stdDeviation="0.5"
-         in="composite1"
-         id="feGaussianBlur1102" />
-      <feOffset
-         result="offset"
-         dy="0"
-         dx="0"
-         id="feOffset1104" />
-      <feComposite
-         result="fbSourceGraphic"
-         operator="over"
-         in="fbSourceGraphic"
-         id="feComposite1106"
-         in2="offset" />
-      <feColorMatrix
-         id="feColorMatrix1108"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
-      <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039"
-         id="feFlood1110" />
-      <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
-         id="feComposite1112"
-         in2="fbSourceGraphic" />
-      <feGaussianBlur
-         result="blur"
-         stdDeviation="0.5"
-         in="composite1"
-         id="feGaussianBlur1114" />
-      <feOffset
-         result="offset"
-         dy="0"
-         dx="0"
-         id="feOffset1116" />
-      <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
-         id="feComposite1118"
-         in2="offset" />
-    </filter>
-  </defs>
-  <g
-     style="fill:#ffffff;filter:url(#filter1070)"
-     id="toolbar">
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 14.7,10.7 C 14.464283,10.935746 14.000125,11 14.000125,11 H 9 l 2.132,2.085573 c 0.519423,0.508112 0.595,1.2729 0.198,1.6979 l -0.793,0.9549 c -0.396,0.424 -1.091,0.318 -1.587,-0.212 L 3.595,9.690773 3,8.946873 l 0.595,-0.743 5.256,-5.7295 c 0.496,-0.531 1.19,-0.637 1.587,-0.212 l 0.794,0.9549 c 0.396,0.425 0.297,1.1669 -0.198,1.6979 L 9,7 h 4.999875 c 0,0 0.464437,0.064342 0.700125,0.3 0.235717,0.2356875 0.299875,0.7 0.299875,0.7 l 2.5e-4,2 c 0,0 -0.06444,0.464283 -0.300125,0.7 z"
-       id="back" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="back-large"
-       d="m 16.441631,29.733331 c -0.275,0.275034 -0.816512,0.349996 -0.816512,0.349996 H 8.999927 l 2.487308,2.516543 c 0.595913,0.602917 0.694159,1.485034 0.230997,1.980862 l -0.925157,1.114039 C 10.33108,36.189432 9.5202547,36.065767 8.9415947,35.44744 L 2.6941594,28.639311 2,27.771437 2.6941594,26.904612 8.8260957,20.220265 c 0.57866,-0.619493 1.3883193,-0.743159 1.8514803,-0.24733 l 0.926324,1.114038 c 0.461995,0.495828 0.346497,1.361369 -0.230997,1.980863 l -2.37283,2.348836 h 6.6249 c 0,0 0.541837,0.07506 0.816804,0.349997 0.275,0.274966 0.34985,0.816658 0.34985,0.816658 l 1.46e-4,2.333346 c 0,0 -0.07518,0.541658 -0.350142,0.816658 z" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="forward"
-       d="m 21.30025,10.7 c 0.235717,0.235746 0.699875,0.3 0.699875,0.3 h 5.000125 l -2.132,2.085573 c -0.519423,0.508112 -0.595,1.2729 -0.198,1.6979 l 0.793,0.9549 c 0.396,0.424 1.091,0.318 1.587,-0.212 l 5.355,-5.8356 0.595,-0.7439 -0.595,-0.743 -5.256,-5.7295 c -0.496,-0.531 -1.19,-0.637 -1.587,-0.212 l -0.794,0.9549 c -0.396,0.425 -0.297,1.1669 0.198,1.6979 L 27.00025,7 h -4.999875 c 0,0 -0.464437,0.064342 -0.700125,0.3 C 21.064533,7.5356875 21.000375,8 21.000375,8 l -2.5e-4,2 c 0,0 0.06444,0.464283 0.300125,0.7 z" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 51.5,4.64955 47.233834,8.949625 51.5,13.248616 49.366916,15.398166 45,11.201008 40.733834,15.5 38.60075,13.35045 42.866916,8.9485416 38.5,4.64955 40.633084,2.5 45,6.800075 49.266166,2.5 Z"
-       id="stop" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 69,9 H 62 L 64.8,6.2 C 64.1,5.7 63.4,5.5 62.5,5.5 c -2.2,0 -4,1.8 -4,4 0,2.2 1.8,4 4,4 1.399,0 2.7,-0.7 3.399,-1.9 l 2.301,1 C 67.099,14.6 65,16 62.5,16 58.899,16 56,13.1 56,9.5 56,5.9 58.899,3 62.5,3 64,3 65.399,3.5 66.6,4.4 L 69,2 Z"
-       id="reload" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 76,9 h -3 l 8,-7 8,7 h -3 v 6.5 H 82 V 12 h -2 v 3.5 h -4 z"
-       id="home" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 91.5,9 h 4.453 V 2 h 6.093 V 9 H 106.5 L 99,16 Z"
-       id="download" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 117,2 c -3.866,0 -7,3.134 -7,7 0,3.866 3.134,7 7,7 3.866,0 7,-3.134 7,-7 0,-3.866 -3.134,-7 -7,-7 z m 0,2 c 2.761,0 5,2.238 5,5 0,2.762 -2.239,5 -5,5 -2.762,0 -5,-2.238 -5,-5 0,-2.762 2.239,-5 5,-5 z m -0.7,1.2 C 116.0643,5.4357023 116,6 116,6 v 4 l 4,2 -2,-3 V 6 C 118,6 117.9357,5.4357023 117.7,5.2 117.4643,4.9642977 117,5 117,5 c 0,0 -0.4643,-0.035702 -0.7,0.2 z"
-       id="history" />
-    <g
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="bookmarks">
-      <path
-         style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 131,2 v 14 h 7.44922 0.55078 1.94922 c 0.99175,-0.258441 1.76717,-1.038297 2,-2 V 12 6 4 c -0.23283,-0.9617034 -1.00825,-1.7415586 -2,-2 h -1.63672 -0.86328 z m 6.11523,2.4160156 1.05469,1.7714844 c 0,0 0.29209,0.4878333 0.51953,0.6425781 0.21313,0.1449479 0.73828,0.2285157 0.73828,0.2285157 h 2.15625 l -1.49804,2.4335937 c 0,0 -0.21789,0.4778906 -0.32617,0.7167965 -0.16271,0.357558 0.005,0.982547 0.0586,1.566407 0.0848,0.918442 0.15039,1.80664 0.15039,1.80664 l -1.75,-0.894531 c 0,0 -0.71714,-0.337318 -1.10156,-0.337891 -0.45203,0 -1.29883,0.392579 -1.29883,0.392579 l -1.75391,0.841796 c 0,0 0.12894,-0.80101 0.26758,-1.68164 0.0917,-0.579219 0.34458,-1.238485 0.14063,-1.636719 -0.11058,-0.216562 -0.33204,-0.6484375 -0.33204,-0.6484375 l -1.7246,-2.5019531 h 2.14257 c 0,0 0.69711,-0.049193 0.98243,-0.2285156 0.21656,-0.1352084 0.48242,-0.5957032 0.48242,-0.5957032 z"
-         id="bookmarks-star" />
-      <path
-         style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 129,2 c -0.99175,0.2584414 -1.76717,1.0382967 -2,2 v 2 6 2 c 0.23283,0.961703 1.00825,1.741559 2,2 h 2.5 V 12 6 2 Z"
-         id="bookmarks-overlay" />
-      <path
-         style="stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 131.49914,2 V 16"
-         id="bookmarks-divider" />
-    </g>
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 160,14 h -2 l 1,2 h -12 l 1,-2 h -2 c -0.601,0 -1,-0.4 -1,-1 V 8 c 0,-0.6 0.70113,-0.635443 1,-1 0.38098,-0.4647208 0.61902,-1.0352792 1,-1.5 0.29887,-0.364557 0.399,-1 1,-1 V 3 c 0,-0.6 0.399,-1 1,-1 h 8 c 0.6,0 1,0.4 1,1 v 1.5 c 0.6,0 0.70113,0.635443 1,1 0.38098,0.4647208 0.61902,1.0352792 1,1.5 0.29887,0.364557 1,0.4 1,1 v 5 c 0,0.6 -0.4,1 -1,1 z M 148.5,9 h -0.5 -0.5 c -0.3,0 -0.5,0.2 -0.5,0.5 0,0.3 0.2,0.5 0.5,0.5 h 1 C 148.8,10 149,9.8 149,9.5 149,9.2 148.8,9 148.5,9 Z M 157,4 c 0,-0.6 -0.4,-1 -1,-1 h -6 c -0.601,0 -1,0.4 -1,1 v 3 c 0,0.6 0.399,1 1,1 h 6 c 0.6,0 1,-0.4 1,-1 z m -0.9,9 h -6.2 l -0.899,2 h 8 z"
-       id="print" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="newtab"
-       d="m 170.93359,2 -4.01562,0.00195 c 0,0.00178 -0.87681,0.216686 -0.87695,1.4980469 v 2.8164062 c 0,0 -0.0732,0.3643751 -0.19922,0.484375 C 165.69982,6.9357812 165.29102,7 165.29102,7 c 0,0 -0.53242,-0.057 -0.7754,0 -0.36297,0.086 -0.73599,0.236 -1,0.5 -0.26399,0.264 -0.41502,0.637 -0.5,1 -0.038,0.162 0,0.5 0,0.5 v 5.537109 c 0,0 0.24003,0.710891 0.5,0.962891 0.27398,0.267 1.03516,0.5 1.03516,0.5 h 13.0957 c 0,0 0.60287,-0.276 0.83985,-0.5 0.21699,-0.205 0.49023,-0.742188 0.49023,-0.742188 V 9 c 0.026,-0.322 0.038,-0.338 0,-0.5 -0.086,-0.363 -0.22624,-0.736 -0.49023,-1 -0.26398,-0.264 -0.63802,-0.415 -1,-0.5 -0.22799,-0.054 -0.69922,0 -0.69922,0 0,0 -0.44657,-0.056219 -0.60156,-0.1992188 -0.12799,-0.1189999 -0.19922,-0.484375 -0.19922,-0.484375 L 175.98828,3.5 C 175.98843,2.1047456 174.9707,2 174.9707,2 Z m -0.79101,5 h 1.71484 V 9.1425781 H 174 v 1.7148439 h -2.14258 V 13 h -1.71484 V 10.857422 H 168 V 9.1425781 h 2.14258 z" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="newwindow"
-       d="M 182.4375,2 C 181.52354,2.2781435 181.28553,2.8114358 181,3.6875 V 14.125 c 0.21642,1.330001 0.75257,1.636052 2.0625,1.875 H 195 c 1.30474,-0.204204 1.70477,-0.57308 2,-1.875 V 4 C 196.8019,2.7723315 196.4998,2.3703399 195.3125,2 Z M 190,3 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 2 v 1 h -2 z m -11,3 h 12 v 8 h -12 z m 5.14258,1 V 9.1425781 H 186 v 1.7148439 h 2.14258 V 13 h 1.71484 V 10.857422 H 192 V 9.1425781 h -2.14258 V 7 Z" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 212.70159,16 c -0.79707,0 -1.49513,-0.2 -2.2922,-1.3 -0.79807,-1.1 -1.69515,-2.5 -1.69515,-2.5 0,0 -0.69706,-0.9 -1.09709,-1.6 -0.49805,-0.7 -1.0971,-0.5 -1.0971,-0.5 0,0 -2.89125,-4.7 -3.3903,-5.4 -0.59805,-1 0.59906,-2.7 0.59906,-2.7 l 4.38738,7 c 0,0 1.39612,1.9 1.89417,2.3 0.49904,0.4 1.39612,-0.4 2.79224,0.9 1.89417,1.8 1.29611,3.8 -0.10101,3.8 z m -0.29802,-2.9 c -0.89708,-1 -1.69415,-0.9 -1.89417,-0.6 -0.20002,0.3 0,1.2 0.39804,1.7 0.39803,0.5 0.79806,0.7 1.39612,0.7 0.59905,0.1 1.09709,-0.7 0.10001,-1.8 z m -3.78934,-4.7 -1.1961,-1.8 2.89125,-4.6 c 0,0 1.19611,1.7 0.59906,2.7 -0.29903,0.4 -1.39613,2.3 -2.29421,3.7 z m -4.5854,2.899 c 0.29903,-0.3 0.99709,-1.1 1.39613,-1.7 l 0.79806,1.2 c -0.39803,0.6 -0.89707,1.4 -0.89707,1.4 0,0 -0.89608,1.4 -1.69415,2.5 -0.69806,1.1 -1.39612,1.3 -2.2932,1.3 -1.39613,0 -2.09419,-2 -0.10001,-3.8 1.39412,-1.199 2.2912,-0.499 2.79024,-0.9 z m -2.39321,1.801 c -0.89708,1 -0.39803,1.8 0.19902,1.8 0.59905,0 0.99709,-0.2 1.39612,-0.7 0.39804,-0.5 0.59806,-1.5 0.39804,-1.7 -0.29803,-0.3 -1.0961,-0.4 -1.99318,0.6 z"
-       id="cut" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 231,16 h -6 c -0.601,0 -1,-0.4 -1,-1 V 12 9.4 7 c 0,-0.6 0.399,-1 1,-1 0,0 3.2,0 5,0 l 2,2 c 0,2.2 0,7 0,7 0,0.6 -0.4,1 -1,1 z m -2,-9 v 2 h 2 z M 223,5.9 V 7 8.9 12 h -4 c -0.601,0 -1,-0.4 -1,-1 V 3 c 0,-0.6 0.399,-1 1,-1 0,0 3.2,0 5,0 l 2,2 c 0,0.4 0,0.8 0,1.3 h -2.5 C 223.2,5.4 223,5.6 223,5.9 Z M 223,3 v 2 h 2 z"
-       id="copy" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 246.8507,16 h -7.7014 C 238.26914,16 237.5,15.3 237.5,14.5 v -9 c 0,-0.8 0.77014,-1.5 1.6493,-1.5 h 1.6503 c 0,0 0,-2 2.2004,-2 2.2004,0 2.2004,2 2.2004,2 h 1.6493 c 0.88016,0 1.6503,0.7 1.6503,1.5 v 9 c 0.001,0.799 -0.76914,1.5 -1.6493,1.5 z M 245.97054,5 244.76032,4.5 c 0,0 0,-1.5 -1.76032,-1.5 -1.76032,0 -1.76032,1.5 -1.76032,1.5 l -1.21122,0.5 -0.5501,1 h 2.7505 3.52164 0.88016 z m 0.11002,1.7 h -5.17094 l -3.3016,1.7 3.08056,4.9 7.26232,-3.8 z"
-       id="paste" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 265,12 V 6 l 3,3 z m -7,1 h 6 l -3,3 z m 0,-1 V 6 h 6 v 6 z m 5,-4 h -4 v 3 h 4 z m -2,-6 3,3 h -6 z m -4,4 v 6 l -3,-3 z"
-       id="fullscreen" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 274,8 h 10 v 2 h -10 z"
-       id="minus" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 302,10 h -4 v 4 h -2 v -4 h -4 V 8 h 4 V 4 h 2 v 4 h 4 z"
-       id="plus" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 321.96164,9.3589991 c -0.0996,0.5880529 -0.19907,1.1749739 -0.39904,1.6649929 -0.39904,1.272996 -2.49721,3.230982 -2.49721,3.230982 l 1.23012,1.745023 -4.92726,6e-6 V 9.849 c 0,0 0.89889,1.46799 1.39795,2.05599 1.19912,-0.588025 1.99814,-1.762997 2.09818,-2.9380158 0.10109,-0.8810027 -0.19905,-1.6639894 -0.59902,-2.2510039 -0.18813,-0.3229439 -0.42109,-0.5799624 -0.68685,-0.7931908 -0.30005,-0.23897 -1.01208,-0.5779774 -1.01208,-0.5779774 l 0.0174,-3.3306603 c 1.03186,0.2680556 1.4999,0.3864246 2.85781,1.3686643 1.67715,1.2509803 2.78224,3.5019854 2.52022,5.9759989 z m -6.99262,-1.9580198 c 0,0 -1.09884,-1.4681946 -1.59912,-1.9580122 -1.39809,0.6859994 -2.19718,1.957993 -2.19714,3.3290059 0.39151,1.955025 1.15486,2.878079 2.87049,3.728027 V 16 c -1.14823,-0.14515 -2.89657,-1.144129 -3.76062,-2.017966 -1.64214,-1.695027 -2.56324,-3.735 -2.20626,-6.1889776 0.1,-0.6850241 0.30006,-1.3699914 0.49903,-1.9580159 0.40011,-1.0769929 1.10011,-1.957978 2.09921,-2.6429982 0.0997,-0.098323 0.199,-0.098023 0.29929,-0.1955973 -0.39905,-0.3919885 -1.2861,-0.9964444 -1.2861,-0.9964444 l 5.35545,-1.3e-6 z"
-       id="sync" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 339.29905,15.9 h -1.49989 c -0.39997,0 -0.79995,-0.3 -0.79995,-0.8 0,0 0.29998,-3.6 -3.19977,-7.2 -2.49982,-3 -6.9995,-3.2 -6.9995,-3.2 C 326.29998,4.7 326,4.4 326,4 V 2.6 c 0,-0.4 0.29998,-0.7 0.79994,-0.7 0,0 6.29955,0.4 9.59932,4.5 3.29976,3.1 3.60074,8.8 3.60074,8.8 -10e-4,0.4 -0.20099,0.7 -0.70095,0.7 z m -12.49911,-9 c 0,0 3.69974,0.5 5.79959,2.4 2.09985,2 2.49982,5.9 2.49982,5.9 0,0.4 -0.1,0.8 -0.49996,0.8 h -1.4999 c -0.39997,0 -0.59995,-0.3 -0.59995,-0.8 0,0 0.1,-2.4 -1.80088,-4.2 C 329.19877,9.7 326.79994,9.6 326.79994,9.6 326.29998,9.6 326,9.3 326,8.9 V 7.6 c 0,-0.4 0.29998,-0.7 0.79994,-0.7 z m 1.19992,5 c 1.09992,0 1.99985,0.9 1.99985,2 0,1.1 -0.89993,2 -1.99985,2 C 326.89894,15.9 326,15 326,13.9 c 0,-1.1 0.89994,-2 1.99986,-2 z"
-       id="rss" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 344.5,5 c 0,0 0.0643,-0.4642977 0.3,-0.7 0.2357,-0.2357023 0.7,-0.3 0.7,-0.3 h 7.5 c 0,0 0.4643,0.064298 0.7,0.3 0.2357,0.2357023 0.3,0.7 0.3,0.7 v 2 l 4.0245,-3 -0.049,10 L 354,11 v 2 c 0,0 -0.0643,0.464298 -0.3,0.7 -0.2357,0.235702 -0.7,0.3 -0.7,0.3 h -7.5 c 0,0 -0.4643,-0.0643 -0.7,-0.3 -0.2357,-0.235702 -0.3,-0.7 -0.3,-0.7 z"
-       id="webrtc" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="bookmark-none"
-       d="m 369.20312,1 -1.9082,3.2734375 c 0,0 -0.46184,0.8030625 -0.83984,1.0390625 -0.498,0.313 -1.71875,0.3984375 -1.71875,0.3984375 H 361 l 3.00781,4.3652345 c 0,0 0.38708,0.754812 0.58008,1.132812 0.356,0.6951 -0.0841,1.844469 -0.24414,2.855469 -0.242,1.5371 -0.4668,2.935547 -0.4668,2.935547 l 3.06055,-1.466797 c 0,0 1.47663,-0.685547 2.26562,-0.685547 0.671,10e-4 1.92579,0.587891 1.92579,0.587891 l 3.05273,1.5625 c 0,0 -0.11177,-1.549244 -0.25976,-3.152344 -0.093,-1.0191 -0.38752,-2.112228 -0.10352,-2.736328 0.189,-0.417 0.56836,-1.2519531 0.56836,-1.2519531 L 377,5.6113281 h -3.76172 c 0,0 -0.91706,-0.1454375 -1.28906,-0.3984375 -0.397,-0.2701 -0.90625,-1.1210937 -0.90625,-1.1210937 z m -0.0762,3 1.15039,1.9316406 c 0,0 0.31633,0.5323647 0.56446,0.7011719 0.23249,0.1581201 0.80664,0.25 0.80664,0.25 H 374 l -1.63281,2.6542969 c 0,0 -0.23929,0.5206326 -0.35742,0.7812496 -0.17749,0.39005 0.008,1.074021 0.0664,1.710938 C 372.16866,13.031203 372.23828,14 372.23828,14 l -1.9082,-0.978516 c 0,0 -0.78376,-0.366562 -1.20313,-0.367187 -0.4931,0 -1.41601,0.429687 -1.41601,0.429687 L 365.79883,14 c 0,0 0.13977,-0.873327 0.29101,-1.833984 0.1,-0.631855 0.37484,-1.350734 0.15235,-1.785157 -0.12063,-0.236243 -0.36133,-0.708984 -0.36133,-0.708984 L 364,6.9453125 h 2.33594 c 0,0 0.76298,-0.054381 1.07422,-0.25 0.23624,-0.1474953 0.52343,-0.6484375 0.52343,-0.6484375 z" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="bookmark-added"
-       d="m 369.202,19 -1.908,3.2732 c 0,0 -0.461,0.8031 -0.839,1.0391 -0.498,0.313 -1.718,0.399 -1.718,0.399 H 361 l 3.008,4.3643 c 0,0 0.387,0.755 0.58,1.133 0.356,0.6951 -0.084,1.8452 -0.244,2.8562 C 364.102,33.6019 363.877,35 363.877,35 l 3.06,-1.4671 c 0,0 1.477,-0.686 2.266,-0.686 0.671,0.001 1.925,0.588 1.925,0.588 l 3.053,1.5641 c 0,0 -0.112,-1.5501 -0.26,-3.1532 -0.093,-1.0191 -0.388,-2.1121 -0.104,-2.7362 0.189,-0.417 0.57,-1.252 0.57,-1.252 L 377,23.6123 h -3.763 c 0,0 -0.917,-0.146 -1.289,-0.399 -0.397,-0.2701 -0.906,-1.1221 -0.906,-1.1221 z" />
-  </g>
-</svg>
--- a/application/palemoon/themes/osx/Toolbar.png
+++ b/application/palemoon/themes/osx/Toolbar.png
--- a/application/palemoon/themes/osx/Toolbar.svg
+++ b/application/palemoon/themes/osx/Toolbar.svg
--- a/application/palemoon/themes/osx/aboutCertError.css
+++ b/application/palemoon/themes/osx/aboutCertError.css
@ -1,73 +0,0 @@
-/* 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/. */
-
-
-html {
-  background: #833;
-}
-
-body {
-  margin: 0;
-  padding: 0 1em;
-  color: -moz-FieldText;
-  font: message-box;
-}
-
-h1 {
-  margin: 0 0 .6em 0;
-  border-bottom: 1px solid ThreeDLightShadow;
-  font-size: 160%;
-}
-
-h2 {
-  font-size: 130%;
-}
-
-#errorPageContainer {
-  position: relative;
-  min-width: 13em;
-  max-width: 52em;
-  margin: 4em auto;
-  border: 2px solid #DD0D09;
-  border-radius: 10px;
-  box-shadow: 0px 0px 8px red;
-  padding: 3em;
-  padding-inline-start: 30px;
-  background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field;
-  background-origin: content-box;
-}
-
-#errorPageContainer:-moz-dir(rtl) {
-  background-position: right 0;
-}
-
-#errorTitle {
-  margin-inline-start: 80px;
-}
-
-#errorLongContent {
-  margin-inline-start: 80px;
-}
-
-.expander > button {
-  padding-inline-start: 20px;
-  margin-inline-start: -20px;
-  background: url("chrome://browser/skin/aboutCertError_sectionExpanded.png") left center no-repeat;
-  border: none;
-  font: inherit;
-  color: inherit;
-  cursor: pointer;
-}
-
-.expander > button:-moz-dir(rtl) {
-  background-position: right center;
-}
-
-.expander[collapsed] > button {
-  background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed.png");
-}
-
-.expander[collapsed] > button:-moz-dir(rtl) {
-  background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed-rtl.png");
-}
--- a/application/palemoon/themes/osx/aboutCertError_sectionCollapsed-rtl.png
+++ b/application/palemoon/themes/osx/aboutCertError_sectionCollapsed-rtl.png
--- a/application/palemoon/themes/osx/aboutCertError_sectionCollapsed.png
+++ b/application/palemoon/themes/osx/aboutCertError_sectionCollapsed.png
--- a/application/palemoon/themes/osx/aboutCertError_sectionExpanded.png
+++ b/application/palemoon/themes/osx/aboutCertError_sectionExpanded.png
--- a/application/palemoon/themes/osx/aboutPrivateBrowsing.css
+++ b/application/palemoon/themes/osx/aboutPrivateBrowsing.css
@ -1,47 +0,0 @@
-%if 0
-/* 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/. */
-%endif
-
-body.private > #errorPageContainer {
-  background-image: url("chrome://browser/skin/Privacy-48.png");
-}
-
-body.normal > #errorPageContainer {
-  background-image: url("chrome://global/skin/icons/question-48.png");
-}
-
-#clearRecentHistoryDesc {
-  margin-top: 2em;
-}
-
-#clearRecentHistoryDesc > p {
-  font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */
-}
-
-#startPrivateBrowsingDesc > button {
-  margin-inline-start: 0;
-}
-
-#footerDesc > p {
-  font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */
-}
-
-#moreInfo {
-  font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */
-  padding-inline-start: 25px;
-  background: url("chrome://global/skin/icons/information-16.png") no-repeat top left;
-}
-
-#moreInfo:-moz-dir(rtl) {
-  background-position: top right;
-}
-
-#moreInfoText {
-  margin-bottom: 0;
-}
-
-#moreInfoLinkContainer {
-  margin-top: 0.5em;
-}
--- a/application/palemoon/themes/osx/aboutSessionRestore.css
+++ b/application/palemoon/themes/osx/aboutSessionRestore.css
@ -1,73 +0,0 @@
-%if 0
-/* 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/. */
-%endif
-
-html {
-  background: #f8ffd0;
-  height: 100%;
-}
-
-body {
-  height: 100%;
-  text-align: center;
-}
-
-#errorPageContainer {
-  background-image: url("chrome://global/skin/icons/warning-large.png");
-  display: -moz-box;
-  width: -moz-available;
-  max-width: 85%;
-  height: 75%;
-  max-height: 85%;
-  -moz-box-orient: vertical;
-  text-align: start;
-  border: 2px solid #efc;
-  box-shadow: 0px 0px 8px #aaa;
-}
-
-#errorShortDesc > p {
-  margin-top: 0.4em;
-  margin-bottom: 0;
-}
-
-#errorLongContent, #errorTrailerDesc {
-  display: -moz-box;
-  -moz-box-flex: 1;
-  -moz-box-orient: vertical;
-}
-
-#tabList {
-  margin-top: 2.5em;
-  width: 100%;
-  min-height: 12em;
-}
-
-treechildren::-moz-tree-image(icon),
-treechildren::-moz-tree-image(noicon) {
-  padding-right: 2px;
-  margin: 0px 2px;
-  width: 16px;
-  height: 16px;
-}
-
-treechildren::-moz-tree-image(noicon) {
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-}
-treechildren::-moz-tree-image(container, noicon) {
-  list-style-image: url("chrome://browser/skin/aboutSessionRestore-window-icon.png");
-}
-treechildren::-moz-tree-image(checked) {
-  list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
-}
-treechildren::-moz-tree-image(partial) {
-  list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif");
-}
-
-#buttons {
-  width: 100%;
-}
-#buttons > button {
-  margin-top: 2em;
-}
--- a/application/palemoon/themes/osx/aboutSyncTabs.css
+++ b/application/palemoon/themes/osx/aboutSyncTabs.css
@ -1,101 +0,0 @@
-/* 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/. */
-
-#tabs-display,
-#tabsList {
-  background-color: transparent;
-  -moz-appearance: none;
-  margin: 0;
-}
-
-#tabsList {
-  width: 100%;
-}
-
-#tabs-display {
-  background: #fff url(chrome://browser/skin/sync-bg.png) repeat-x center -80px;
-}
-
-#headers {
-  background: url(chrome://browser/skin/sync-32.png) no-repeat;
-  margin-top: 4px;
-  width: 45em;
-  height: 32px;
-  margin-inline-start: 2em;
-  margin-inline-end: 2em;
-}
-
-#tabsListHeading {
-  font-size: 140%;
-  font-weight: bold;
-  margin-inline-start: 40px;
-}
-
-richlistitem {
-  margin-inline-end: 2em;
-}
-
-richlistitem[selected="true"],
-richlistitem:focus {
-  outline-style: none;
-}
-
-richlistitem[type="tab"] {
-  min-height: 3em;
-  border: #999999 1px solid !important;
-  padding: 2px 5px;
-  margin-bottom: 4px;
-  margin-inline-start: 4em;
-  border-radius: 6px;
-  background-color: menu;
-  width: 44em;
-  opacity: 0.9;
-  box-shadow:
-    inset rgba(255, 255, 255, 0.5) 0 1px 0px,
-    inset rgba(0, 0, 0, 0.1) 0 -2px 0px,
-    rgba(0, 0, 0, 0.1) 0px 1px 0px;
-}
-
-richlistitem[type="tab"][selected="true"] {
-  background-color: -moz-MenuHover;
-}
-
-richlistitem[type="client"] {
-  min-height: 2em;
-  color: #000000;
-  margin-inline-start: 2em;
-  margin-top: 2px;
-  margin-bottom: 3px;
-  width: 42em;
-  border-radius: 6px;
-  background-color: transparent;
-  -moz-user-focus: ignore !important;
-}
-richlistitem.mobile[type="client"] {
-  list-style-image: url("chrome://browser/skin/sync-mobileIcon.png");
-}
-richlistitem.desktop[type="client"] {
-  list-style-image: url("chrome://browser/skin/sync-desktopIcon.png");
-}
-
-.title,
-.clientName {
-  color: #000000;
-  font-size: 1.1em;
-}
-
-.title[selected="true"],
-.url[selected="true"] {
-  color: inherit;
-}
-
-.url {
-  color: -moz-nativehyperlinktext;
-  font-size: 0.95em;
-}
-
-.tabIcon {
-  padding-inline-start: 2px;
-  padding-top: 2px;
-}
--- a/application/palemoon/themes/osx/actionicon-tab.png
+++ b/application/palemoon/themes/osx/actionicon-tab.png
--- a/application/palemoon/themes/osx/autocomplete.css
+++ b/application/palemoon/themes/osx/autocomplete.css
@ -1,198 +0,0 @@
-/* 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/. */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-/* .padded is used by autocomplete widgets that don't have an icon. Gross. -dwh */
-textbox:not(.padded) {
-  cursor: default;
-  padding: 0;
-}
-
-textbox[nomatch="true"][highlightnonmatches="true"] {
-  color: red;
-}
-
-textbox:not(.padded) .textbox-input-box {
-  margin: 0 3px;
-}
-
-.textbox-input-box {
-  -moz-box-align: center;
-}
-
-/* ::::: history button ::::: */
-
-.private-autocomplete-history-dropmarker {
-  -moz-appearance: none !important;
-  border: none !important;
-  background-color: transparent !important;
-  padding: 0px;
-  list-style-image: url("chrome://global/skin/icons/autocomplete-dropmarker.png");
-  margin: 0px;
-}
-
-/* ::::: autocomplete popups ::::: */
-
-panel[type="private-autocomplete"],
-panel[type="private-autocomplete-richlistbox"],
-.private-autocomplete-history-popup {
-  padding: 0px !important;
-  color: -moz-FieldText;
-  background-color: -moz-Field;
-  font: icon;
-  -moz-appearance: none;
-}
-
-.private-autocomplete-history-popup {
-  max-height: 180px;
-}
-
-/* ::::: tree ::::: */
-
-.private-autocomplete-tree {
-  -moz-appearance: none !important;
-  border: none !important;
-  background-color: transparent !important;
-}
-
-.private-autocomplete-treecol {
-  -moz-appearance: none !important;
-  margin: 0 !important;
-  border: none !important;
-  padding: 0 !important;
-}
-
-.private-autocomplete-treebody::-moz-tree-cell-text {
-  padding-left: 2px;
-}
-
-.private-autocomplete-treebody::-moz-tree-row {
-  border-top: none;
-}
-
-treechildren.private-autocomplete-treebody::-moz-tree-row(selected) {
- background-color: Highlight;
-}
-
-treechildren.private-autocomplete-treebody::-moz-tree-cell-text(selected) {
-  color: HighlightText !important;
-}
-
-.private-autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue) {
-  max-width: 16px;
-  height: 16px;
-}
-
-/* ::::: richlistbox autocomplete ::::: */
-
-.private-autocomplete-richlistbox {
-  -moz-appearance: none;
-  margin: 0;
-}
-
-.private-autocomplete-richlistitem[selected="true"] {
-  background-color: Highlight;
-  color: HighlightText;
-  background-image: linear-gradient(rgba(255,255,255,0.3), transparent);
-}
-
-.private-autocomplete-richlistitem {
-  padding: 5px 2px;
-}
-
-.ac-url-box {
-  /* When setting a vertical margin here, half of that needs to be added
-     .ac-title-box's translateY for when .ac-url-box is hidden (see below). */
-  margin-top: 1px;
-}
-
-.private-autocomplete-richlistitem[actiontype="keyword"] .ac-url-box,
-.private-autocomplete-richlistitem[actiontype="searchengine"] .ac-url-box,
-.private-autocomplete-richlistitem[actiontype="visiturl"] .ac-url-box,
-.private-autocomplete-richlistitem[type~="autofill"] .ac-url-box {
-  visibility: hidden;
-}
-
-.private-autocomplete-richlistitem[actiontype="keyword"] .ac-title-box,
-.private-autocomplete-richlistitem[actiontype="searchengine"] .ac-title-box,
-.private-autocomplete-richlistitem[actiontype="visiturl"] .ac-title-box,
-.private-autocomplete-richlistitem[type~="autofill"] .ac-title-box {
-  /* Center the title by moving it down by half of .ac-url-box's height,
-     including vertical margins (if any). */
-  transform: translateY(.5em);
-}
-
-.ac-site-icon {
-  width: 16px; 
-  height: 16px;
-  margin-bottom: -1px;
-  margin-inline-start: 7px;
-  margin-inline-end: 5px;
-}
-
-.ac-type-icon {
-  width: 16px;
-  height: 16px;
-  margin-inline-start: 6px;
-  margin-inline-end: 4px;
-}
-
-.ac-url-box > .ac-site-icon,
-.ac-url-box > .ac-type-icon {
-  /* Otherwise the spacer is big enough to stretch its container */
-  height: auto;
-}
-
-.ac-extra > .ac-result-type-tag {
-  margin: 0 4px;
-}
-
-.ac-extra > .ac-comment {
-  padding-right: 4px;
-}
-
-.ac-ellipsis-after {
-  margin: 0 !important;
-  padding: 0; 
-  min-width: 1.1em;
-}
-
-.ac-normal-text {
-  margin: 0 !important;
-  padding: 0;
-}
-
-.ac-normal-text > html|span {
-  margin: 0 !important;
-  padding: 0;
-}
-
-html|span.ac-emphasize-text {
-  box-shadow: inset 0 0 1px 1px rgba(208,208,208,0.4);
-  background-color: rgba(208,208,208,0.2);
-  border-radius: 2px;
-  text-shadow: 0 0 currentColor;
-}
-
-.ac-url-text > html|span.ac-emphasize-text,
-.ac-action-text > html|span.ac-emphasize-text {
-  box-shadow: inset 0 0 1px 1px rgba(183,210,226,0.4);
-  background-color: rgba(183,210,226,0.3);
-}
-
-.ac-title, .ac-url {
-  overflow: hidden;
-}
-
-/* ::::: textboxes inside toolbarpaletteitems ::::: */
-
-toolbarpaletteitem > toolbaritem > textbox > hbox > hbox > html|*.textbox-input {
-  visibility: hidden;
-}
-
-toolbarpaletteitem > toolbaritem > * > textbox > hbox > hbox > html|*.textbox-input {
-  visibility: hidden;
-}
--- a/application/palemoon/themes/osx/browser.css
+++ b/application/palemoon/themes/osx/browser.css
--- a/application/palemoon/themes/osx/click-to-play-warning-stripes.png
+++ b/application/palemoon/themes/osx/click-to-play-warning-stripes.png
--- a/application/palemoon/themes/osx/communicator/communicator.css
+++ b/application/palemoon/themes/osx/communicator/communicator.css
@ -1,6 +0,0 @@
-/* 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/. */
-
-@import url("chrome://global/skin/");
-
--- a/application/palemoon/themes/osx/communicator/jar.mn
+++ b/application/palemoon/themes/osx/communicator/jar.mn
@ -1,7 +0,0 @@
-# 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:
-% skin communicator classic/1.0 %skin/classic/communicator/
-  skin/classic/communicator/communicator.css
--- a/application/palemoon/themes/osx/communicator/moz.build
+++ b/application/palemoon/themes/osx/communicator/moz.build
@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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']
--- a/application/palemoon/themes/osx/downloads/allDownloadsViewOverlay.css
+++ b/application/palemoon/themes/osx/downloads/allDownloadsViewOverlay.css
@ -1,146 +0,0 @@
-/* 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/. */
-
-#downloadsRichListBox {
-  /** The default listbox appearance comes with an unwanted margin. **/
-  -moz-appearance: none;
-  margin: 0;
-}
-
-#downloadsRichListBox > richlistitem.download {
-  height: 6em;
-  padding: 5px 8px;
-}
-
-.downloadTypeIcon {
-  margin-inline-end: 8px;
-  /* explicitly size the icon, so size doesn't vary on hidpi systems */
-  height: 32px;
-  width: 32px;
-}
-
-.blockedIcon {
-  list-style-image: url("chrome://global/skin/icons/Error.png");
-}
-
-.downloadTarget {
-  margin-bottom: 3px;
-  cursor: inherit;
-}
-
-.downloadDetails {
-  opacity: 0.7;
-  font-size: 95%;
-  cursor: inherit;
-}
-
-.downloadButton {
-  -moz-appearance: none;
-  background: transparent;
-  min-width: 0;
-  min-height: 0;
-  margin: 3px;
-  border: none;
-  padding: 5px;
-  list-style-image: url("chrome://browser/skin/downloads/buttons.png");
-}
-
-/*** Button icons ***/
-
-.downloadButton.downloadCancel {
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadCancel {
-   -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadCancel:hover {
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadCancel:active {
-  -moz-image-region: rect(0px, 64px, 16px, 48px);
-}
-
-.downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadShow {
-   -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadShow:hover {
-  -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadShow:active {
-  -moz-image-region: rect(16px, 64px, 32px, 48px);
-}
-
-.downloadButton.downloadRetry {
-  -moz-image-region: rect(32px, 16px, 48px, 0px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadRetry {
-   -moz-image-region: rect(32px, 32px, 48px, 16px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadRetry:hover {
-  -moz-image-region: rect(32px, 48px, 48px, 32px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadRetry:active {
-  -moz-image-region: rect(32px, 64px, 48px, 48px);
-}
-
-richlistitem.download[selected] > .downloadButton.downloadCancel {
-  -moz-image-region: rect(0px, 80px, 16px, 64px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadCancel {
-  -moz-image-region: rect(0px, 96px, 16px, 80px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadCancel:hover {
-  -moz-image-region: rect(0px, 112px, 16px, 96px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadCancel:active {
-  -moz-image-region: rect(0px, 128px, 16px, 112px);
-}
-
-richlistitem.download[selected] > .downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 80px, 32px, 64px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 96px, 32px, 80px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadShow:hover {
-  -moz-image-region: rect(16px, 112px, 32px, 96px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadShow:active {
-  -moz-image-region: rect(16px, 128px, 32px, 112px);
-}
-
-richlistitem.download[selected] > .downloadButton.downloadRetry {
-  -moz-image-region: rect(32px, 80px, 48px, 64px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadRetry {
-  -moz-image-region: rect(32px, 96px, 48px, 80px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadRetry:hover {
-  -moz-image-region: rect(32px, 112px, 48px, 96px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadRetry:active {
-  -moz-image-region: rect(32px, 128px, 48px, 112px);
-}
-
--- a/application/palemoon/themes/osx/downloads/buttons.png
+++ b/application/palemoon/themes/osx/downloads/buttons.png
--- a/application/palemoon/themes/osx/downloads/contentAreaDownloadsView.css
+++ b/application/palemoon/themes/osx/downloads/contentAreaDownloadsView.css
@ -1,22 +0,0 @@
-/* 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/. */
-
-@import url("chrome://global/skin/inContentUI.css");
-
-.downloadButton {
-  box-shadow: none;
-}
-
-.downloadButton:not([disabled="true"]):hover:active,
-.downloadButton:not([disabled]):hover:active {
-  background: transparent;
-  border: none;
-  box-shadow: none;
-}
-
-#downloadsListEmptyDescription {
-  margin: 1em;
-  text-align: center;
-  color: GrayText;
-}
--- a/application/palemoon/themes/osx/downloads/download-notification-finish.png
+++ b/application/palemoon/themes/osx/downloads/download-notification-finish.png
--- a/application/palemoon/themes/osx/downloads/download-notification-start.png
+++ b/application/palemoon/themes/osx/downloads/download-notification-start.png
--- a/application/palemoon/themes/osx/downloads/download-summary.png
+++ b/application/palemoon/themes/osx/downloads/download-summary.png
--- a/application/palemoon/themes/osx/downloads/downloads.css
+++ b/application/palemoon/themes/osx/downloads/downloads.css
@ -1,396 +0,0 @@
-/* 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/. */
-
-/*** Panel and outer controls ***/
-
-#downloadsPanel > .panel-arrowcontainer > .panel-arrowcontent {
-  padding: 0;
-}
-
-#downloadsListBox {
-  background-color: transparent;
-  padding: 4px;
-  color: inherit;
-}
-
-#downloadsPanel:not([hasdownloads]) > #downloadsListBox {
-  display: none;
-}
-
-#downloadsPanel[hasdownloads] > #emptyDownloads {
-  display: none;
-}
-
-#emptyDownloads {
-  padding: 10px 20px;
-  max-width: 40ch;
-}
-
-#downloadsHistory {
-  background: transparent;
-  color: -moz-nativehyperlinktext;
-  cursor: pointer;
-}
-
-#downloadsPanel[keyfocus] > #downloadsFooter > #downloadsHistory:focus {
-  outline: 1px -moz-dialogtext dotted;
-  outline-offset: -1px;
-}
-
-#downloadsHistory > .button-box {
-  border: none;
-  margin: 1em;
-}
-
-@media (-moz-mac-lion-theme) {
-  #downloadsFooter {
-    background-color: hsla(216,45%,88%,.98);
-    box-shadow: 0px 1px 2px rgb(204,214,234) inset;
-    border-bottom-left-radius: 3px;
-    border-bottom-right-radius: 3px;
-  }
-}
-
-/*** Downloads Summary and List items ***/
-
-#downloadsSummary,
-richlistitem[type="download"] {
-  height: 7em;
-  padding-inline-end: 0;
-  color: inherit;
-}
-
-#downloadsSummary {
-  padding: 8px 38px 8px 12px;
-  cursor: pointer;
-  -moz-user-focus: normal;
-}
-
-#downloadsPanel[keyfocus] > #downloadsFooter > #downloadsSummary:focus {
-  outline: 1px -moz-dialogtext dotted;
-  outline-offset: -5px;
-}
-
-#downloadsSummary > .downloadTypeIcon {
-  list-style-image: url("chrome://browser/skin/downloads/download-summary.png");
-}
-
-#downloadsSummaryDescription {
-  color: -moz-nativehyperlinktext;
-}
-
-richlistitem[type="download"] {
-  margin: 0;
-  border-top: 1px solid hsla(0,0%,100%,.3);
-  border-bottom: 1px solid hsla(220,18%,51%,.25);
-  background: transparent;
-  padding: 8px;
-}
-
-richlistitem[type="download"]:first-child {
-  border-top: 1px solid transparent;
-}
-
-@media (-moz-mac-lion-theme) {
-  richlistitem[type="download"]:last-child {
-    border-bottom: 1px solid transparent;
-  }
-}
-
-#downloadsPanel[keyfocus] > #downloadsListBox:focus > richlistitem[type="download"][selected] {
-  outline: 1px -moz-dialogtext dotted;
-  outline-offset: -1px;
-}
-
-.downloadTypeIcon {
-  margin-inline-end: 8px;
-  /* Prevent flickering when changing states. */
-  height: 32px;
-  width: 32px;
-}
-
-.blockedIcon {
-  list-style-image: url("chrome://global/skin/icons/Error.png");
-}
-
-/* We hold .downloadDisplayName, .downloadProgress and .downloadDetails
-   inside of a vbox with class .downloadContainer. We set the font-size of
-   the entire container to 90% because:
-
-   1) This is the size that we want .downloadDetails to be
-   2) The container's width is set by localizers by &downloadDetails.width;,
-      which is a ch unit. Since this is the value that should control the
-      panel width, we apply it to the outer container to constrain
-      .downloadDisplayName and .downloadProgress.
-
-   Finally, since we want .downloadDisplayName's font-size to be at 100% of
-   the font-size of .downloadContainer's parent, we use calc to go from the
-   smaller font-size back to the original font-size.
- */
-#downloadsSummaryDetails,
-.downloadContainer {
-  font-size: 90%;
-}
-
-#downloadsSummaryDescription,
-.downloadDisplayName {
-  margin-bottom: 6px;
-  cursor: inherit;
-}
-
-.downloadDisplayName {
-  font-size: calc(100%/0.9);
-}
-
-#downloadsSummaryDetails,
-.downloadDetails {
-  opacity: 0.6;
-  cursor: inherit;
-}
-
-.downloadButton {
-  -moz-appearance: none;
-  min-width: 0;
-  min-height: 0;
-  margin: 3px;
-  border: none;
-  background: transparent;
-  padding: 5px;
-  list-style-image: url("chrome://browser/skin/downloads/buttons.png");
-}
-
-.downloadButton > .button-box {
-  border: 1px solid transparent;
-  padding: 0;
-}
-
-#downloadsPanel[keyfocus] .downloadButton:focus > .button-box {
-  border: 1px dotted ThreeDDarkShadow;
-}
-
-/*** Highlighted list items ***/
-
-#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover {
-  border-radius: 3px;
-  border-top: 1px solid hsla(0,0%,100%,.2);
-  border-bottom: 1px solid hsla(0,0%,0%,.2);
-  background-color: Highlight;
-  color: HighlightText;
-  cursor: pointer;
-}
-
-/*** Button icons ***/
-
-.downloadButton.downloadCancel {
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:hover {
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:active {
-  -moz-image-region: rect(0px, 64px, 16px, 48px);
-}
-
-.downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow:hover {
-  -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow:active {
-  -moz-image-region: rect(16px, 64px, 32px, 48px);
-}
-#downloadsPanel[keyfocus] > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-#downloadsPanel[keyfocus] > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:hover {
-  -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
-#downloadsPanel[keyfocus] > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:active {
-  -moz-image-region: rect(16px, 64px, 32px, 48px);
-}
-#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 96px, 32px, 80px);
-}
-#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:hover {
-  -moz-image-region: rect(16px, 112px, 32px, 96px);
-}
-#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:active {
-  -moz-image-region: rect(16px, 128px, 32px, 112px);
-}
-
-.downloadButton.downloadRetry {
-  -moz-image-region: rect(32px, 16px, 48px, 0px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry {
-  -moz-image-region: rect(32px, 32px, 48px, 16px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:hover {
-  -moz-image-region: rect(32px, 48px, 48px, 32px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:active {
-  -moz-image-region: rect(32px, 64px, 48px, 48px);
-}
-
-/*** Status and progress indicator ***/
-
-#downloads-indicator-anchor {
-  /* Makes the outermost stack element positioned, so that its contents are
-     rendered over the main browser window in the Z order.  This is required by
-     the animated event notification. */
-  position: relative;
-}
-
-/*** Main indicator icon ***/
-
-#downloads-indicator-icon {
-  background: -moz-image-rect(var(--toolbarbutton-image),
-                              0, 108, 18, 90) center no-repeat;
-  min-width: 18px;
-  min-height: 18px;
-}
-
-toolbar[brighttext] #downloads-indicator-icon {
-  background: -moz-image-rect(var(--toolbarbutton-inverted-image),
-                              0, 108, 18, 90) center no-repeat;
-}
-
-#downloads-indicator[attention] > #downloads-indicator-anchor > #downloads-indicator-icon {
-  background: -moz-image-rect(var(--toolbarbutton-image),
-                              19, 108, 36, 90) center no-repeat;
-}
-
-/* In the next few rules, we use :not([counter]) as a shortcut that is
-   equivalent to -moz-any([progress], [paused]). */
-
-#downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
-  background: -moz-image-rect(var(--toolbarbutton-image),
-                              0, 108, 18, 90) center no-repeat;
-  background-size: 12px;
-}
-
-toolbar[brighttext] #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
-  background: -moz-image-rect(var(--toolbarbutton-inverted-image),
-                              0, 108, 18, 90) center no-repeat;
-}
-
-#downloads-indicator:not([counter])[attention] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
-  background: -moz-image-rect(var(--toolbarbutton-image),
-                              19, 108, 36, 90) center no-repeat;
-}
-
-/*** Download notifications ***/
-
-#downloads-indicator-notification {
-  opacity: 0;
-  background-size: 16px;
-  background-position: center;
-  background-repeat: no-repeat;
-}
-
-@keyframes downloadsIndicatorNotificationStartRight {
-  from { opacity: 0; transform: translate(-128px, 128px) scale(8); }
-  20%  { opacity: .85; animation-timing-function: ease-out; }
-  to   { opacity: 0; transform: translate(0) scale(1); }
-}
-
-@keyframes downloadsIndicatorNotificationStartLeft {
-  from { opacity: 0; transform: translate(128px, 128px) scale(8); }
-  20%  { opacity: .85; animation-timing-function: ease-out; }
-  to   { opacity: 0; transform: translate(0) scale(1); }
-}
-
-#downloads-indicator[notification="start"] > #downloads-indicator-anchor > #downloads-indicator-notification {
-  background-image: url("chrome://browser/skin/downloads/download-notification-start.png");
-  animation-name: downloadsIndicatorNotificationStartRight;
-  animation-duration: 1s;
-}
-
-#downloads-indicator[notification="start"]:-moz-locale-dir(rtl) > #downloads-indicator-anchor > #downloads-indicator-notification {
-  animation-name: downloadsIndicatorNotificationStartLeft;
-}
-
-@keyframes downloadsIndicatorNotificationFinish {
-  from { opacity: 0; transform: scale(1); }
-  20%  { opacity: .65; animation-timing-function: ease-in; }
-  to   { opacity: 0; transform: scale(8); }
-}
-
-#downloads-indicator[notification="finish"] > #downloads-indicator-anchor > #downloads-indicator-notification {
-  background-image: url("chrome://browser/skin/downloads/download-notification-finish.png");
-  animation-name: downloadsIndicatorNotificationFinish;
-  animation-duration: 1s;
-}
-
-/*** Progress bar and text ***/
-
-#downloads-indicator-counter {
-  height: 9px;
-  margin: -3px 0px 0px 0px;
-  color: hsl(0,0%,30%);
-  text-shadow: hsla(0,0%,100%,.5) 0 1px;
-  font-size: 9px;
-  line-height: 9px;
-  text-align: center;
-}
-
-toolbar[brighttext] #downloads-indicator-counter {
-  color: white;
-  text-shadow: 0 0 1px rgba(0,0,0,.7),
-               0 1px 1.5px rgba(0,0,0,.5);
-}
-
-#downloads-indicator-progress {
-  width: 16px;
-  height: 5px;
-  min-width: 0;
-  min-height: 0;
-  margin-top: 1px;
-  margin-bottom: 2px;
-  border-radius: 2px;
-  box-shadow: 0 1px 0 hsla(0,0%,100%,.4);
-}
-
-#downloads-indicator-progress > .progress-bar {
-  -moz-appearance: none;
-  min-width: 0;
-  min-height: 0;
-  /* The background-clip: border-box; and background-image: none; are there to expand the background-color behind the border */
-  background-clip: padding-box, border-box;
-  background-color: rgb(90, 201, 66);
-  background-image: linear-gradient(transparent 1px, rgba(255, 255, 255, 0.4) 1px, rgba(255, 255, 255, 0.4) 2px, transparent 2px), none;
-  border: 1px solid;
-  border-color: rgba(0,43,86,.6) rgba(0,43,86,.4) rgba(0,43,86,.4);
-  border-radius: 2px 0 0 2px;
-}
-
-#downloads-indicator-progress > .progress-remainder {
-  -moz-appearance: none;
-  min-width: 0;
-  min-height: 0;
-  background-image: linear-gradient(#505050, #575757);
-  border: 1px solid;
-  border-color: hsla(0,0%,0%,.6) hsla(0,0%,0%,.4) hsla(0,0%,0%,.4);
-  border-inline-start: none;
-  border-radius: 0 2px 2px 0;
-}
-
-#downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar {
-  background-color: rgb(220, 230, 81);
-}
-
-#downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-remainder {
-  background-image: linear-gradient(#4b5000, #515700);
-}
-
-toolbar[mode="full"] > #downloads-indicator > .toolbarbutton-text {
-  margin: 0;
-  text-align: center;
-}
--- a/application/palemoon/themes/osx/engineManager.css
+++ b/application/palemoon/themes/osx/engineManager.css
@ -1,16 +0,0 @@
-%if 0
-/* 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/. */
-%endif
-
-#engineList treechildren::-moz-tree-image(engineName) {
-  margin-inline-end: 4px;
-  margin-inline-start: 1px;
-  width: 16px;
-  height: 16px;
-}
-
-#engineList treechildren::-moz-tree-row {
-  height: 20px;
-}
--- a/application/palemoon/themes/osx/feeds/feed-icons-16.png
+++ b/application/palemoon/themes/osx/feeds/feed-icons-16.png
--- a/application/palemoon/themes/osx/feeds/feedIcon.png
+++ b/application/palemoon/themes/osx/feeds/feedIcon.png
--- a/application/palemoon/themes/osx/feeds/feedIcon16.png
+++ b/application/palemoon/themes/osx/feeds/feedIcon16.png
--- a/application/palemoon/themes/osx/feeds/subscribe-ui.css
+++ b/application/palemoon/themes/osx/feeds/subscribe-ui.css
@ -1,29 +0,0 @@
-/* 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/. */
-
-.alwaysUse {
-  padding: 5px;
-}
-
-.handlersMenuPopup > menuitem {
-  padding-inline-start: 23px;
-}
-
-.handlersMenuPopup > menuitem.menuitem-iconic {
-  padding-inline-start: 2px;
-}
-
-.handlersMenuPopup > .menuitem-iconic  > .menu-iconic-left {
-  display: -moz-box;
-  min-width: 16px;
-  padding-inline-end: 2px;
-}
-
-.chooseApplicationMenuItem {
-  list-style-image: url("chrome://browser/skin/preferences/application.png");
-}
-
-#feedHeader[dir="rtl"] .handlersMenuList > menupopup {
-  direction: rtl;
-}
--- a/application/palemoon/themes/osx/feeds/subscribe.css
+++ b/application/palemoon/themes/osx/feeds/subscribe.css
@ -1,159 +0,0 @@
-/* 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/. */
-
-html {
-  background: -moz-Dialog;
-  font: 3mm tahoma,arial,helvetica,sans-serif;
-}
-
-#feedBody {
-  border: 1px solid THreeDShadow;
-  padding: 3em;
-  padding-inline-start: 30px;
-  margin: 2em auto;
-  background: -moz-Field;
-}
-
-#feedHeaderContainer {
-  border: 1px solid ThreeDShadow;
-  border-radius: 10px;
-  margin: -4em auto 0 auto;
-  background-color: InfoBackground;
-}
-
-#feedHeader {  
-  margin-top: 4.9em;
-  margin-bottom: 1em;
-  margin-inline-start: 1.4em;
-  margin-inline-end: 1em;
-  padding-inline-start: 2.9em;
-  font-size: 110%;
-  color: InfoText;
-}
-
-#feedIntroText {
-  display: none;
-}
-
-.feedBackground {
-  background: url("chrome://browser/skin/feeds/feedIcon.png") 0% 10% no-repeat InfoBackground;
-}
-
-.videoPodcastBackground {
-  background: url("chrome://browser/skin/feeds/videoFeedIcon.png") 0% 10% no-repeat InfoBackground;
-}
-
-.audioPodcastBackground {
-  background: url("chrome://browser/skin/feeds/audioFeedIcon.png") 0% 10% no-repeat InfoBackground;
-}
-
-#feedHeader[dir="rtl"] {
-  background-position: 100% 10%;
-}
-
-#feedHeader[firstrun="true"] #feedIntroText {
-  padding-top: 0.1em;
-  padding-inline-start: 0.6em;
-  display: block;
-}
-
-#feedHeader[firstrun="true"] > #feedSubscribeLine {
-  padding-inline-start: 1.8em;
-}
-
-#feedSubscribeLine {
-  padding-top: 0.2em;
-}
-
-/* Don't print subscription UI */
-@media print {
-  #feedHeaderContainer {
-    display: none;
-  }
-}
-
-body {
-  margin: 0;
-  padding: 0 3em;
-  color: -moz-fieldText;
-  font: message-box;
-}
-
-h1 {
-  font-size: 160%;
-  border-bottom: 2px solid ThreeDLightShadow;
-  margin: 0 0 .2em 0;
-}
-
-h2 {
-  color: ThreeDDarkShadow;
-  font-size: 110%;
-  font-weight: normal;
-  margin: 0 0 .6em 0;
-}
-
-#feedTitleLink {
-  float: right;
-  margin-inline-start: .6em;
-  margin-inline-end: 0;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-a[href] img {
-  border: none;
-}
-
-#feedTitleContainer {
-  margin-inline-start: 0;
-  margin-inline-end: .6em;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-#feedTitleImage {
-  margin-inline-start: .6em;
-  margin-inline-end: 0;
-  margin-top: 0;
-  margin-bottom: 0;
-  max-width: 300px;
-  max-height: 150px;
-}
-
-.feedEntryContent {
-  font-size: 110%;
-}
- 
-.link {
-  color: #0000FF;
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-.link:hover:active {
-  color: #FF0000;
-}
-
-.lastUpdated {
-  font-size: 85%;
-  font-weight: normal;
-}
-
-.type-icon {
-  vertical-align: bottom;
-  height: 16px;
-  width: 16px;
-}
-
-.enclosures {
-  border: 1px solid THreeDShadow;
-  padding: 1em;
-  margin: 1em auto;
-  background: -moz-Dialog;
-}
-
-.enclosure {
-  vertical-align: middle;
-  margin-left: 2px;
-}
--- a/application/palemoon/themes/osx/icon.png
+++ b/application/palemoon/themes/osx/icon.png
--- a/application/palemoon/themes/osx/identity-icons-generic.png
+++ b/application/palemoon/themes/osx/identity-icons-generic.png
--- a/application/palemoon/themes/osx/identity-icons-https-ev.png
+++ b/application/palemoon/themes/osx/identity-icons-https-ev.png
--- a/application/palemoon/themes/osx/identity-icons-https-mixed-active.png
+++ b/application/palemoon/themes/osx/identity-icons-https-mixed-active.png
--- a/application/palemoon/themes/osx/identity-icons-https.png
+++ b/application/palemoon/themes/osx/identity-icons-https.png
--- a/application/palemoon/themes/osx/identity.png
+++ b/application/palemoon/themes/osx/identity.png
--- a/application/palemoon/themes/osx/imagedocument.png
+++ b/application/palemoon/themes/osx/imagedocument.png
--- a/application/palemoon/themes/osx/jar.mn
+++ b/application/palemoon/themes/osx/jar.mn
@ -1,181 +0,0 @@
-# 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:
-% 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
-#ifdef MOZ_SERVICES_SYNC
-  skin/classic/browser/aboutSyncTabs.css
-#endif
-* skin/classic/browser/autocomplete.css
-  skin/classic/browser/actionicon-tab.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/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.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/Toolbar.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
-#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/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/libraryToolbar.svg                      (places/libraryToolbar.svg)
-  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)
-#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/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/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
-#endif
--- a/application/palemoon/themes/osx/keyhole-forward-mask.svg
+++ b/application/palemoon/themes/osx/keyhole-forward-mask.svg
@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!-- 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/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg">
-  <mask id="mask" maskContentUnits="objectBoundingBox">
-    <rect x="0" y="0" width="1" height="1" fill="white"/>
-    <circle cx="-0.46" cy="0.5" r="0.63"/>
-  </mask>
-  <mask id="mask-hover" maskContentUnits="objectBoundingBox">
-    <rect x="0" y="0" width="1" height="1" fill="white"/>
-    <circle cx="-0.35" cy="0.5" r="0.58"/>
-  </mask>
-</svg>
--- a/application/palemoon/themes/osx/livemark-folder.png
+++ b/application/palemoon/themes/osx/livemark-folder.png
--- a/application/palemoon/themes/osx/menu-back.png
+++ b/application/palemoon/themes/osx/menu-back.png
--- a/application/palemoon/themes/osx/menu-forward.png
+++ b/application/palemoon/themes/osx/menu-forward.png
--- a/application/palemoon/themes/osx/mixed-content-blocked-16.png
+++ b/application/palemoon/themes/osx/mixed-content-blocked-16.png
--- a/application/palemoon/themes/osx/mixed-content-blocked-64.png
+++ b/application/palemoon/themes/osx/mixed-content-blocked-64.png
--- a/application/palemoon/themes/osx/monitor.png
+++ b/application/palemoon/themes/osx/monitor.png
--- a/application/palemoon/themes/osx/monitor_16-10.png
+++ b/application/palemoon/themes/osx/monitor_16-10.png
--- a/application/palemoon/themes/osx/moz.build
+++ b/application/palemoon/themes/osx/moz.build
@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-DIRS += ['communicator']
-
-JAR_MANIFESTS += ['jar.mn']
--- a/application/palemoon/themes/osx/newtab/newTab.css
+++ b/application/palemoon/themes/osx/newtab/newTab.css
@ -1,36 +0,0 @@
-/* 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/. */
-
-%include ../../shared/newtab/newTab.css.inc
-
-.newtab-undo-button {
-  -moz-appearance: none;
-  color: -moz-nativehyperlinktext;
-  color: rgb(0,102,204);
-  cursor: pointer;
-  padding: 0;
-  margin: 0 4px;
-  border: 0;
-  background: transparent;
-  text-decoration: none;
-  min-width: 0;
-}
-
-.newtab-undo-button > .button-box {
-  padding: 0;
-}
-
-#newtab-undo-close-button {
-  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.png"), 0, 16, 16, 0);
-  background-position: center center;
-  background-repeat: no-repeat;
-}
-
-#newtab-undo-close-button:hover {
-  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.png"), 0, 32, 16, 16);
-}
-
-#newtab-undo-close-button:hover:active {
-  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.png"), 0, 48, 16, 32);
-}
--- a/application/palemoon/themes/osx/page-livemarks.png
+++ b/application/palemoon/themes/osx/page-livemarks.png
--- a/application/palemoon/themes/osx/page-livemarks@2x.png
+++ b/application/palemoon/themes/osx/page-livemarks@2x.png
--- a/application/palemoon/themes/osx/pageInfo.css
+++ b/application/palemoon/themes/osx/pageInfo.css
@ -1,258 +0,0 @@
-/* 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/. */
-
-@import "chrome://global/skin/";
-
-/* View buttons */
-#viewGroup {
-  padding-inline-start: 10px;
-}
-
-#viewGroup > radio {
-  list-style-image: url("chrome://browser/skin/pageInfo.png");
-  -moz-box-orient: vertical;
-  -moz-box-align: center;
-  -moz-appearance: none;
-  padding: 5px 3px 1px 3px;
-  margin: 0 1px;
-  min-width: 4.5em;
-}
-
-#viewGroup > radio:hover {
-  background-color: #E0E8F6;
-  color: black;
-}
-
-#viewGroup > radio[selected="true"] {
-  background-color: #C1D2EE;
-  color: black;
-}
-
-#topBar {
-  border-bottom: 2px groove ThreeDFace;
-  padding-inline-start: 10px;
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-}
-
-#generalTab {
-  -moz-image-region: rect(0px, 32px, 32px, 0px)
-}
-
-#generalTab:hover, #generalTab[selected="true"] {
-  -moz-image-region: rect(32px, 32px, 64px, 0px)
-}
-
-#mediaTab {
-  -moz-image-region: rect(0px, 64px, 32px, 32px)
-}
-
-#mediaTab:hover, #mediaTab[selected="true"] {
-  -moz-image-region: rect(32px, 64px, 64px, 32px)
-}
-
-#feedTab {
-  -moz-image-region: rect(0px, 96px, 32px, 64px)
-}
-
-#feedTab:hover, #feedTab[selected="true"] {
-  -moz-image-region: rect(32px, 96px, 64px, 64px)
-}
-
-#permTab {
-  -moz-image-region: rect(0px, 128px, 32px, 96px)
-}
-
-#permTab:hover, #permTab[selected="true"] {
-  -moz-image-region: rect(32px, 128px, 64px, 96px)
-}
-
-#securityTab {
-  -moz-image-region: rect(0px, 160px, 32px, 128px)
-}
-
-#securityTab:hover, #securityTab[selected="true"] {
-  -moz-image-region: rect(32px, 160px, 64px, 128px)
-}
-
-deck {
-  padding: 10px 10px 10px 10px;
-}
-
-/* Misc */
-tree {
-  margin: .5em;
-}
-
-.gridSeparator {
-  width: .5em;
-}
-
-textbox {
-  background: transparent !important;
-  border: none;
-  padding: 0px;
-  margin-top: 1px;
-  -moz-appearance: none;
-}
-
-textbox.header {
-  margin-inline-start: 0;
-}
-
-.iframe {
-  margin: .5em;
-  background: white;
-  overflow: auto;
-}
-
-.fixedsize {
-  height: 8.5em;
-}
-
-textbox[disabled] {
-  font-style: italic;
-}
-
-/* General Tab */
-groupbox.collapsable caption .caption-icon { 
-  width: 9px;
-  height: 9px;
-  background-repeat: no-repeat;
-  background-position: center;
-  margin-inline-start: 2px;
-  margin-inline-end: 2px;
-  background-image: url("chrome://global/skin/tree/twisty-open.png");
-}
-
-groupbox.collapsable[closed="true"] {
-  border: none;
-  margin-bottom: 9px;
-  -moz-appearance: none;
-}
-
-groupbox.collapsable[closed="true"] caption .caption-icon { 
-  background-image: url("chrome://global/skin/tree/twisty-clsd.png");
-}
-
-groupbox tree { 
-  margin: 0 3px;
-  border: none;
-}
-
-#securityBox description { 
-  margin-inline-start: 10px;
-}
-
-#general-security-identity {
-  white-space: pre-wrap;
-  line-height: 2em;
-}
-
-/* Media Tab */
-#imagetree {
-  min-height: 10em;
-  margin-bottom: 0;
-}
-
-#mediaSplitter {
-  border-style: none;
-  background: none;
-  height: .8em;
-}
-
-#mediaGrid {
-  min-height: 9em;
-}
-
-#mediaLabelColumn {
-  min-width: 10em;
-}
-
-#thepreviewimage {
-  margin: 1em;
-}
-
-treechildren::-moz-tree-cell-text(broken) {
-  font-style: italic;
-  color: graytext;
-}
-
-/* Feeds Tab */
-#feedtree {
-  margin-bottom: 0px;
-}
-
-#feedListbox richlistitem {
-  padding-top: 6px;
-  padding-bottom: 6px;
-  padding-inline-start: 7px;
-  padding-inline-end: 7px;
-  min-height: 25px;
-  border-bottom: 1px dotted #C0C0C0;
-}
-
-#feedListbox richlistitem[selected="true"] {
-  background-color: -moz-Dialog;
-  color: -moz-DialogText;
-}
-
-#feedListbox {
-  border: 2px solid;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-  -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
-}
-
-.feedTitle { 
-  font-weight: bold;
-}
-
-/* Permissions Tab */
-#permList {
-  margin-top: .5em;
-  overflow: auto;
-  border: 2px solid;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-  -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
-  background-color: -moz-field;
-}
-
-.permission {
-  padding-top: 6px;
-  padding-bottom: 6px;
-  padding-inline-start: 7px;
-  padding-inline-end: 7px;
-  min-height: 25px;
-  border-bottom: 1px dotted #C0C0C0;
-}
-
-.permissionLabel {
-  font-weight: bold;
-}
-
-.permission:hover {
-  background-color: -moz-dialog;
-}
-
-/* Security Tab */
-#securityPanel .caption-icon {
-  display: none;
-}
-
-#securityPanel .header {
-  font-size: 120%;
-}
- 
-#securityPanel .fieldLabel {
-  margin: 2px 10px 3px 10px;
-}
-
-#securityPanel .fieldValue {
-  font-weight: bold;
-  margin: 2px 10px 0px 10px;
-}
--- a/application/palemoon/themes/osx/pageInfo.png
+++ b/application/palemoon/themes/osx/pageInfo.png
--- a/application/palemoon/themes/osx/panel-expander-closed.png
+++ b/application/palemoon/themes/osx/panel-expander-closed.png
--- a/application/palemoon/themes/osx/panel-expander-closed@2x.png
+++ b/application/palemoon/themes/osx/panel-expander-closed@2x.png
--- a/application/palemoon/themes/osx/panel-expander-open.png
+++ b/application/palemoon/themes/osx/panel-expander-open.png
--- a/application/palemoon/themes/osx/panel-expander-open@2x.png
+++ b/application/palemoon/themes/osx/panel-expander-open@2x.png
--- a/application/palemoon/themes/osx/panel-plus-sign.png
+++ b/application/palemoon/themes/osx/panel-plus-sign.png
--- a/application/palemoon/themes/osx/permissions/aboutPermissions.css
+++ b/application/palemoon/themes/osx/permissions/aboutPermissions.css
@ -1,153 +0,0 @@
-/* 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/. */
-
-@import url("chrome://global/skin/inContentUI.css");
-
-/* header */
-
-#permissions-pagetitle {
-  font-size: 200%;
-  font-weight: bold;
-  padding-bottom: 0.5em;
-}
-
-/* content box */
-#permissions-content {
-  height: 100%;
-}
-
-/* sites box */
-
-#sites-box {
-  padding: 10px;
-  width: 25em;
-}
-
-#sites-filter {
-  margin: 0;
-}
-
-#sites-list {
-  -moz-appearance: none;
-  border: 1px solid rgba(0, 0, 0, 0.32);
-  background-color: rgba(255, 255, 255, 0.4);
-  margin: 5px 0 0 0;
-}
-
-.site {
-  padding: 4px;
-  border-bottom: 1px solid ThreeDLightShadow;
-}
-
-.site-favicon {
-  height: 16px;
-  width: 16px;
-  margin-inline-end: 4px;
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-}
-
-#all-sites-item > .site-container > .site-favicon {
-  list-style-image: none;
-}
-
-/* permissions box */
-
-#permissions-box {
-  padding-top: 10px;
-  overflow-y: auto;
-}
-
-#site-description {
-  font-size: 125%;
-  margin-inline-start: 6px; /* to match button margin */
-}
-
-#site-label {
-  font-weight: bold;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-#defaults-description {
-  font-size: 125%;
-  font-weight: bold;
-  margin-inline-start: 6px;
-}
-
-.pref-item {
-  margin-bottom: 10px;
-}
-
-.pref-icon {
-  width: 36px;
-  height: 36px;
-  margin-inline-end: 10px;
-}
-
-.pref-icon[type="password"] {
-  list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png);
-}
-.pref-icon[type="image"] {
-  list-style-image: url(chrome://global/skin/icons/question-64.png);
-}
-.pref-icon[type="popup"] {
-  list-style-image: url(chrome://global/skin/icons/question-64.png);
-}
-.pref-icon[type="cookie"] {
-  list-style-image: url(chrome://global/skin/icons/question-64.png);
-}
-.pref-icon[type="desktop-notification"] {
-  list-style-image: url(chrome://browser/skin/web-notifications-icon.svg);
-}
-.pref-icon[type="install"] {
-  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
-}
-.pref-icon[type="geo"] {
-  list-style-image: url(chrome://browser/skin/Geolocation-64.png);
-}
-.pref-icon[type="plugins"] {
-  list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
-}
-
-.pref-title {
-  font-size: 125%;
-  margin-bottom: 0;
-  font-weight: bold;
-  margin-right: 0;
-  padding-right: 0;
-}
-
-.pref-default {
-  margin-left: 0.5em;
-  padding-left: 0;
-}
-
-.pref-set-default {
-  visibility: collapse;
-}
-
-.pref-menulist {
-  margin-left: 6px;
-  margin-right: 6px;
-  min-width: 10em; /* native menulists ellipsize their longest entries by default on many themes */
-}
-
-.plugins-label {
-  margin-right: 0;
-  padding-right: 0;
-}
-
-.plugins-vulnerable {
-  margin-left: 0;
-  padding-left: 0;
-  margin-right: 0;
-  padding-right: 0;
-}
-
-.plugins-default {
-  margin-left: 0.5em;
-  padding-left: 0;
-  margin-right: 1em;
-  padding-right: 0;
-}
--- a/application/palemoon/themes/osx/places/allBookmarks.png
+++ b/application/palemoon/themes/osx/places/allBookmarks.png
--- a/application/palemoon/themes/osx/places/bookmark.png
+++ b/application/palemoon/themes/osx/places/bookmark.png
--- a/application/palemoon/themes/osx/places/bookmarksMenu.png
+++ b/application/palemoon/themes/osx/places/bookmarksMenu.png
--- a/application/palemoon/themes/osx/places/bookmarksToolbar.png
+++ b/application/palemoon/themes/osx/places/bookmarksToolbar.png
--- a/application/palemoon/themes/osx/places/bookmarksToolbar@2x.png
+++ b/application/palemoon/themes/osx/places/bookmarksToolbar@2x.png
--- a/application/palemoon/themes/osx/places/calendar.png
+++ b/application/palemoon/themes/osx/places/calendar.png
--- a/application/palemoon/themes/osx/places/downloads.png
+++ b/application/palemoon/themes/osx/places/downloads.png
--- a/application/palemoon/themes/osx/places/editBookmark.png
+++ b/application/palemoon/themes/osx/places/editBookmark.png
--- a/application/palemoon/themes/osx/places/editBookmarkOverlay.css
+++ b/application/palemoon/themes/osx/places/editBookmarkOverlay.css
@ -1,105 +0,0 @@
-/* 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/. */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-/**** folder menulist ****/
-.folder-icon > .menulist-label-box > .menulist-icon,
-.folder-icon > .menu-iconic-left > .menu-iconic-icon {
-  width: 16px;
-  height: 16px;
-}
-
-.folder-icon > .menu-iconic-left {
-  display: -moz-box;
-}
-
-.folder-icon {
-  list-style-image: url("chrome://global/skin/tree/folder.png") !important;
-}
-
-@media (min-resolution: 2dppx) {
-  .folder-icon {
-    list-style-image: url("chrome://global/skin/tree/folder@2x.png") !important;
-  }
-}
-
-.menulist-icon {
-  margin: 0 !important;
-}
-
-/**** expanders ****/
-
-.expander-up,
-.expander-down {
-  -moz-appearance: none;
-  margin: 0;
-  margin-left: 8px;
-  padding: 0;
-  min-width: 0;
-}
-
-.expander-up {
-  list-style-image: url("chrome://browser/skin/places/expander-open.png");
-}
-
-.expander-down {
-  list-style-image: url("chrome://browser/skin/places/expander-closed.png");
-}
-
-.expander-down:hover:active {
-  list-style-image: url("chrome://browser/skin/places/expander-closed-active.png");
-}
-
-.expander-up:hover:active {
-  list-style-image: url("chrome://browser/skin/places/expander-open-active.png");
-}
-
-#editBookmarkPanelContent {
-  min-width: 23em;
-}
-
-#editBMPanel_folderTree {
-  margin: 6px 4px 0 4px;
-}
-
-/* Hide the value column of the tag autocomplete popup
- * leaving only the comment column visible. This is
- * so that only the tag being edited is shown in the
- * popup.
- */
-#editBMPanel_tagsField #treecolAutoCompleteValue {
-  visibility: collapse;
-}
-
-
-/* ----- BOOKMARK PANEL DROPDOWN MENU ITEMS ----- */
-
-#editBMPanel_folderMenuList[selectedIndex="0"],
-#editBMPanel_toolbarFolderItem {
-  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important;  
-}
-
-#editBMPanel_folderMenuList[selectedIndex="1"],
-#editBMPanel_bmRootItem {
-  list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png") !important;  
-}
-
-#editBMPanel_folderMenuList[selectedIndex="2"],
-#editBMPanel_unfiledRootItem {
-  list-style-image: url("chrome://browser/skin/places/unfiledBookmarks.png") !important;  
-}
-
-@media (min-resolution: 2dppx) {
-  #editBMPanel_folderMenuList[selectedIndex="0"],
-  #editBMPanel_toolbarFolderItem {
-    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png") !important;
-  }
-
-  #editBMPanel_folderMenuList[selectedIndex="2"],
-  #editBMPanel_unfiledRootItem {
-    list-style-image: url("chrome://browser/skin/places/unfiledBookmarks@2x.png") !important;
-  }
-}
--- a/application/palemoon/themes/osx/places/expander-closed-active.png
+++ b/application/palemoon/themes/osx/places/expander-closed-active.png
--- a/application/palemoon/themes/osx/places/expander-closed.png
+++ b/application/palemoon/themes/osx/places/expander-closed.png
--- a/application/palemoon/themes/osx/places/expander-open-active.png
+++ b/application/palemoon/themes/osx/places/expander-open-active.png
--- a/application/palemoon/themes/osx/places/expander-open.png
+++ b/application/palemoon/themes/osx/places/expander-open.png
--- a/application/palemoon/themes/osx/places/folderDropArrow.png
+++ b/application/palemoon/themes/osx/places/folderDropArrow.png
--- a/application/palemoon/themes/osx/places/folderDropArrow@2x.png
+++ b/application/palemoon/themes/osx/places/folderDropArrow@2x.png
--- a/application/palemoon/themes/osx/places/history.png
+++ b/application/palemoon/themes/osx/places/history.png
--- a/Show more
+++ b/Show more