[Pkg-mozext-commits] [status-4-evar] 01/08: Imported Upstream version 2014.05.03.06

Damyan Ivanov dmn at moszumanska.debian.org
Tue May 13 08:45:56 UTC 2014


This is an automated email from the git hooks/post-receive script.

dmn pushed a commit to branch master
in repository status-4-evar.

commit 7df6167bda7aba62aa41d39f0bf9fa563e6c981d
Author: Damyan Ivanov <dmn at debian.org>
Date:   Tue May 13 06:06:29 2014 +0000

    Imported Upstream version 2014.05.03.06
---
 LICENSE                                | 373 +++++++++++++++++++++++++++++++++
 chrome.manifest                        | 141 +++++--------
 chrome/content/australis.js            |  58 +++++
 chrome/content/australis.xul           |  38 ++++
 chrome/content/legacy.xul              |  24 +++
 chrome/content/overlay.css             |  43 +---
 chrome/content/overlay.js              |  44 +---
 chrome/content/overlay.xul             |  57 ++---
 chrome/content/prefs.css               |  43 +---
 chrome/content/prefs.js                |  43 +---
 chrome/content/prefs.xml               |  43 +---
 chrome/content/prefs.xul               |  52 ++---
 chrome/content/tabbrowser.xml          |  43 +---
 chrome/content/urlbarBindings.xml      |  52 ++---
 chrome/locale/LICENSE                  |  48 +++++
 chrome/locale/LICENSE.in               |  18 ++
 chrome/locale/bg-BG/overlay.properties |   1 +
 chrome/locale/bg-BG/prefs.dtd          |   4 +-
 chrome/locale/cs/overlay.properties    |   1 +
 chrome/locale/cs/prefs.dtd             |   4 +-
 chrome/locale/da/overlay.properties    |   1 +
 chrome/locale/da/prefs.dtd             |   6 +-
 chrome/locale/de/overlay.properties    |   1 +
 chrome/locale/de/prefs.dtd             |   4 +-
 chrome/locale/dsb/overlay.properties   |   1 +
 chrome/locale/dsb/prefs.dtd            |   4 +-
 chrome/locale/el/overlay.properties    |   1 +
 chrome/locale/el/prefs.dtd             |   4 +-
 chrome/locale/en-US/overlay.properties |   2 +
 chrome/locale/en-US/prefs.dtd          |   6 +-
 chrome/locale/eo/overlay.properties    |   1 +
 chrome/locale/eo/prefs.dtd             |   4 +-
 chrome/locale/es-ES/overlay.properties |   1 +
 chrome/locale/es-ES/prefs.dtd          |   4 +-
 chrome/locale/fr/overlay.properties    |   1 +
 chrome/locale/fr/prefs.dtd             |   4 +-
 chrome/locale/he/overlay.properties    |   1 +
 chrome/locale/he/prefs.dtd             |   4 +-
 chrome/locale/hsb/overlay.properties   |   1 +
 chrome/locale/hsb/prefs.dtd            |   4 +-
 chrome/locale/hu/overlay.properties    |   1 +
 chrome/locale/hu/prefs.dtd             |   4 +-
 chrome/locale/it-IT/overlay.properties |   1 +
 chrome/locale/it-IT/prefs.dtd          |   4 +-
 chrome/locale/ja-JP/overlay.properties |   1 +
 chrome/locale/ja-JP/prefs.dtd          |   4 +-
 chrome/locale/nb-NO/overlay.properties |   1 +
 chrome/locale/nb-NO/prefs.dtd          |   4 +-
 chrome/locale/nl/overlay.properties    |   1 +
 chrome/locale/nl/prefs.dtd             |   4 +-
 chrome/locale/pl/overlay.properties    |   1 +
 chrome/locale/pl/prefs.dtd             |   4 +-
 chrome/locale/pt-BR/overlay.properties |   1 +
 chrome/locale/pt-BR/prefs.dtd          |   4 +-
 chrome/locale/ro/meta.properties       |   2 +-
 chrome/locale/ro/overlay.properties    |   1 +
 chrome/locale/ro/prefs.dtd             |  92 ++++----
 chrome/locale/ru/overlay.properties    |   1 +
 chrome/locale/ru/prefs.dtd             |   4 +-
 chrome/locale/sr/overlay.properties    |   1 +
 chrome/locale/sr/prefs.dtd             |   6 +-
 chrome/locale/sv-SE/overlay.properties |   1 +
 chrome/locale/sv-SE/prefs.dtd          |   4 +-
 chrome/locale/tr/overlay.properties    |   1 +
 chrome/locale/tr/prefs.dtd             |   4 +-
 chrome/locale/zh-CN/overlay.properties |   1 +
 chrome/locale/zh-CN/prefs.dtd          |   4 +-
 chrome/locale/zh-TW/overlay.properties |   1 +
 chrome/locale/zh-TW/prefs.dtd          |   4 +-
 chrome/skin/all/australis.css          |  50 +++++
 chrome/skin/all/dynamic.css            |  43 +---
 chrome/skin/all/legacy.css             |  19 ++
 chrome/skin/all/overlay.css            | 133 +++++-------
 chrome/skin/all/prefs.css              |  43 +---
 chrome/skin/all/version/prefs19.css    |  44 ----
 chrome/skin/all/version/prefs26.css    |  19 ++
 chrome/skin/all/version/prefs28.css    |  19 ++
 chrome/skin/all/version/prefs29.css    |  19 ++
 chrome/skin/gnomestripe/australis.css  |  52 +++++
 chrome/skin/gnomestripe/legacy.css     |  32 +++
 chrome/skin/gnomestripe/overlay.css    |  68 +-----
 chrome/skin/gnomestripe/prefs.css      |  43 +---
 chrome/skin/pinstripe/australis.css    |  58 +++++
 chrome/skin/pinstripe/legacy.css       |  50 +++++
 chrome/skin/pinstripe/overlay.css      |  93 +-------
 chrome/skin/pinstripe/prefs.css        |  43 +---
 chrome/skin/winstripe/australis.css    |  60 ++++++
 chrome/skin/winstripe/legacy.css       |  24 +++
 chrome/skin/winstripe/overlay.css      |  56 +----
 chrome/skin/winstripe/prefs.css        |  43 +---
 components/status4evar.js              | 205 ++++++++++--------
 components/status4evar.xpt             | Bin 1334 -> 1427 bytes
 defaults/preferences/defaults.js       |  46 ++--
 install.rdf                            |  45 +---
 modules/Australis.jsm                  | 181 ++++++++++++++++
 modules/Downloads.jsm                  | 157 ++++++--------
 modules/Progress.jsm                   |  47 ++---
 modules/Status.jsm                     |  79 +++----
 modules/Status4Evar.jsm                | 184 ++++------------
 modules/Toolbars.jsm                   | 303 ++++++++++++++++++++++----
 100 files changed, 2118 insertions(+), 1487 deletions(-)

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..14e2f77
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  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/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff --git a/chrome.manifest b/chrome.manifest
index c73fdb5..08f7df3 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,93 +1,68 @@
 # ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
 # 
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Status-4-Evar.
-#
-# The Initial Developer of the Original Code is 
-# Matthew Turnbull <sparky at bluefang-logic.com>.
-#
-# Portions created by the Initial Developer are Copyright (C) 2013
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
+# 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/.
+# 
+# Copyright (C) 2010-2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+# 
 # ***** END LICENSE BLOCK *****
 
-# Content registration
-content	status4evar			chrome/content/
-
-resource status4evar			modules/
-
-# Locale registration
-locale	status4evar	en-US		chrome/locale/en-US/
-locale	status4evar	bg-BG		chrome/locale/bg-BG/
-locale	status4evar	cs		chrome/locale/cs/
-locale	status4evar	da		chrome/locale/da/
-locale	status4evar	de		chrome/locale/de/
-locale	status4evar	dsb		chrome/locale/dsb/
-locale	status4evar	el		chrome/locale/el/
-locale	status4evar	eo		chrome/locale/eo/
-locale	status4evar	es-ES		chrome/locale/es-ES/
-locale	status4evar	fr		chrome/locale/fr/
-locale	status4evar	he		chrome/locale/he/
-locale	status4evar	hsb		chrome/locale/hsb/
-locale	status4evar	hu		chrome/locale/hu/
-locale	status4evar	it-IT		chrome/locale/it-IT/
-locale	status4evar	ja-JP		chrome/locale/ja-JP/
-locale	status4evar	nb-NO		chrome/locale/nb-NO/
-locale	status4evar	nl		chrome/locale/nl/
-locale	status4evar	pl		chrome/locale/pl/
-locale	status4evar	pt-BR		chrome/locale/pt-BR/
-locale	status4evar	ro		chrome/locale/ro/
-locale	status4evar	ru		chrome/locale/ru/
-locale	status4evar	sr		chrome/locale/sr/
-locale	status4evar	sv-SE		chrome/locale/sv-SE/
-locale	status4evar	tr		chrome/locale/tr/
-locale	status4evar	zh-CN		chrome/locale/zh-CN/
-locale	status4evar	zh-TW		chrome/locale/zh-TW/
+# Paths
+content  status4evar chrome/content/
+resource status4evar modules/
 
-# Skin registration
-skin	status4evar	classic/1.0	chrome/skin/all/
-skin	status4evar-os	classic/1.0	chrome/skin/gnomestripe/
-skin	status4evar-os	classic/1.0	chrome/skin/winstripe/		os=WINNT
-skin	status4evar-os	classic/1.0	chrome/skin/pinstripe/		os=Darwin
+# Locales
+locale status4evar en-US chrome/locale/en-US/
+locale status4evar bg-BG chrome/locale/bg-BG/
+locale status4evar cs    chrome/locale/cs/
+locale status4evar da    chrome/locale/da/
+locale status4evar de    chrome/locale/de/
+locale status4evar dsb   chrome/locale/dsb/
+locale status4evar el    chrome/locale/el/
+locale status4evar eo    chrome/locale/eo/
+locale status4evar es-ES chrome/locale/es-ES/
+locale status4evar fr    chrome/locale/fr/
+locale status4evar he    chrome/locale/he/
+locale status4evar hsb   chrome/locale/hsb/
+locale status4evar hu    chrome/locale/hu/
+locale status4evar it-IT chrome/locale/it-IT/
+locale status4evar ja-JP chrome/locale/ja-JP/
+locale status4evar nb-NO chrome/locale/nb-NO/
+locale status4evar nl    chrome/locale/nl/
+locale status4evar pl    chrome/locale/pl/
+locale status4evar pt-BR chrome/locale/pt-BR/
+locale status4evar ro    chrome/locale/ro/
+locale status4evar ru    chrome/locale/ru/
+locale status4evar sr    chrome/locale/sr/
+locale status4evar sv-SE chrome/locale/sv-SE/
+locale status4evar tr    chrome/locale/tr/
+locale status4evar zh-CN chrome/locale/zh-CN/
+locale status4evar zh-TW chrome/locale/zh-TW/
 
-# Browser overlays
-overlay	chrome://browser/content/browser.xul		chrome://status4evar/content/overlay.xul
+# Skin
+skin status4evar    classic/1.0 chrome/skin/all/
+skin status4evar-os classic/1.0 chrome/skin/gnomestripe/
+skin status4evar-os classic/1.0 chrome/skin/winstripe/   os=WINNT
+skin status4evar-os classic/1.0 chrome/skin/pinstripe/   os=Darwin
 
-# Toolbar overlays
-style	chrome://global/content/customizeToolbar.xul	chrome://status4evar/content/overlay.css
-style	chrome://global/content/customizeToolbar.xul	chrome://status4evar/skin/overlay.css
-style	chrome://global/content/customizeToolbar.xul	chrome://status4evar-os/skin/overlay.css
+# Overlays
+overlay chrome://browser/content/browser.xul chrome://status4evar/content/overlay.xul
+overlay chrome://browser/content/browser.xul chrome://status4evar/content/australis.xul appversion>=29.0
+overlay chrome://browser/content/browser.xul chrome://status4evar/content/legacy.xul    appversion<=28.*
 
-# Pref overlays
-style	chrome://status4evar/content/prefs.xul		chrome://status4evar/skin/version/prefs19.css		appversion<=19.0.*
+# Styles
+style   chrome://global/content/customizeToolbar.xul chrome://status4evar/content/overlay.css      appversion<=28.*
+style   chrome://global/content/customizeToolbar.xul chrome://status4evar/skin/overlay.css         appversion<=28.*
+style   chrome://global/content/customizeToolbar.xul chrome://status4evar-os/skin/overlay.css      appversion<=28.*
+style   chrome://global/content/customizeToolbar.xul chrome://status4evar-os/skin/legacy.css       appversion<=28.*
+style   chrome://status4evar/content/prefs.xul       chrome://status4evar/skin/version/prefs26.css appversion>=26.0
+style   chrome://status4evar/content/prefs.xul       chrome://status4evar/skin/version/prefs28.css appversion<=28.*
+style   chrome://status4evar/content/prefs.xul       chrome://status4evar/skin/version/prefs29.css appversion>=29.0
 
-# XPCOM registration
-interfaces	components/status4evar.xpt
-component	{13b3595e-7bb5-4cfe-bbfa-82c900a4d7bf}	components/status4evar.js
-contract	@caligonstudios.com/status4evar;1	{13b3595e-7bb5-4cfe-bbfa-82c900a4d7bf}
-category	profile-after-change Status-4-Evar	@caligonstudios.com/status4evar;1
+# XPCOM
+interfaces components/status4evar.xpt
+component  {13b3595e-7bb5-4cfe-bbfa-82c900a4d7bf} components/status4evar.js
+contract   @caligonstudios.com/status4evar;1      {13b3595e-7bb5-4cfe-bbfa-82c900a4d7bf}
+category   profile-after-change Status-4-Evar     @caligonstudios.com/status4evar;1
 
diff --git a/chrome/content/australis.js b/chrome/content/australis.js
new file mode 100644
index 0000000..d194e7a
--- /dev/null
+++ b/chrome/content/australis.js
@@ -0,0 +1,58 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
+ * 
+ * Original code copyright (C) Mozilla Foundation. All Rights Reserved.
+ * Copyright (C) 2013 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+ *
+ * Toolbar popup handling code based on Mozilla Foundation code:
+ * https://hg.mozilla.org/mozilla-central/file/6fae9d6feec8/browser/base/content/browser.js#l4114
+ * Updated to add gNavToolbox.externalToolbars to toolbarNodes list.
+*/
+
+Components.utils.import("resource://status4evar/Australis.jsm");
+
+function onViewToolbarsPopupShowing(aEvent, aInsertPoint) {
+  var popup = aEvent.target;
+  if (popup != aEvent.currentTarget)
+    return;
+
+  // Empty the menu
+  for (var i = popup.childNodes.length-1; i >= 0; --i) {
+    var deadItem = popup.childNodes[i];
+    if (deadItem.hasAttribute("toolbarId"))
+      popup.removeChild(deadItem);
+  }
+
+  var firstMenuItem = aInsertPoint || popup.firstChild;
+
+  let toolbarNodes = Array.slice(gNavToolbox.childNodes);
+  toolbarNodes = toolbarNodes.concat(Array.slice(gNavToolbox.externalToolbars));
+
+  for (let toolbar of toolbarNodes) {
+    let toolbarName = toolbar.getAttribute("toolbarname");
+    if (toolbarName) {
+      let menuItem = document.createElement("menuitem");
+      let hidingAttribute = toolbar.getAttribute("type") == "menubar" ?
+                            "autohide" : "collapsed";
+      menuItem.setAttribute("id", "toggle_" + toolbar.id);
+      menuItem.setAttribute("toolbarId", toolbar.id);
+      menuItem.setAttribute("type", "checkbox");
+      menuItem.setAttribute("label", toolbarName);
+      menuItem.setAttribute("checked", toolbar.getAttribute(hidingAttribute) != "true");
+      menuItem.setAttribute("accesskey", toolbar.getAttribute("accesskey"));
+      if (popup.id != "toolbar-context-menu")
+        menuItem.setAttribute("key", toolbar.getAttribute("key"));
+
+      popup.insertBefore(menuItem, firstMenuItem);
+
+      menuItem.addEventListener("command", onViewToolbarCommand, false);
+    }
+  }
+}
+
diff --git a/chrome/content/australis.xul b/chrome/content/australis.xul
new file mode 100644
index 0000000..640131f
--- /dev/null
+++ b/chrome/content/australis.xul
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE overlay>
+
+<!--
+   - ***** BEGIN LICENSE BLOCK *****
+   - 
+   - 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/.
+   - 
+   - Copyright (C) 2013 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+   - 
+   - ***** END LICENSE BLOCK *****
+-->
+
+<?xml-stylesheet href="chrome://status4evar/skin/australis.css" type="text/css" ?>
+<?xml-stylesheet href="chrome://status4evar-os/skin/australis.css" type="text/css" ?>
+
+<overlay id="status4evar-australis-overlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+	<script type="application/javascript" src="chrome://status4evar/content/australis.js"/>
+
+	<vbox id="browser-bottombox">
+		<toolbar id="status4evar-status-bar"
+			toolbarname="Status Bar"
+			accesskey="S"
+			customizable="true"
+			class="toolbar-primary"
+			context="toolbar-context-menu"
+			mode="icons"
+			iconsize="small"
+			ordinal="100"
+			toolboxid="navigator-toolbox">
+		</toolbar>
+	</vbox>
+</overlay>
+
diff --git a/chrome/content/legacy.xul b/chrome/content/legacy.xul
new file mode 100644
index 0000000..208d720
--- /dev/null
+++ b/chrome/content/legacy.xul
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE overlay>
+
+<!--
+   - ***** BEGIN LICENSE BLOCK *****
+   - 
+   - 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/.
+   - 
+   - Copyright (C) 2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+   - 
+   - ***** END LICENSE BLOCK *****
+-->
+
+<?xml-stylesheet href="chrome://status4evar/skin/legacy.css" type="text/css" ?>
+<?xml-stylesheet href="chrome://status4evar-os/skin/legacy.css" type="text/css" ?>
+
+<overlay id="status4evar-legacy-overlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+	<statusbar id="status-bar" ordinal="1" />
+</overlay>
+
diff --git a/chrome/content/overlay.css b/chrome/content/overlay.css
index 3deb850..0ccf09f 100644
--- a/chrome/content/overlay.css
+++ b/chrome/content/overlay.css
@@ -1,39 +1,14 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * Copyright (C) 2010-2011, 2013 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * ***** END LICENSE BLOCK *****
+*/
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
diff --git a/chrome/content/overlay.js b/chrome/content/overlay.js
index c38c548..0bf846c 100644
--- a/chrome/content/overlay.js
+++ b/chrome/content/overlay.js
@@ -1,39 +1,15 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * 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/.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * Original code copyright (C) Mozilla Foundation. All Rights Reserved.
+ * Copyright (C) 2010, 2012, 2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
 
 if(!caligon) var caligon = {};
 
diff --git a/chrome/content/overlay.xul b/chrome/content/overlay.xul
index a7e18ea..58d34da 100644
--- a/chrome/content/overlay.xul
+++ b/chrome/content/overlay.xul
@@ -1,42 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE overlay SYSTEM "chrome://status4evar/locale/overlay.dtd">
 
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
+<!--
+   - ***** BEGIN LICENSE BLOCK *****
    - 
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Status-4-Evar.
-   -
-   - The Initial Developer of the Original Code is 
-   - Matthew Turnbull <sparky at bluefang-logic.com>.
-   -
-   - Portions created by the Initial Developer are Copyright (C) 2013
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
+   - 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/.
    - 
-   - ***** END LICENSE BLOCK ***** -->
+   - Copyright (C) 2010-2011, 2013 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+   - 
+   - ***** END LICENSE BLOCK *****
+-->
 
 <?xml-stylesheet href="chrome://status4evar/content/overlay.css" type="text/css" ?>
 <?xml-stylesheet href="chrome://status4evar/skin/overlay.css" type="text/css" ?>
@@ -56,12 +31,21 @@
 		<command id="S4E:Options" oncommand="caligon.status4evar.launchOptions(window);"/>
 	</commandset>
 
+	<popupset id="mainPopupSet">
+		<hbox id="status4evar-download-notification-container" mousethrough="always">
+			<vbox id="status4evar-download-notification-anchor">
+				<vbox id="status4evar-download-notification-icon" />
+			</vbox>
+		</hbox>
+	</popupset>
+
 	<toolbarpalette id="BrowserToolbarPalette">
 		<toolbaritem id="status4evar-status-widget"
 		             title="&status4evar.status.widget.title;"
 		             removable="true" flex="1" persist="width" width="100">
 			<label id="status4evar-status-text" flex="1" crop="end" value="&status4evar.status.widget.title;" />
 		</toolbaritem>
+
 		<toolbarbutton id="status4evar-download-button"
 		               title="&status4evar.download.widget.title;"
 		               class="toolbarbutton-1 chromeclass-toolbar-additional"
@@ -72,17 +56,18 @@
 				<vbox pack="end">
 					<progressmeter id="status4evar-download-progress-bar" mode="normal" value="0" collapsed="true" min="0" max="100" />
 				</vbox>
-				<vbox id="status4evar-download-notification-icon" />
 			</stack>
 			<tooltip id="status4evar-download-tooltip" />
 			<label id="status4evar-download-label" value="&status4evar.download.widget.title;" class="toolbarbutton-text" crop="right" flex="1" />
 		</toolbarbutton>
+
 		<toolbaritem id="status4evar-progress-widget"
 		             title="&status4evar.progress.widget.title;"
 		             removable="true">
 			<progressmeter id="status4evar-progress-bar" class="progressmeter-statusbar"
 			               mode="normal" value="0" collapsed="true" min="0" max="100" />
 		</toolbaritem>
+
 		<toolbarbutton id="status4evar-options-button"
 		               title="&status4evar.options.widget.title;"
 		               class="toolbarbutton-1 chromeclass-toolbar-additional"
@@ -93,7 +78,5 @@
 	<textbox id="urlbar" pmpack="end">
 		<progressmeter id="urlbar-progress-alt"  mode="normal" value="0" collapsed="true" />
 	</textbox>
-
-	<statusbar id="status-bar" ordinal="1" />
 </overlay>
 
diff --git a/chrome/content/prefs.css b/chrome/content/prefs.css
index f6e349b..7cd58a9 100644
--- a/chrome/content/prefs.css
+++ b/chrome/content/prefs.css
@@ -1,39 +1,14 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * 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/.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * Copyright (C) 2011 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
diff --git a/chrome/content/prefs.js b/chrome/content/prefs.js
index b53e4d7..e470eb9 100644
--- a/chrome/content/prefs.js
+++ b/chrome/content/prefs.js
@@ -1,39 +1,14 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * 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/.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * Copyright (C) 2011-2013 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
 
 Components.utils.import("resource://gre/modules/Services.jsm");
 
diff --git a/chrome/content/prefs.xml b/chrome/content/prefs.xml
index 581dafa..82f0dd6 100644
--- a/chrome/content/prefs.xml
+++ b/chrome/content/prefs.xml
@@ -1,42 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE bindings SYSTEM "chrome://status4evar/locale/prefs.dtd">
 
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
+<!--
+   - ***** BEGIN LICENSE BLOCK *****
+   - 
+   - 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/.
    - 
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Status-4-Evar.
-   -
-   - The Initial Developer of the Original Code is 
-   - Matthew Turnbull <sparky at bluefang-logic.com>.
-   -
-   - Portions created by the Initial Developer are Copyright (C) 2013
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
+   - Copyright (C) 2011 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
    - 
-   - ***** END LICENSE BLOCK ***** -->
+   - ***** END LICENSE BLOCK *****
+-->
 
 <bindings id="status4evar-prefs-bindings"
           xmlns="http://www.mozilla.org/xbl"
diff --git a/chrome/content/prefs.xul b/chrome/content/prefs.xul
index 7eccd92..214c6b9 100644
--- a/chrome/content/prefs.xul
+++ b/chrome/content/prefs.xul
@@ -6,42 +6,17 @@
 	%prefsDTD;
 ]>
 
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
+<!--
+   - ***** BEGIN LICENSE BLOCK *****
    - 
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Status-4-Evar.
-   -
-   - The Initial Developer of the Original Code is 
-   - Matthew Turnbull <sparky at bluefang-logic.com>.
-   -
-   - Portions created by the Initial Developer are Copyright (C) 2013
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
+   - 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/.
    - 
-   - ***** END LICENSE BLOCK ***** -->
+   - Copyright (C) 2010-2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+   - 
+   - ***** END LICENSE BLOCK *****
+-->
 
 <?xml-stylesheet href="chrome://global/skin/config.css" type="text/css" ?>
 <?xml-stylesheet href="chrome://browser/skin/browser.css" type="text/css" ?>
@@ -369,9 +344,7 @@
 				<menupopup>
 					<menuitem value="0" label="&status4evar.option.nothing;" />
 					<menuitem value="1" label="&status4evar.option.firefoxdefault;" />
-					<menuitem value="2" label="&status4evar.option.download.panel;" />
-					<menuitem value="3" label="&status4evar.option.download.library;" />
-					<menuitem value="4" label="&status4evar.option.download.classic;" />
+					<menuitem value="2" label="&status4evar.option.download.library;" />
 				</menupopup>
 			</menulist>
 		</hbox>
@@ -412,6 +385,7 @@
 		<preferences>
 			<preference id="status4evar-pref-addonbar-borderStyle"   name="status4evar.addonbar.borderStyle"   type="bool" />
 			<preference id="status4evar-pref-addonbar-closeButton"   name="status4evar.addonbar.closeButton"   type="bool" />
+			<preference id="status4evar-pref-addonbar-legacyShim"    name="status4evar.addonbar.legacyShim"    type="bool" />
 			<preference id="status4evar-pref-addonbar-windowGripper" name="status4evar.addonbar.windowGripper" type="bool" />
 		</preferences>
 
@@ -419,6 +393,8 @@
 
 		<checkbox id="status4evar-addonbar-closeButton-check" preference="status4evar-pref-addonbar-closeButton" label="&status4evar.addonbar.closeButton;" />
 
+		<checkbox id="status4evar-addonbar-legacyShim-check" preference="status4evar-pref-addonbar-legacyShim" label="&status4evar.addonbar.legacyShim;" />
+
 		<checkbox id="status4evar-addonbar-windowGripper-check" preference="status4evar-pref-addonbar-windowGripper" label="&status4evar.addonbar.windowGripper;" />
 	</prefpane>
 
@@ -426,6 +402,7 @@
 		<preferences>
 			<preference id="status4evar-pref-advanced-showWarning"             name="status4evar.advanced.showWarning"             type="bool" />
 			<preference id="status4evar-pref-advanced-status-detectFullScreen" name="status4evar.advanced.status.detectFullScreen" type="bool" />
+			<preference id="status4evar-pref-advanced-status-detectVideo"      name="status4evar.advanced.status.detectVideo"      type="bool" />
 			<preference id="status4evar-pref-advanced-urlbar-forceBinding"     name="status4evar.advanced.urlbar.forceBinding"     type="bool" />
 			<preference id="toolkit-pref-classic-download-window"              name="browser.download.useToolkitUI"                type="bool" />
 		</preferences>
@@ -464,6 +441,7 @@
 					<caption label="&status4evar.pane.status;" />
 
 					<checkbox id="status4evar-advanced-status-detectFullScreen-check" preference="status4evar-pref-advanced-status-detectFullScreen" label="&status4evar.advanced.status.detectFullScreen;" />
+					<checkbox id="status4evar-advanced-status-detectVideo-check" preference="status4evar-pref-advanced-status-detectVideo" label="&status4evar.advanced.status.detectVideo;" />
 				</groupbox>
 
 				<groupbox id="status4evar-advanced-download">
diff --git a/chrome/content/tabbrowser.xml b/chrome/content/tabbrowser.xml
index eaac01f..1b2eea8 100644
--- a/chrome/content/tabbrowser.xml
+++ b/chrome/content/tabbrowser.xml
@@ -1,41 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
+<!--
+   - ***** BEGIN LICENSE BLOCK *****
    - 
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Status-4-Evar.
-   -
-   - The Initial Developer of the Original Code is 
-   - Matthew Turnbull <sparky at bluefang-logic.com>.
-   -
-   - Portions created by the Initial Developer are Copyright (C) 2013
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
+   - 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/.
    - 
-   - ***** END LICENSE BLOCK ***** -->
+   - Copyright (C) 2011-2013 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+   - 
+   - ***** END LICENSE BLOCK *****
+-->
 
 <bindings id="status4evar-bindings"
           xmlns="http://www.mozilla.org/xbl"
diff --git a/chrome/content/urlbarBindings.xml b/chrome/content/urlbarBindings.xml
index 6a28955..4fd7098 100644
--- a/chrome/content/urlbarBindings.xml
+++ b/chrome/content/urlbarBindings.xml
@@ -1,44 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+<!--
+   - ***** BEGIN LICENSE BLOCK *****
    - 
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
+   - 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/.
    - 
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
+   - Original code copyright (C) 2010 Margaret Leibovic <margaret.leibovic at gmail.com>. All Rights Reserved.
+   - Original code copyright (C) 2010 Drew Willcoxon <adw at mozilla.com>. All Rights Reserved.
+   - Copyright (C) 2011-2013 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
    - 
-   - The Original Code is Mozilla Firefox.
+   - ***** END LICENSE BLOCK *****
+   -
+   - Original status overlay implementation by Drew Willcoxon.
+   - Adapted from the back-out patch:
+   - https://hg.mozilla.org/mozilla-central/rev/d384e2adf22e
    - 
-   - The Initial Developer of the Original Code is
-   - Simon Bünzli <zeniko at gmail.com>
-   - 
-   - Portions created by the Initial Developer are Copyright (C) 2006
-   - the Initial Developer. All Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Dão Gottwald <dao at design-noir.de>
-   -   Drew Willcoxon <adw at mozilla.com>
-   -   Matthew Turnbull <sparky at bluefang-logic.com>
-   - 
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   - 
-   - ***** END LICENSE BLOCK ***** -->
+   - Original progress line code by Margaret Leibovic.
+   - Adapted from the back-out patch:
+   - https://hg.mozilla.org/mozilla-central/rev/42270894db65
+-->
 
 <bindings id="status4evar-bindings"
           xmlns="http://www.mozilla.org/xbl"
diff --git a/chrome/locale/LICENSE b/chrome/locale/LICENSE
new file mode 100644
index 0000000..f26e5e8
--- /dev/null
+++ b/chrome/locale/LICENSE
@@ -0,0 +1,48 @@
+All locale files are covered under the following license:
+
+***** BEGIN LICENSE BLOCK *****
+
+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/.
+
+en-US copyright (C) 2011-2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+
+The following contributations have been made by users of the
+BabelZilla translation service.
+http://www.babelzilla.org/forum/index.php?showtopic=6532
+
+bg-BG copyright (C) 2011-2014 Martin - Varna. All Rights Reserved.
+cs copyright (C) 2011-2014 Michal Stanke. All Rights Reserved.
+da copyright (C) 2011-2014 Joergen. All Rights Reserved.
+de copyright (C) 2011 Archaeopteryx, o.roth (ReinekeFux). All Rights Reserved.
+de copyright (C) 2012 Archaeopteryx, Endor, O.Roth (ReinekeFux). All Rights Reserved.
+de copyright (C) 2012-2014 Archaeopteryx, Endor, o.roth (ReinekeFux). All Rights Reserved.
+dsb copyright (C) 2011-2014 milupo. All Rights Reserved.
+el copyright (C) 2011 Γιώργος Μαλαμάς [el]. All Rights Reserved.
+el copyright (C) 2011-2014 Γιώργος Μαλαμάς. All Rights Reserved.
+eo copyright (C) 2011-2014 Milupo. All Rights Reserved.
+es-ES copyright (C) 2011 José I. Plaza. All Rights Reserved.
+es-ES copyright (C) 2011-2014 Carlos Mella, José I. Plaza. All Rights Reserved.
+fr copyright (C) 2011-2014 Jojaba. All Rights Reserved.
+he copyright (C) 2011-2014 SiiiE. All Rights Reserved.
+hsb copyright (C) 2011-2014 Milupo. All Rights Reserved.
+hu copyright (C) 2011-2014 Kozák Csaba (WonderCsabo). All Rights Reserved.
+it-IT copyright (C) 2011-2014 Emanuele Alimonda. All Rights Reserved.
+ja-JP copyright (C) 2011 能美涼子. All Rights Reserved.
+ja-JP copyright (C) 2011-2014 k2jp, 能美涼子. All Rights Reserved.
+nb-NO copyright (C) 2011-2014 Håvar Ingmund Henriksen. All Rights Reserved.
+nl copyright (C) 2011-2014 Martijn Weisbeek. All Rights Reserved.
+pl copyright (C) 2011 Leepa, momus, teo. All Rights Reserved.
+pl copyright (C) 2011-2014 Leepa, Leszek(teo)Życzkowski, momus. All Rights Reserved.
+pt-BR copyright (C) 2011-2014 Gutierrez PS. All Rights Reserved.
+ro copyright (C) 2011-2014 Cătălin Zamfirescu (x10firefox). All Rights Reserved.
+ru copyright (C) 2011-2014 Пирятинский Виталий. All Rights Reserved.
+sr copyright (C) 2011-2014 Rancher. All Rights Reserved.
+sv-SE copyright (C) 2011-2014 Mikael Hiort af Ornäs. All Rights Reserved.
+tr copyright (C) 2011-2014 ckk, omrakin. All Rights Reserved.
+zh-CN copyright (C) 2011-2014 Cye3s, yongdong7. All Rights Reserved.
+zh-TW copyright (C) 2011-2014 velociraptor. All Rights Reserved.
+
+***** END LICENSE BLOCK *****
+
diff --git a/chrome/locale/LICENSE.in b/chrome/locale/LICENSE.in
new file mode 100644
index 0000000..5154ebb
--- /dev/null
+++ b/chrome/locale/LICENSE.in
@@ -0,0 +1,18 @@
+All locale files are covered under the following license:
+
+***** BEGIN LICENSE BLOCK *****
+
+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/.
+
+en-US copyright (C) 2011-2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+
+The following contributations have been made by users of the
+BabelZilla translation service.
+http://www.babelzilla.org/forum/index.php?showtopic=6532
+
+%contributors%
+
+***** END LICENSE BLOCK *****
+
diff --git a/chrome/locale/bg-BG/overlay.properties b/chrome/locale/bg-BG/overlay.properties
index ab85aba..94a3291 100644
--- a/chrome/locale/bg-BG/overlay.properties
+++ b/chrome/locale/bg-BG/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Готово
 nv_stopped=Спряно
 nv_timeout=Изтекло време
 statusText=Текст за състоянието
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/bg-BG/prefs.dtd b/chrome/locale/bg-BG/prefs.dtd
index 5620ff5..19cfe8a 100644
--- a/chrome/locale/bg-BG/prefs.dtd
+++ b/chrome/locale/bg-BG/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "с интервали">
 <!ENTITY status4evar.option.round "с мащабиране">
 <!ENTITY status4evar.option.firefoxdefault "По подразбиране">
-<!ENTITY status4evar.option.download.panel "Панел">
 <!ENTITY status4evar.option.download.library "Библиотека">
-<!ENTITY status4evar.option.download.classic "Класически">
 <!ENTITY status4evar.unit.milliseconds "милисекунди">
 <!ENTITY status4evar.unit.seconds "секунди">
 <!ENTITY status4evar.unit.px "px">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Използване на алтернативни рамки за лентата с инструменти">
 <!ENTITY status4evar.addonbar.windowGripper "Показване на манипулатора за преоразмеряване на прозореца">
 <!ENTITY status4evar.addonbar.closeButton "Показване на бутона "Затвори"">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Разширените настройки може да създадат проблеми при работата на Status-4-Evar или на други добавки. Променяйте ги на Ваша отговорност.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Пробвай принудително XBL привързване на адресната лента.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Изберете тази настройка само ако имате проблеми с лентата за напредък, или ако текстът за състоянието не се показва правилно. Това може да спре други разширения, които се опитват да установят XBL привързване на адресната лента.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Разпознаване на пълноекранен режим и преоразмеряване на връзките/състоянието.">
+<!ENTITY status4evar.advanced.status.detectVideo "Скриване на изскачащите прозорци при HTML5 видео на цял екран.">
 <!ENTITY toolkit.classic.download.window.label "Класически прозорец за изтеглянията">
diff --git a/chrome/locale/cs/overlay.properties b/chrome/locale/cs/overlay.properties
index f8d5ae8..903e2ed 100644
--- a/chrome/locale/cs/overlay.properties
+++ b/chrome/locale/cs/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Hotovo
 nv_stopped=Pozastaveno
 nv_timeout=Vypršelo
 statusText=Stavový text
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/cs/prefs.dtd b/chrome/locale/cs/prefs.dtd
index c3f24a1..ecfb6ff 100644
--- a/chrome/locale/cs/prefs.dtd
+++ b/chrome/locale/cs/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Mezera">
 <!ENTITY status4evar.option.round "Kulaté">
 <!ENTITY status4evar.option.firefoxdefault "Firefox default">
-<!ENTITY status4evar.option.download.panel "Panel">
 <!ENTITY status4evar.option.download.library "Library">
-<!ENTITY status4evar.option.download.classic "Classic">
 <!ENTITY status4evar.unit.milliseconds "milliseconds">
 <!ENTITY status4evar.unit.seconds "vteřinách">
 <!ENTITY status4evar.unit.px "px">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Použít alternativní ohraničení lišty">
 <!ENTITY status4evar.addonbar.windowGripper "Zobrazit chytač změny velikosti okna">
 <!ENTITY status4evar.addonbar.closeButton "Zobrazit tlačítko zavření">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Tyto rozšířené možnosti mohou způsobit problémy se S-4-E nebo jinými rozšířeními. Změny ne vlastní nebezpečí.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Pokusit se vynutit XBL vazby adresního řádku.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Zvolte pouze pokud máte problémy se zobrazením činnosti nebo stavu v adresním řádku. Toto může potenciálně poškodit jiné rozšíření, které nastavuje XBL vazby adresního řádku.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Přizpůsobit zobrazení odkazů/stavu v režimu celé obrazovky.">
+<!ENTITY status4evar.advanced.status.detectVideo "Hide status popup in full-screen HTML5 video.">
 <!ENTITY toolkit.classic.download.window.label "Použít klasické okno stahování">
diff --git a/chrome/locale/da/overlay.properties b/chrome/locale/da/overlay.properties
index 57a7b8b..a61a0aa 100644
--- a/chrome/locale/da/overlay.properties
+++ b/chrome/locale/da/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Færdig
 nv_stopped=Stoppet
 nv_timeout=Fik timeout
 statusText=Statustekst
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/da/prefs.dtd b/chrome/locale/da/prefs.dtd
index cc90c8e..a019e78 100644
--- a/chrome/locale/da/prefs.dtd
+++ b/chrome/locale/da/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Mellemrum">
 <!ENTITY status4evar.option.round "Afrund">
 <!ENTITY status4evar.option.firefoxdefault "Firefox standard">
-<!ENTITY status4evar.option.download.panel "Panel">
 <!ENTITY status4evar.option.download.library "Bogmærker og historik">
-<!ENTITY status4evar.option.download.classic "Klassisk">
 <!ENTITY status4evar.unit.milliseconds "millisekunder">
 <!ENTITY status4evar.unit.seconds "sekunder">
 <!ENTITY status4evar.unit.px "px">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Anvend alternative kanter til værktøjslinje">
 <!ENTITY status4evar.addonbar.windowGripper "Vis gribelinjen til ændring af vinduesstørrelse">
 <!ENTITY status4evar.addonbar.closeButton "Vis knappen Luk">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Disse avancerede indstillinger kan forårsage problemer med Status-4-Evar eller andre udvidelser. Ændr på eget ansvar.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Forsøg af tvinge adresselinjen XBL-binding.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Vælg kun denne indstilling, hvis du har problemer med, at forløbet i adresselinjen eller statusteksten vises forkert. Den kan muligvis ødelægge andre udvidelser, som prøver at sætte en XBL-binding på adresselinjen.">
-<!ENTITY status4evar.advanced.status.detectFullScreen "Registrer fuldskærmstilstand og vis links/status korrekt.">
+<!ENTITY status4evar.advanced.status.detectFullScreen "Registrér fuldskærmstilstand og vis links/status korrekt.">
+<!ENTITY status4evar.advanced.status.detectVideo "Skjul status-pop op i fuldskærms-HTML-video.">
 <!ENTITY toolkit.classic.download.window.label "Brug klassisk filhentningsvindue">
diff --git a/chrome/locale/de/overlay.properties b/chrome/locale/de/overlay.properties
index 9a1648f..d3f7896 100644
--- a/chrome/locale/de/overlay.properties
+++ b/chrome/locale/de/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Fertig
 nv_stopped=Angehalten
 nv_timeout=Zeitüberschreitung
 statusText=Statustext
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/de/prefs.dtd b/chrome/locale/de/prefs.dtd
index 3aa3426..5aab596 100644
--- a/chrome/locale/de/prefs.dtd
+++ b/chrome/locale/de/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "verteilt">
 <!ENTITY status4evar.option.round "gerundet">
 <!ENTITY status4evar.option.firefoxdefault "Firefox Standard">
-<!ENTITY status4evar.option.download.panel "Panel">
 <!ENTITY status4evar.option.download.library "Bibliothek">
-<!ENTITY status4evar.option.download.classic "Klassisch">
 <!ENTITY status4evar.unit.milliseconds "Millisekunden">
 <!ENTITY status4evar.unit.seconds "Sekunden">
 <!ENTITY status4evar.unit.px "Pixel">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Alternativen Symbolleisten-Rand verwenden">
 <!ENTITY status4evar.addonbar.windowGripper "Anfasser zur Fenstergrößenänderung anzeigen">
 <!ENTITY status4evar.addonbar.closeButton "Schließen-Schaltfläche anzeigen">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Diese erweiterten Einstellungen können Probleme mit Status-4-Evar oder anderen Erweiterungen verursachen. Änderungen nur auf eigene Gefahr!">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "XBL-Bindung der Adressleiste erzwingen.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Nur auswählen wenn Sie Probleme mit der Darstellung der Fortschrittsanzeige in der Adressleiste oder dem Statustext haben. Dies kann möglicherweise Probleme, mit anderen Erweiterungen die eine XBL-Bindung auf der Adressleiste setzen, verursachen.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Vollbildmodus erkennen und Links bzw. Status entsprechend anzeigen.">
+<!ENTITY status4evar.advanced.status.detectVideo "Status Popup-Fenster bei HTML5 Videos ausblenden.">
 <!ENTITY toolkit.classic.download.window.label "Klassisches Download-Fenster verwenden">
diff --git a/chrome/locale/dsb/overlay.properties b/chrome/locale/dsb/overlay.properties
index bfa65ac..a13c044 100644
--- a/chrome/locale/dsb/overlay.properties
+++ b/chrome/locale/dsb/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Gótowo
 nv_stopped=Zastajony
 nv_timeout=Cas pśekšocony
 statusText=statusowy tekst
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/dsb/prefs.dtd b/chrome/locale/dsb/prefs.dtd
index 8ffe8b1..a20fb39 100644
--- a/chrome/locale/dsb/prefs.dtd
+++ b/chrome/locale/dsb/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Rum">
 <!ENTITY status4evar.option.round "Wótrownaś">
 <!ENTITY status4evar.option.firefoxdefault "Firefox standard">
-<!ENTITY status4evar.option.download.panel "Wobcerk">
 <!ENTITY status4evar.option.download.library "Biblioteka">
-<!ENTITY status4evar.option.download.classic "Klasiski">
 <!ENTITY status4evar.unit.milliseconds "milisekundach">
 <!ENTITY status4evar.unit.seconds "sekundach">
 <!ENTITY status4evar.unit.px "px">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Alternatiwne ramiki rědoweje kšomy wužywaś">
 <!ENTITY status4evar.addonbar.windowGripper "Pśimk za změnjanje wjelikosći wokna pokazaś">
 <!ENTITY status4evar.addonbar.closeButton "Tłocašk "Zacyniś" pokazaś">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Toś te rozšyrjone nastajenja mógu problemy z Status-4-Evar abo drugimi rozšyrjenjami zawinowaś. Změńśo je na swójo riziko.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Wopyt XBL-zwězanje adresowego póla wunuźiś.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Wuběŕśo to jano, jolic maśo problemy z póstupom adresowego póla abo jolic statusowy tekst njezwobraznja se korektnje. To mógło snaź druge rozšyrjenja kazyś, kótarež wopytuju XBL-zwězanje na adresowem pólu stajiś.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Modus połneje wobrazowki namakaś a wótkaze/status pśigódnje pokazaś.">
+<!ENTITY status4evar.advanced.status.detectVideo "Statusowe wuskokujuce wokno we wideo HTML5 w modusu połneje wobrazowki schowaś.">
 <!ENTITY toolkit.classic.download.window.label "Klasiske ześěgnjeńske wokno wužywaś">
diff --git a/chrome/locale/el/overlay.properties b/chrome/locale/el/overlay.properties
index c69ae3a..641bf92 100644
--- a/chrome/locale/el/overlay.properties
+++ b/chrome/locale/el/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Ολοκληρώθηκε
 nv_stopped=Διακόπηκε
 nv_timeout=Λήξη χρόνου
 statusText=Κείμενο κατάστασης
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/el/prefs.dtd b/chrome/locale/el/prefs.dtd
index e85810e..5c620cf 100644
--- a/chrome/locale/el/prefs.dtd
+++ b/chrome/locale/el/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Διάστημα">
 <!ENTITY status4evar.option.round "Προσαρμογή">
 <!ENTITY status4evar.option.firefoxdefault "Προεπιλεγμένη του Firefox">
-<!ENTITY status4evar.option.download.panel "Πίνακας λήψεων">
 <!ENTITY status4evar.option.download.library "Βιβλιοθήκη">
-<!ENTITY status4evar.option.download.classic "Κλασσικό παράθυρο λήψεων">
 <!ENTITY status4evar.unit.milliseconds "μιλιδευτερόλεπτα">
 <!ENTITY status4evar.unit.seconds "δευτερόλεπτα">
 <!ENTITY status4evar.unit.px "εικονοψηφίδες">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Χρήση εναλλακτικού περιγράμματος εργαλειοθήκης">
 <!ENTITY status4evar.addonbar.windowGripper "Εμφάνιση της λαβής αλλαγής μεγέθους του παραθύρου">
 <!ENTITY status4evar.addonbar.closeButton "Εμφάνιση του κουμπιού κλεισίματος">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Αυτές οι προηγμένες ρυθμίσεις μπορεί να προκαλέσουν προβλήματα με την επέκταση 'Status-4-EVAR' ή άλλες επεκτάσεις. Τροποποιήστε τις με δικό σας ρίσκο.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Προσπάθεια επιβολής της διάδεσης XBL γραμμής τοποθεσιών.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Δοκιμάστε αυτήν την επιλογή μόνο εάν έχετε προβλήματα σωστής εμφάνισης της προόδου ή του κειμένου κατάστασης στη γραμμή τοποθεσιών. Αυτό εν δυνάμει διασπάει άλλες επεκτάσεις που προσπαθούν να θέσουν κάποια διάδεση XBL στη γραμμή τοποθεσιών.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Ανίχνευση λειτουργίας πλήρους οθόνης και εμφάνιση δεσμών/κατάστασης κατάλληλα.">
+<!ENTITY status4evar.advanced.status.detectVideo "Απόκρυψη αναδυόμενου κατάστασης κατά την προβολή βίντεο HTML5 σε πλήρη οθόνη.">
 <!ENTITY toolkit.classic.download.window.label "Χρήση κλασικού παραθύρου λήψεων">
diff --git a/chrome/locale/en-US/overlay.properties b/chrome/locale/en-US/overlay.properties
index de25b0a..cda1f66 100644
--- a/chrome/locale/en-US/overlay.properties
+++ b/chrome/locale/en-US/overlay.properties
@@ -13,3 +13,5 @@ nv_timeout=Timed Out
 # Should be the same as status4evar.status.widget.title
 statusText=Status Text
 
+legacyWidgetTitle=Legacy Status Bar
+
diff --git a/chrome/locale/en-US/prefs.dtd b/chrome/locale/en-US/prefs.dtd
index 4bf0e27..846930e 100644
--- a/chrome/locale/en-US/prefs.dtd
+++ b/chrome/locale/en-US/prefs.dtd
@@ -38,9 +38,7 @@
 <!ENTITY status4evar.option.space "Space">
 <!ENTITY status4evar.option.round "Round">
 <!ENTITY status4evar.option.firefoxdefault "Firefox default">
-<!ENTITY status4evar.option.download.panel "Panel">
 <!ENTITY status4evar.option.download.library "Library">
-<!ENTITY status4evar.option.download.classic "Classic">
 
 <!ENTITY status4evar.unit.milliseconds "milliseconds">
 <!ENTITY status4evar.unit.seconds "seconds">
@@ -92,6 +90,7 @@
 <!ENTITY status4evar.editor.css.image.offset "Offset">
 
 
+
 <!ENTITY status4evar.download.button.action.label "Download status button action:">
 <!ENTITY status4evar.download.force.label "Always show the Download Status button">
 <!ENTITY status4evar.download.label.force.label "Show button text in icons-only mode">
@@ -108,10 +107,10 @@
 
 
 
-
 <!ENTITY status4evar.addonbar.borderStyle "Use alternate toolbar borders">
 <!ENTITY status4evar.addonbar.windowGripper "Show the window re-size gripper">
 <!ENTITY status4evar.addonbar.closeButton "Show the close button">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 
 
 
@@ -121,6 +120,7 @@
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Only select this if you have problems with the Location Bar progress or status text being displaying correctly. This will potentially break other extensions that try to set an XBL binding on the Location Bar.">
 
 <!ENTITY status4evar.advanced.status.detectFullScreen "Detect full-screen mode and show links/status appropriately.">
+<!ENTITY status4evar.advanced.status.detectVideo "Hide status popup in full-screen HTML5 video.">
 
 <!ENTITY toolkit.classic.download.window.label "Use classic download window">
 
diff --git a/chrome/locale/eo/overlay.properties b/chrome/locale/eo/overlay.properties
index 51b6f77..b9d0e2d 100644
--- a/chrome/locale/eo/overlay.properties
+++ b/chrome/locale/eo/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Preta
 nv_stopped=Haltigita
 nv_timeout=Eltempinta
 statusText=Statoteksto
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/eo/prefs.dtd b/chrome/locale/eo/prefs.dtd
index 43e5d61..ecb6a82 100644
--- a/chrome/locale/eo/prefs.dtd
+++ b/chrome/locale/eo/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Spaco">
 <!ENTITY status4evar.option.round "Rondigi">
 <!ENTITY status4evar.option.firefoxdefault "Firefox defaŭlta">
-<!ENTITY status4evar.option.download.panel "Panelo">
 <!ENTITY status4evar.option.download.library "Biblioteko">
-<!ENTITY status4evar.option.download.classic "Klasika">
 <!ENTITY status4evar.unit.milliseconds "milisekundoj">
 <!ENTITY status4evar.unit.seconds "sekundoj">
 <!ENTITY status4evar.unit.px "rastrumeroj">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Uzi alternativajn ilbretajn borderojn">
 <!ENTITY status4evar.addonbar.windowGripper "Montri prenilon por fenestroskalado">
 <!ENTITY status4evar.addonbar.closeButton "Montri butonon 'Fermi'">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Ĉi tiuj detalaj agordoj povas kaŭzi problemojn kun Status-4-Evar aŭ aliaj etendaĵoj. Modifu ilin je via propra risko.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Provo eldevigi la XBL-bindadon de la adresbreto.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Elektu tion nur, se vi havas problemojn kun  la plenumado de la adresbreto aŭ se la statoteksto ne estas korekte vidigata. Tio povas ĝeni aliajn etendaĵojn, kiuj provas agordi XBL-bindadon en la adresbreto.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Trovi tutekranan reĝimon a montri taŭge ligilon/staton.">
+<!ENTITY status4evar.advanced.status.detectVideo "Kaŝi statoŝprucfenestron en tutekrana video HTML5.">
 <!ENTITY toolkit.classic.download.window.label "Uzi klasikan elŝutfenestron">
diff --git a/chrome/locale/es-ES/overlay.properties b/chrome/locale/es-ES/overlay.properties
index 376e524..5ba2c9f 100644
--- a/chrome/locale/es-ES/overlay.properties
+++ b/chrome/locale/es-ES/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Terminado
 nv_stopped=Detenido
 nv_timeout=Tiempo máximo excedido
 statusText=Mensaje de estado
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/es-ES/prefs.dtd b/chrome/locale/es-ES/prefs.dtd
index da38c1e..66a3d24 100644
--- a/chrome/locale/es-ES/prefs.dtd
+++ b/chrome/locale/es-ES/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Espacio">
 <!ENTITY status4evar.option.round "Redondeado">
 <!ENTITY status4evar.option.firefoxdefault "Predeterminado de Firefox">
-<!ENTITY status4evar.option.download.panel "Panel">
 <!ENTITY status4evar.option.download.library "Catálogo">
-<!ENTITY status4evar.option.download.classic "Ventana clásica">
 <!ENTITY status4evar.unit.milliseconds "milisegundos">
 <!ENTITY status4evar.unit.seconds "segundos">
 <!ENTITY status4evar.unit.px "px">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Usar un estilo visual alternativo para los bordes">
 <!ENTITY status4evar.addonbar.windowGripper "Mostrar el deslizador para redimensionar la ventana">
 <!ENTITY status4evar.addonbar.closeButton "Mostrar el botón «Cerrar»">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Cambiar estas opciones avanzadas puede causar problemas con Status-4-Evar u otras extensiones. Hágalo bajo su propia responsabilidad.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Forzar la vinculación («binding») XBL a la barra de direcciones">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Habilite esta opción sólo si el medidor de progreso o el mensaje de estado no son mostrados correctamente en la barra de direcciones. Esto causará problemas potencialmente a otras extensiones que asocian una vinculación XBL a la barra de direcciones.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Detectar el modo de pantalla completa y mostrar debidamente los enlaces y mensajes de estado.">
+<!ENTITY status4evar.advanced.status.detectVideo "Oculta el mensaje de estado emergente cuando se reproduce vídeo HTML5 a pantalla completa.">
 <!ENTITY toolkit.classic.download.window.label "Usar la ventana de descargas clásica">
diff --git a/chrome/locale/fr/overlay.properties b/chrome/locale/fr/overlay.properties
index 267de0b..3ae9e06 100644
--- a/chrome/locale/fr/overlay.properties
+++ b/chrome/locale/fr/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Terminé
 nv_stopped=Arrêté
 nv_timeout=Hors délai
 statusText=Texte d'état
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/fr/prefs.dtd b/chrome/locale/fr/prefs.dtd
index 2f013f1..34726c6 100644
--- a/chrome/locale/fr/prefs.dtd
+++ b/chrome/locale/fr/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Espace">
 <!ENTITY status4evar.option.round "Arrondi">
 <!ENTITY status4evar.option.firefoxdefault "Défaut Firefox">
-<!ENTITY status4evar.option.download.panel "Panneau">
 <!ENTITY status4evar.option.download.library "Bibliothèque">
-<!ENTITY status4evar.option.download.classic "Classique">
 <!ENTITY status4evar.unit.milliseconds "millisecondes">
 <!ENTITY status4evar.unit.seconds "secondes">
 <!ENTITY status4evar.unit.px "px">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Utiliser les bordures de barre d'outils alternatives">
 <!ENTITY status4evar.addonbar.windowGripper "Afficher le pointeur de redimensionnement de fenêtre">
 <!ENTITY status4evar.addonbar.closeButton "Afficher le bouton de fermeture">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Ces paramètres avancés peuvent entraîner des problèmes avec Status-4-Evar ou d'autres extensions. Modifications à vos propre risques.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Tentative de forcer le binding XBL de la barre de navigation.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Ne sélectionnez ceci que si vous avez des problèmes avec l'affichage du texte de progression ou d'état de la barre de navigation. Cela pourra potentiellement endommager d'autres extensions qui tentent de définir le binding XBL sur la barre de navigation.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Détecter le mode plein écran et afficher les liens et l'état appropriés.">
+<!ENTITY status4evar.advanced.status.detectVideo "Masquer la popup d'état pour une vidéo HTML5 en plein écran.">
 <!ENTITY toolkit.classic.download.window.label "Utiliser la fenêtre de téléchargements classique">
diff --git a/chrome/locale/he/overlay.properties b/chrome/locale/he/overlay.properties
index 22632a0..01c007a 100644
--- a/chrome/locale/he/overlay.properties
+++ b/chrome/locale/he/overlay.properties
@@ -5,3 +5,4 @@ nv_done=הסתיים
 nv_stopped=נעצר
 nv_timeout=תם הזמן המוקצב
 statusText=טקסט מצב
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/he/prefs.dtd b/chrome/locale/he/prefs.dtd
index bc6f43f..5fdd744 100644
--- a/chrome/locale/he/prefs.dtd
+++ b/chrome/locale/he/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "מרווח">
 <!ENTITY status4evar.option.round "עגול">
 <!ENTITY status4evar.option.firefoxdefault "ברירת מחדל Firefox">
-<!ENTITY status4evar.option.download.panel "פנל">
 <!ENTITY status4evar.option.download.library "ספרייה">
-<!ENTITY status4evar.option.download.classic "קלאסי">
 <!ENTITY status4evar.unit.milliseconds "מילישניות">
 <!ENTITY status4evar.unit.seconds "שניות">
 <!ENTITY status4evar.unit.px "פיקסל">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "שימוש בגבולות סרגל כלים חלופיים">
 <!ENTITY status4evar.addonbar.windowGripper "הצגת תפסן שינוי גודל החלון">
 <!ENTITY status4evar.addonbar.closeButton "הצגת כפתור הסגירה">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "הגדרות מתקדמות אלו עלולות לגרום לבעיות עם Status-4-Evar או הרחבות אחרות. שינויים על אחריותכם בלבד.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "ניסיון לאלץ XBL binding על סרגל המיקום.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "בחרו בזה רק אם ישנן בעיות עם התקדמות סרגל המיקום או עם טקסט המצב שמוצג נכונה. ישנה אפשרות שזה יגרום לשבירת הרחבות אחרות אשר מנסות לקבוע XBL binding על סרגל המיקום.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "זיהוי מצב מסך מלא והצגת קישורים/מצב כראוי.">
+<!ENTITY status4evar.advanced.status.detectVideo "הסרת חלון קופץ המצב בווידאו HTML5 במסך מלא.">
 <!ENTITY toolkit.classic.download.window.label "שימוש בחלון ההורדות הקלאסי">
diff --git a/chrome/locale/hsb/overlay.properties b/chrome/locale/hsb/overlay.properties
index 33edc0a..55b136d 100644
--- a/chrome/locale/hsb/overlay.properties
+++ b/chrome/locale/hsb/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Začitane
 nv_stopped=Zastajene
 nv_timeout=Čas překročeny
 statusText=Statusowy tekst
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/hsb/prefs.dtd b/chrome/locale/hsb/prefs.dtd
index 72643c3..7fdddd1 100644
--- a/chrome/locale/hsb/prefs.dtd
+++ b/chrome/locale/hsb/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Rum">
 <!ENTITY status4evar.option.round "Skružić">
 <!ENTITY status4evar.option.firefoxdefault "Firefox standard">
-<!ENTITY status4evar.option.download.panel "Wobłuk">
 <!ENTITY status4evar.option.download.library "Biblioteka">
-<!ENTITY status4evar.option.download.classic "Klasiski">
 <!ENTITY status4evar.unit.milliseconds "milisekundach">
 <!ENTITY status4evar.unit.seconds "sekundach">
 <!ENTITY status4evar.unit.px "pikselow">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Alternatiwne ramiki za gratowe lajsty wužiwać">
 <!ENTITY status4evar.addonbar.windowGripper "Přimk za změnjenje wulkosće wokna pokazać">
 <!ENTITY status4evar.addonbar.closeButton "Tłóčatko 'Začinić' pokazać">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Tute rozšěrjene nastajenja móža problemy z Status-4-Evar abo druhimi rozšěrjenjemi zawinować. Změńće je na swoje riziko.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Pospyt XBL-zwjazanje adresoweho pola wunuzować.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Wubjerće to jenož, jeli maće problemy z postupom adresoweho pola abo jeli statusowy tekst so korektnje njezwobraznja. To móhło snano druhim rozšěrjenjam haćić, kotrež pospytuja XBL-zwjazanje na adresowym polu stajić.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Modus połneje wobrazowki namakać a wotkazy/status přihódnje pokazać.">
+<!ENTITY status4evar.advanced.status.detectVideo "Statusowe wuskakowace wokno we wideju HTML5 w modusu połneje wobrazowki schować.">
 <!ENTITY toolkit.classic.download.window.label "Klasiske sćehnjenske wokno wužiwać">
diff --git a/chrome/locale/hu/overlay.properties b/chrome/locale/hu/overlay.properties
index 3e9ad5f..cacd2a4 100644
--- a/chrome/locale/hu/overlay.properties
+++ b/chrome/locale/hu/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Kész
 nv_stopped=Megállítva
 nv_timeout=Időtúllépés
 statusText=Betöltési állapot
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/hu/prefs.dtd b/chrome/locale/hu/prefs.dtd
index 37d5a76..2c94ee3 100644
--- a/chrome/locale/hu/prefs.dtd
+++ b/chrome/locale/hu/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Hely">
 <!ENTITY status4evar.option.round "Kerekítés">
 <!ENTITY status4evar.option.firefoxdefault "Firefox default">
-<!ENTITY status4evar.option.download.panel "Panel">
 <!ENTITY status4evar.option.download.library "Library">
-<!ENTITY status4evar.option.download.classic "Classic">
 <!ENTITY status4evar.unit.milliseconds "milliseconds">
 <!ENTITY status4evar.unit.seconds "másodperc múlva">
 <!ENTITY status4evar.unit.px "px">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Alternatív eszköztár szegélyek használata">
 <!ENTITY status4evar.addonbar.windowGripper "Ablak átméretező mutatása">
 <!ENTITY status4evar.addonbar.closeButton "Bezárás gomb mutatása">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Ezek a haladók beállítások problémákat okozhatnak a Status-4-Evar-ben, vagy más kiegészítőkben. Csak saját felelősségre változtassa!">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Kísérlet a címsor XBL kötésének erőltetésére.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Csak akkor válassza ezt az opciót, ha problémái vannak a címsor betöltési csík vagy a státusz szöveg megjelenítésével. Ez potenciálisan elronthat más kiegészítőket, amelyek a címsor XBL kötését használják.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Detect full-screen mode and show links/status appropriately.">
+<!ENTITY status4evar.advanced.status.detectVideo "Hide status popup in full-screen HTML5 video.">
 <!ENTITY toolkit.classic.download.window.label "Use classic download window">
diff --git a/chrome/locale/it-IT/overlay.properties b/chrome/locale/it-IT/overlay.properties
index 598214a..71537a4 100644
--- a/chrome/locale/it-IT/overlay.properties
+++ b/chrome/locale/it-IT/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Completato
 nv_stopped=Interrotto
 nv_timeout=Tempo Scaduto
 statusText=Messaggio di stato
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/it-IT/prefs.dtd b/chrome/locale/it-IT/prefs.dtd
index 00a137d..f800b08 100644
--- a/chrome/locale/it-IT/prefs.dtd
+++ b/chrome/locale/it-IT/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Spazio">
 <!ENTITY status4evar.option.round "Arrotondato">
 <!ENTITY status4evar.option.firefoxdefault "Predefinita di Firefox">
-<!ENTITY status4evar.option.download.panel "Pannello">
 <!ENTITY status4evar.option.download.library "Libreria">
-<!ENTITY status4evar.option.download.classic "Classica">
 <!ENTITY status4evar.unit.milliseconds "millisecondi">
 <!ENTITY status4evar.unit.seconds "secondi">
 <!ENTITY status4evar.unit.px "px">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Usa bordo alternativo per le barre degli strumenti">
 <!ENTITY status4evar.addonbar.windowGripper "Mostra la maniglia di ridimensionamento della finestra">
 <!ENTITY status4evar.addonbar.closeButton "Mostra il pulsante di chiusura">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Queste impostazioni avanzate potrebbero causare problemi con Status-4-Evar o altre estensioni.  Modificatele a vostro rischio.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Tenta di forzare il binding XBL della barra degli indirizzi.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Selezionare questo solo se si verificano problemi nella visualizzazione della barra di avanzamento o dei messaggi di stato nella barra degli indirizzi.  Questo potrebbe causare il malfunzionamento di altre estensioni che tentano di effettuare un binding XBL con la barra degli indirizzi.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Rileva modalità a schermo intero e mostra indirizzi e informazioni di stato in modo appropriato.">
+<!ENTITY status4evar.advanced.status.detectVideo "Hide status popup in full-screen HTML5 video.">
 <!ENTITY toolkit.classic.download.window.label "Usa finestra di download classica">
diff --git a/chrome/locale/ja-JP/overlay.properties b/chrome/locale/ja-JP/overlay.properties
index 7cb8af7..2a1b3d9 100644
--- a/chrome/locale/ja-JP/overlay.properties
+++ b/chrome/locale/ja-JP/overlay.properties
@@ -5,3 +5,4 @@ nv_done=完了
 nv_stopped=停止
 nv_timeout=タイムアウト
 statusText=ステータスのテキスト表示
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/ja-JP/prefs.dtd b/chrome/locale/ja-JP/prefs.dtd
index 7ba9dd7..6057624 100644
--- a/chrome/locale/ja-JP/prefs.dtd
+++ b/chrome/locale/ja-JP/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "空白">
 <!ENTITY status4evar.option.round "丸">
 <!ENTITY status4evar.option.firefoxdefault "Firefox デフォルト">
-<!ENTITY status4evar.option.download.panel "パネル">
 <!ENTITY status4evar.option.download.library "ライブラリ">
-<!ENTITY status4evar.option.download.classic "クラシック">
 <!ENTITY status4evar.unit.milliseconds "ミリ秒">
 <!ENTITY status4evar.unit.seconds "秒">
 <!ENTITY status4evar.unit.px "ピクセル">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "別のボーダースタイルを使用">
 <!ENTITY status4evar.addonbar.windowGripper "ウインドウをリサイズするグリップを表示">
 <!ENTITY status4evar.addonbar.closeButton "閉じるボタンを表示">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "詳細設定を誤ると、Status-4-Evar はもとより他の拡張機能に対しても問題を発生させることがあります。設定は自己責任で行うこと">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "ロケーションバーで強制的に XBL binding を試みる">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "ロケーションバーでのプログレス表示やテキスト表示に異常がある場合にだけ選択すること(他の拡張機能がロケーションバーで XBL Binding するのを妨げる恐れがあるため)">
 <!ENTITY status4evar.advanced.status.detectFullScreen "全画面表示でリンク/ステータスを適切に表示">
+<!ENTITY status4evar.advanced.status.detectVideo "HTML5 ビデオをフルスクリーン表示中はステータスのポップアップを隠す">
 <!ENTITY toolkit.classic.download.window.label "旧来のダウンロードマネージャを使用">
diff --git a/chrome/locale/nb-NO/overlay.properties b/chrome/locale/nb-NO/overlay.properties
index ba0d748..bc87730 100644
--- a/chrome/locale/nb-NO/overlay.properties
+++ b/chrome/locale/nb-NO/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Fullført
 nv_stopped=Stoppet
 nv_timeout=Tidsavbrutt
 statusText=Statustekst
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/nb-NO/prefs.dtd b/chrome/locale/nb-NO/prefs.dtd
index 4e1c9fe..f839d74 100644
--- a/chrome/locale/nb-NO/prefs.dtd
+++ b/chrome/locale/nb-NO/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Mellomrom">
 <!ENTITY status4evar.option.round "Avrund">
 <!ENTITY status4evar.option.firefoxdefault "Firefox standard">
-<!ENTITY status4evar.option.download.panel "Panel">
 <!ENTITY status4evar.option.download.library "Bibliotek">
-<!ENTITY status4evar.option.download.classic "Klassisk">
 <!ENTITY status4evar.unit.milliseconds "millisekund">
 <!ENTITY status4evar.unit.seconds "sekunder">
 <!ENTITY status4evar.unit.px "px">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Bruk alternative kanter for verktøylinje">
 <!ENTITY status4evar.addonbar.windowGripper "Vis gripeområdet for endring av vindusstørrelse">
 <!ENTITY status4evar.addonbar.closeButton "Vis knappen lukk">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Disse avanserte innstillinger kan forårsake problemer med Status-4-Evar eller andre utvidelser. Endre på din egen risiko.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Forsøk å tvinge XBL-bindingen for adresselinjen.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Velg kun dette hvis du har problemer med at adresselinje-framdriftsviser eller statusteksten ikke blir vist riktig. Dette vil potensielt bryte andre utvidelser som forsøker å sette en XBL-binding på adresselinjen.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Oppdag fullskjermmodus og vis lenker/status riktig.">
+<!ENTITY status4evar.advanced.status.detectVideo "Skjul statussprettopp i fullskjerms-HTML5-video.">
 <!ENTITY toolkit.classic.download.window.label "Bruk klassisk nedlastingsvindu">
diff --git a/chrome/locale/nl/overlay.properties b/chrome/locale/nl/overlay.properties
index aacef8d..9e4ba4b 100644
--- a/chrome/locale/nl/overlay.properties
+++ b/chrome/locale/nl/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Gereed
 nv_stopped=Gestopt
 nv_timeout=Time-out opgetreden
 statusText=Tekst statusbalk
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/nl/prefs.dtd b/chrome/locale/nl/prefs.dtd
index 0ed6af2..eb445b4 100644
--- a/chrome/locale/nl/prefs.dtd
+++ b/chrome/locale/nl/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Ruimte">
 <!ENTITY status4evar.option.round "Rond">
 <!ENTITY status4evar.option.firefoxdefault "Standaard van Firefox">
-<!ENTITY status4evar.option.download.panel "Paneel">
 <!ENTITY status4evar.option.download.library "Bibliotheek">
-<!ENTITY status4evar.option.download.classic "Klassiek">
 <!ENTITY status4evar.unit.milliseconds "milliseconden">
 <!ENTITY status4evar.unit.seconds "seconden">
 <!ENTITY status4evar.unit.px "px">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Alternatieve werkbalkranden gebruiken">
 <!ENTITY status4evar.addonbar.windowGripper "Indicatie voor wijzigen venstergrootte tonen">
 <!ENTITY status4evar.addonbar.closeButton "Sluitknop tonen">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Deze geavanceerde instellingen kunnen problemen geven met Status-4-Evar of andere extensies. Wijzig ze op eigen risico.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Probeer de XBL-binding van de locatiebalk te forceren.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Selecteer dit alleen als u problemen heeft met de weergave van tekst in de voortgangs- of statusbalk. Dit kan problemen geven met andere extensies die een XBL-binding voor de locatiebalk proberen in te stellen.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Volledig scherm detecteren en bijbehorende verwijzingen/status tonen.">
+<!ENTITY status4evar.advanced.status.detectVideo "Statusvenster verbergen bij HTML5-video in volledig scherm.">
 <!ENTITY toolkit.classic.download.window.label "Gebruik het oude download-venster">
diff --git a/chrome/locale/pl/overlay.properties b/chrome/locale/pl/overlay.properties
index 616b565..8ef532f 100644
--- a/chrome/locale/pl/overlay.properties
+++ b/chrome/locale/pl/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Zakończono
 nv_stopped=Zatrzymano
 nv_timeout=Przekroczono limit czasu
 statusText=Opis statusu
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/pl/prefs.dtd b/chrome/locale/pl/prefs.dtd
index 3d46e8d..7659862 100644
--- a/chrome/locale/pl/prefs.dtd
+++ b/chrome/locale/pl/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Odstęp">
 <!ENTITY status4evar.option.round "Zaokrąglenie">
 <!ENTITY status4evar.option.firefoxdefault "domyślne Firefoksa">
-<!ENTITY status4evar.option.download.panel "panel">
 <!ENTITY status4evar.option.download.library "biblioteka">
-<!ENTITY status4evar.option.download.classic "klasyczne">
 <!ENTITY status4evar.unit.milliseconds "ms">
 <!ENTITY status4evar.unit.seconds "s">
 <!ENTITY status4evar.unit.px "px">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Wyświetlaj obramowanie paska">
 <!ENTITY status4evar.addonbar.windowGripper "Wyświetlaj uchwyt zmiany rozmiaru okna">
 <!ENTITY status4evar.addonbar.closeButton "Wyświetlaj przycisk zamykania">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Te ustawienia mogą powodować problemy z rozszerzeniem Status-4-Evar lub innymi rozszerzeniami. Zmieniasz je na własną odpowiedzialność.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Próbuj ustawić wiązania XBL w pasku adresu">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Włącz tę funkcję tylko, gdy masz problemy z paskiem postępu w pasku adresu lub z prawidłowym wyświetlaniem tekstu statusu. Funkcja ta może powodować konflikty z innymi rozszerzeniami, które próbują w pasku adresu ustawić wiązania XBL.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Wykryj tryb pełnoekranowy i wyświetl odpowiednio odnośniki/status/">
+<!ENTITY status4evar.advanced.status.detectVideo "Nie wyświetlaj okna statusu, gdy wideo HTML5 jest w trybie pełnoekranowym.">
 <!ENTITY toolkit.classic.download.window.label "Stosuj klasyczne okno pobierania">
diff --git a/chrome/locale/pt-BR/overlay.properties b/chrome/locale/pt-BR/overlay.properties
index 427c4df..c761738 100644
--- a/chrome/locale/pt-BR/overlay.properties
+++ b/chrome/locale/pt-BR/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Concluído
 nv_stopped=Interrompido
 nv_timeout=Tempo Esgotado
 statusText=Texto de Status
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/pt-BR/prefs.dtd b/chrome/locale/pt-BR/prefs.dtd
index fceb0e5..cbb1199 100644
--- a/chrome/locale/pt-BR/prefs.dtd
+++ b/chrome/locale/pt-BR/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Espaço">
 <!ENTITY status4evar.option.round "Redondo">
 <!ENTITY status4evar.option.firefoxdefault "Padrão do Firefox">
-<!ENTITY status4evar.option.download.panel "Painel">
 <!ENTITY status4evar.option.download.library "Biblioteca">
-<!ENTITY status4evar.option.download.classic "Clássico">
 <!ENTITY status4evar.unit.milliseconds "milisegundos">
 <!ENTITY status4evar.unit.seconds "segundos">
 <!ENTITY status4evar.unit.px "px">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Usar bordas alternadas na barra de ferramentas">
 <!ENTITY status4evar.addonbar.windowGripper "Mostrar o gripper de redimensionamento da janela">
 <!ENTITY status4evar.addonbar.closeButton "Mostrar o botão Fechar">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Essas configurações avançadas podem causar problemas com o Status-4-Evar ou outras extensões. Modifique por sua própria conta e risco.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Tentar forçar a integração da Barra de Endereços XBL.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Selecione isso somente se tiver problemas de exibição com o progresso da Barra de Endereços ou com o texto de status. Isso tem grande possibilidade de impedir outras extensões de configurar uma integração do XBL com a Barra de Endereços.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Detectar modo tela cheia e mostrar links/status corretamente.">
+<!ENTITY status4evar.advanced.status.detectVideo "Hide status popup in full-screen HTML5 video.">
 <!ENTITY toolkit.classic.download.window.label "Usar a janela de downloads clássica">
diff --git a/chrome/locale/ro/meta.properties b/chrome/locale/ro/meta.properties
index 7f8ef9d..5c3c3c2 100644
--- a/chrome/locale/ro/meta.properties
+++ b/chrome/locale/ro/meta.properties
@@ -1,3 +1,3 @@
 translator=Cătălin Zamfirescu (x10firefox)
 name=Status-4-Evar
-description=Instrumente de indicare a stări și bare de progres pentru Firefox 4+.
+description=Instrumente de indicare a stării navigatorului și indicatoare de progres pentru Firefox 4+.
diff --git a/chrome/locale/ro/overlay.properties b/chrome/locale/ro/overlay.properties
index 0774767..7aab7b3 100644
--- a/chrome/locale/ro/overlay.properties
+++ b/chrome/locale/ro/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Terminat
 nv_stopped=Oprit
 nv_timeout=Timp expirat
 statusText=Stare
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/ro/prefs.dtd b/chrome/locale/ro/prefs.dtd
index eb95842..1b7f037 100644
--- a/chrome/locale/ro/prefs.dtd
+++ b/chrome/locale/ro/prefs.dtd
@@ -1,7 +1,7 @@
 <!ENTITY status4evar.window.title "Opțiuni Status-4-Evar">
 <!ENTITY status4evar.pane.status "Stare">
 <!ENTITY status4evar.pane.progress "Progres">
-<!ENTITY status4evar.pane.download "Descărcare">
+<!ENTITY status4evar.pane.download "Descărcări">
 <!ENTITY status4evar.pane.addonbar "Bară de suplimente">
 <!ENTITY status4evar.pane.advanced "Complex">
 <!ENTITY status4evar.tab.general "General">
@@ -9,11 +9,11 @@
 <!ENTITY status4evar.tab.urlbar "Bară de adrese">
 <!ENTITY status4evar.tab.popup "Bară instantanee">
 <!ENTITY status4evar.tab.tabs "File">
-<!ENTITY status4evar.option.none "Nu afișa">
-<!ENTITY status4evar.option.nothing "Nothing">
-<!ENTITY status4evar.option.toolbar "Bara de suplimente">
-<!ENTITY status4evar.option.urlbar "Bara de adrese">
-<!ENTITY status4evar.option.popup "Bara instantanee">
+<!ENTITY status4evar.option.none "Nu se afișează">
+<!ENTITY status4evar.option.nothing "Nicio acțiune">
+<!ENTITY status4evar.option.toolbar "În bara de suplimente">
+<!ENTITY status4evar.option.urlbar "În bara de adrese">
+<!ENTITY status4evar.option.popup "În bara instantanee">
 <!ENTITY status4evar.option.tooltip "Balon informativ">
 <!ENTITY status4evar.option.bottom "În partea de jos a barei de adrese">
 <!ENTITY status4evar.option.top "În partea de sus a barei de adrese">
@@ -23,7 +23,7 @@
 <!ENTITY status4evar.option.both "Număr descărcări și timp rămas">
 <!ENTITY status4evar.option.right "La dreapta">
 <!ENTITY status4evar.option.left "La stânga">
-<!ENTITY status4evar.option.fixed "La o poziție fixă">
+<!ENTITY status4evar.option.fixed "La o poziție fixată">
 <!ENTITY status4evar.option.simple "Simplu">
 <!ENTITY status4evar.option.advanced "Complex">
 <!ENTITY status4evar.option.browse "Răsfoiește">
@@ -34,62 +34,62 @@
 <!ENTITY status4evar.option.no-repeat "Fără repetare">
 <!ENTITY status4evar.option.space "Spațiu">
 <!ENTITY status4evar.option.round "Rotund">
-<!ENTITY status4evar.option.firefoxdefault "Firefox default">
-<!ENTITY status4evar.option.download.panel "Panel">
-<!ENTITY status4evar.option.download.library "Library">
-<!ENTITY status4evar.option.download.classic "Classic">
-<!ENTITY status4evar.unit.milliseconds "milliseconds">
+<!ENTITY status4evar.option.firefoxdefault "Acțiune predefinită a Firefox">
+<!ENTITY status4evar.option.download.library "Se deschide fereastra colecțiilor">
+<!ENTITY status4evar.unit.milliseconds "milisecunde">
 <!ENTITY status4evar.unit.seconds "secunde">
 <!ENTITY status4evar.unit.px "pixeli">
 <!ENTITY status4evar.status.general.status.caption "Informații de stare">
-<!ENTITY status4evar.status.label "Informațiile de stare se afișează în:">
-<!ENTITY status4evar.status.timeout.label "Delay before clearing status messages:">
-<!ENTITY status4evar.status.default.label "Afișează informațiile de stare implicite">
-<!ENTITY status4evar.status.network.label "Afișează starea conexiunii">
-<!ENTITY status4evar.status.network.xhr.label "Afișează starea interogărilor directe din fundal">
-<!ENTITY toolkit.dom.status.change.label "Permite paginilor web să modifice informațiile de stare">
+<!ENTITY status4evar.status.label "Loc de afișare:">
+<!ENTITY status4evar.status.timeout.label "Se limitează timpul de afișare la:">
+<!ENTITY status4evar.status.default.label "Se afișează informațiile de stare implicite">
+<!ENTITY status4evar.status.network.label "Se afișează starea conexiunii">
+<!ENTITY status4evar.status.network.xhr.label "Se afișează starea interogărilor directe din fundal">
+<!ENTITY toolkit.dom.status.change.label "Se permite paginilor web să modifice informațiile de stare">
 <!ENTITY status4evar.status.general.linkOver.caption "Legături">
-<!ENTITY status4evar.status.linkOver.label "Legăturile se afișează în:">
+<!ENTITY status4evar.status.linkOver.label "Loc de afișare:">
 <!ENTITY status4evar.status.linkOver.delay.show.label "Întârziere înaintea afișării legăturilor:">
 <!ENTITY status4evar.status.linkOver.delay.hide.label "Întârziere înaintea ascunderii legăturilor:">
-<!ENTITY status4evar.status.toolbar.maxLength.label "Limitează lungimea textului afișat la:">
-<!ENTITY status4evar.status.urlbar.align.label "Informația de stare se aliniază:">
+<!ENTITY status4evar.status.toolbar.maxLength.label "Se limitează lungimea textului afișat la:">
+<!ENTITY status4evar.status.urlbar.align.label "Mod de aliniere:">
 <!ENTITY status4evar.status.urlbar.color.label "Culoare text:">
 <!ENTITY status4evar.status.currentUrl "Adresă curentă">
 <!ENTITY status4evar.status.statusText "Stare">
 <!ENTITY status4evar.status.urlbar.firefox.builtin.caption "Caracteristici Firefox">
-<!ENTITY browser.urlbar.formatting.enabled.label "Activează evidențierea domeniului">
-<!ENTITY browser.urlbar.trimming.enabled.label "Activează mascarea protocolului (http:// și ftp://)">
-<!ENTITY status4evar.status.popup.invertMirror.label "Afișează implicit în partea dreaptă">
-<!ENTITY status4evar.status.popup.mouseMirror.label "Afișează în partea opusă la survolarea cu mausul">
-<!ENTITY status4evar.progress.style.label "Utilizează un stil particularizat pentru bara de progres">
-<!ENTITY status4evar.progress.urlbar.enable.label "Afișează bara de progres în bara de adrese">
+<!ENTITY browser.urlbar.formatting.enabled.label "Se evidențiază domeniul">
+<!ENTITY browser.urlbar.trimming.enabled.label "Se maschează protocolul (http:// și ftp://)">
+<!ENTITY status4evar.status.popup.invertMirror.label "Se afișează implicit în partea dreaptă">
+<!ENTITY status4evar.status.popup.mouseMirror.label "Se afișează în partea opusă la survolarea cu mausul">
+<!ENTITY status4evar.progress.style.label "Se utilizează un stil particularizat pentru bara de progres">
+<!ENTITY status4evar.progress.urlbar.enable.label "Se afișează bara de progres în bara de adrese">
 <!ENTITY status4evar.progress.urlbar.line.label "Mod de afișare:">
-<!ENTITY status4evar.progress.toolbar.force.label "Afișează întotdeauna bara de progres în bara de suplimente">
+<!ENTITY status4evar.progress.toolbar.force.label "Se afișează întotdeauna bara de progres în bara de suplimente">
 <!ENTITY status4evar.editor.label "Editor:">
 <!ENTITY status4evar.editor.css.color.label "Culoare:">
 <!ENTITY status4evar.editor.css.image.label "Imagine:">
 <!ENTITY status4evar.editor.css.image.repeat "Repetare">
 <!ENTITY status4evar.editor.css.image.position "Poziție">
 <!ENTITY status4evar.editor.css.image.offset "Decalare">
-<!ENTITY status4evar.download.button.action.label "Download status button action:">
-<!ENTITY status4evar.download.force.label "Afișează întotdeauna butonul de stare a descărcării">
-<!ENTITY status4evar.download.label.force.label "Show button text in icons-only mode">
-<!ENTITY status4evar.download.label.label "Text pe butonul de stare a descărcării:">
-<!ENTITY status4evar.download.tooltip.label "Text în balonul informativ al butonului de stare a descărcării:">
-<!ENTITY status4evar.download.progress.label "Afișează progresul descărcării pe butonul de stare a descărcării">
-<!ENTITY status4evar.download.progress.average.label "Afișează progresul mediu al descărcărilor">
-<!ENTITY status4evar.download.progress.max.label "Afișează descărcarea cea mai avansata">
-<!ENTITY status4evar.download.progress.min.label "Afișează descărcarea cea mai puțin avansată">
+<!ENTITY status4evar.download.button.action.label "Acțiune implicită a butonului de stare a descărcărilor:">
+<!ENTITY status4evar.download.force.label "Se afișează întotdeauna butonul de stare a descărcărilor">
+<!ENTITY status4evar.download.label.force.label "Se afișează text pe butonul de stare a descărcărilor și în modul „Pictograme”">
+<!ENTITY status4evar.download.label.label "Text pe butonul de stare a descărcărilor:">
+<!ENTITY status4evar.download.tooltip.label "Text în balonul informativ al butonului de stare a descărcărilor:">
+<!ENTITY status4evar.download.progress.label "Se afișează progresul descărcărilor pe butonul de stare a acestora">
+<!ENTITY status4evar.download.progress.average.label "Se afișează progresul mediu al descărcărilor">
+<!ENTITY status4evar.download.progress.max.label "Se afișează descărcarea cea mai avansată">
+<!ENTITY status4evar.download.progress.min.label "Se afișează descărcarea cea mai puțin avansată">
 <!ENTITY status4evar.download.color.active.label "Culoare a barei de progres pentru descărcările în curs:">
 <!ENTITY status4evar.download.color.paused.label "Culoare a barei de progres pentru descărcările în pauză:">
-<!ENTITY status4evar.download.notify.animate.label "Animate button when download completes">
-<!ENTITY status4evar.download.notify.timeout.label "Highlight button when download completes:">
-<!ENTITY status4evar.addonbar.borderStyle "Utilizează chenarul alternativ al barei de suplimente">
-<!ENTITY status4evar.addonbar.windowGripper "Afișează glisorul de redimensionare a ferestrei navigatorului">
-<!ENTITY status4evar.addonbar.closeButton "Afișează butonul de ascundere al barei de suplimente">
+<!ENTITY status4evar.download.notify.animate.label "Se animează butonul de stare a descărcărilor după terminarea acestora">
+<!ENTITY status4evar.download.notify.timeout.label "Timp de evidențiere a butonului de stare a descărcărilor după terminarea acestora:">
+<!ENTITY status4evar.addonbar.borderStyle "Se utilizează chenarul alternativ al barei de suplimente">
+<!ENTITY status4evar.addonbar.windowGripper "Se afișează glisorul de redimensionare a ferestrei navigatorului">
+<!ENTITY status4evar.addonbar.closeButton "Se afișează butonul de ascundere a barei de suplimente">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Aceste opțiuni complexe pot provoca unele probleme cu Status-4-Evar sau alte suplimentele. Modificați-le pe propriul risc.">
-<!ENTITY status4evar.advanced.urlbar.forceBinding "Încearcă forțarea legăturii XBL cu bara de adrese">
-<!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Selectați această opțiune doar dacă aveţi probleme de afișare a progresului sau textului pe bara de adrese. Acest lucru poate bloca alte suplimente care încearcă să stabilească legături XBL cu bara de adrese.">
-<!ENTITY status4evar.advanced.status.detectFullScreen "Detectează modul ecran-complet și afișează legăturile/starea corespunzătoare">
-<!ENTITY toolkit.classic.download.window.label "Folosește fereastra clasică de descărcare">
+<!ENTITY status4evar.advanced.urlbar.forceBinding "Se încearcă forțarea conexiunii XBL cu bara de adrese">
+<!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Selectați această opțiune doar dacă aveţi probleme de afișare a progresului sau textului pe bara de adrese. Acest lucru poate bloca alte suplimente care încearcă să stabilească o conexiune XBL cu bara de adrese.">
+<!ENTITY status4evar.advanced.status.detectFullScreen "Se detectează modul ecran-complet și se afișează legăturile/starea corespunzătoare">
+<!ENTITY status4evar.advanced.status.detectVideo "Se ascunde mesajul instantaneu de stare la redarea videoclipurilor HTML5 în modul ecran-complet">
+<!ENTITY toolkit.classic.download.window.label "Se folosește fereastra clasică de descărcare">
diff --git a/chrome/locale/ru/overlay.properties b/chrome/locale/ru/overlay.properties
index 27aa3f0..c382d0c 100644
--- a/chrome/locale/ru/overlay.properties
+++ b/chrome/locale/ru/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Готово
 nv_stopped=Остановлено
 nv_timeout=Истекло
 statusText=Текст сообщения
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/ru/prefs.dtd b/chrome/locale/ru/prefs.dtd
index 82dd9a5..7695240 100644
--- a/chrome/locale/ru/prefs.dtd
+++ b/chrome/locale/ru/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "с интервалами">
 <!ENTITY status4evar.option.round "с масштабированием">
 <!ENTITY status4evar.option.firefoxdefault "Firefox default">
-<!ENTITY status4evar.option.download.panel "Panel">
 <!ENTITY status4evar.option.download.library "Library">
-<!ENTITY status4evar.option.download.classic "Classic">
 <!ENTITY status4evar.unit.milliseconds "milliseconds">
 <!ENTITY status4evar.unit.seconds "сек.">
 <!ENTITY status4evar.unit.px "пикс.">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Использовать чередующиеся границы панелей инструментов">
 <!ENTITY status4evar.addonbar.windowGripper "Показать захват изменения размера окна">
 <!ENTITY status4evar.addonbar.closeButton "Показать кнопку «Закрыть»">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "These advanced settings may cause issues with Status-4-Evar or other extensions. Modify at your own risk.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Attempt to force the the Location Bar XBL binding.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Only select this if you have problems with the Location Bar progress or status text being displaying correctly. This will potentially break other extensions that try to set an XBL binding on the Location Bar.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Detect full-screen mode and show links/status appropriately.">
+<!ENTITY status4evar.advanced.status.detectVideo "Hide status popup in full-screen HTML5 video.">
 <!ENTITY toolkit.classic.download.window.label "Use classic download window">
diff --git a/chrome/locale/sr/overlay.properties b/chrome/locale/sr/overlay.properties
index b0dbd61..ed53f33 100644
--- a/chrome/locale/sr/overlay.properties
+++ b/chrome/locale/sr/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Завршено
 nv_stopped=Заустављено
 nv_timeout=Истекло
 statusText=Текст стања
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/sr/prefs.dtd b/chrome/locale/sr/prefs.dtd
index 6e65635..d9895ac 100644
--- a/chrome/locale/sr/prefs.dtd
+++ b/chrome/locale/sr/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Простор">
 <!ENTITY status4evar.option.round "Заобљеност">
 <!ENTITY status4evar.option.firefoxdefault "Подразумевано у Фајерфоксу">
-<!ENTITY status4evar.option.download.panel "Табла">
 <!ENTITY status4evar.option.download.library "Библиотека">
-<!ENTITY status4evar.option.download.classic "класично">
 <!ENTITY status4evar.unit.milliseconds "милисекунди">
 <!ENTITY status4evar.unit.seconds "секунди">
 <!ENTITY status4evar.unit.px "тачака">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Користи алтернативне ивице трака с алаткама">
 <!ENTITY status4evar.addonbar.windowGripper "Прикажи простор за измену величине прозора">
 <!ENTITY status4evar.addonbar.closeButton "Дугме за затварање">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Ове напредне поставке могу да стварају проблеме с овим или другим додацима. Користите их на сопствени ризик.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Приморај XBL повезивање траке за путању.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Изаберите ово само ако имате проблема с напретком траке за путању или се текст стања не приказује исправно. Ово може да онеспособи друге додатке који покушају да користе XBL повезивање на траку за путању.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Препознај када је прозор развучен преко целог екрана и прикажи одговарајуће везе/стања.">
-<!ENTITY toolkit.classic.download.window.label "Користи  класични прозор са преузимањима">
+<!ENTITY status4evar.advanced.status.detectVideo "Сакриј искачући прозор стања приликом гледања HTML5 видео снимка преко целог екрана.">
+<!ENTITY toolkit.classic.download.window.label "Користи класични прозор са преузимањима">
diff --git a/chrome/locale/sv-SE/overlay.properties b/chrome/locale/sv-SE/overlay.properties
index ca64352..9d324a2 100644
--- a/chrome/locale/sv-SE/overlay.properties
+++ b/chrome/locale/sv-SE/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Klar
 nv_stopped=Stoppad
 nv_timeout=Åtgärden tog för lång tid
 statusText=Statustext
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/sv-SE/prefs.dtd b/chrome/locale/sv-SE/prefs.dtd
index b9ee2d0..011c884 100644
--- a/chrome/locale/sv-SE/prefs.dtd
+++ b/chrome/locale/sv-SE/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Fyll ut">
 <!ENTITY status4evar.option.round "Sida vid sida">
 <!ENTITY status4evar.option.firefoxdefault "Firefox standardval">
-<!ENTITY status4evar.option.download.panel "Panel">
 <!ENTITY status4evar.option.download.library "Bibliotek">
-<!ENTITY status4evar.option.download.classic "Klassisk">
 <!ENTITY status4evar.unit.milliseconds "ms">
 <!ENTITY status4evar.unit.seconds "sekunder">
 <!ENTITY status4evar.unit.px "px">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Använd alternativa verktygsfältskantlinjer">
 <!ENTITY status4evar.addonbar.windowGripper "Visa handtaget för fönsterstorleksändring">
 <!ENTITY status4evar.addonbar.closeButton "Visa stängknappen">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Dessa avancerade inställningar kan skapa problem med Status-4-Evar eller andra tillägg. Används på egen risk.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Försök att tvinga XBL-bindningen för adressfältet.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Aktivera detta endast om du har problem med adressfältet eller statustextvisningen. Funktionen kan skapa konflikter med andra tillägg som försöker att ange en XBL-bindning i adressfältet.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Upptäck helskärmsläge och visa länkar/status i enlighet med det.">
+<!ENTITY status4evar.advanced.status.detectVideo "Dölj statuspopuprutan vid visning av HTML5-video i helskärmsläge.">
 <!ENTITY toolkit.classic.download.window.label "Använd klassiskt filhämtningsfönster">
diff --git a/chrome/locale/tr/overlay.properties b/chrome/locale/tr/overlay.properties
index 45db083..0ef4178 100644
--- a/chrome/locale/tr/overlay.properties
+++ b/chrome/locale/tr/overlay.properties
@@ -5,3 +5,4 @@ nv_done=Tamam
 nv_stopped=Durduruldu
 nv_timeout=Zaman Aşımına Uğradı
 statusText=Durum Metni
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/tr/prefs.dtd b/chrome/locale/tr/prefs.dtd
index 9983570..a5e5476 100644
--- a/chrome/locale/tr/prefs.dtd
+++ b/chrome/locale/tr/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "Boşluk">
 <!ENTITY status4evar.option.round "Daire">
 <!ENTITY status4evar.option.firefoxdefault "Firefox varsayılan">
-<!ENTITY status4evar.option.download.panel "Panel">
 <!ENTITY status4evar.option.download.library "Kütüphane">
-<!ENTITY status4evar.option.download.classic "Klasik">
 <!ENTITY status4evar.unit.milliseconds "milisaniye">
 <!ENTITY status4evar.unit.seconds "saniyeler">
 <!ENTITY status4evar.unit.px "px">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "Alternatif araç çubuğu çerçevesi kullan">
 <!ENTITY status4evar.addonbar.windowGripper "Pencere yeniden boyutlandırıcıyı göster">
 <!ENTITY status4evar.addonbar.closeButton "Kapatma düğmesini göster">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "Bu gelişmiş ayarlar Status-4-Evar veya diğer eklentilerle ilgili sorunlara neden olabilir. Değiştirmek kendi sorumluluğunuzdadır.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "Durum Çuğuğu XBL bağlamayı zorla.">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "Eğer konum çubuğunun ilerlemesinde veya durum metninin doğru gösterilmesinde bir sorun varsa bunu seçin. Durum çubuğundaki XBL bağlayıcı ayarlanırken diğer eklentiler duraklatılacaktır.">
 <!ENTITY status4evar.advanced.status.detectFullScreen "Tam ekran modunu algıla ve bağlantıları/durumu uygun şekilde göster.">
+<!ENTITY status4evar.advanced.status.detectVideo "Tam ekranlı HTML5 videoda açılır pencereyi gizle.">
 <!ENTITY toolkit.classic.download.window.label "Klasik indirme pencersini kullan">
diff --git a/chrome/locale/zh-CN/overlay.properties b/chrome/locale/zh-CN/overlay.properties
index 83aad8b..c4c8dde 100644
--- a/chrome/locale/zh-CN/overlay.properties
+++ b/chrome/locale/zh-CN/overlay.properties
@@ -5,3 +5,4 @@ nv_done=完成
 nv_stopped=已停止
 nv_timeout=已超时
 statusText=状态栏
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/zh-CN/prefs.dtd b/chrome/locale/zh-CN/prefs.dtd
index aadb10b..c24cf07 100644
--- a/chrome/locale/zh-CN/prefs.dtd
+++ b/chrome/locale/zh-CN/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "空白">
 <!ENTITY status4evar.option.round "圆角">
 <!ENTITY status4evar.option.firefoxdefault "Firefox默认">
-<!ENTITY status4evar.option.download.panel "面板">
 <!ENTITY status4evar.option.download.library "我的足迹">
-<!ENTITY status4evar.option.download.classic "经典">
 <!ENTITY status4evar.unit.milliseconds "毫秒">
 <!ENTITY status4evar.unit.seconds "秒后">
 <!ENTITY status4evar.unit.px "像素">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "使用备用的工具栏边框">
 <!ENTITY status4evar.addonbar.windowGripper "显示窗口大小调整控件">
 <!ENTITY status4evar.addonbar.closeButton "显示关闭按钮">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "高级设置可能导致Status-4-Evar或者其它扩展出现问题。修改后出现问题后果自负。">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "尝试强制为地址栏绑定XBL">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "请仅在地址栏进度条或者状态文字显示有误的时候选中此项。这样做可能会导致其它扩展为地址栏绑定的XBL失效。">
 <!ENTITY status4evar.advanced.status.detectFullScreen "检测全屏模式并正确显示链接/状态.">
+<!ENTITY status4evar.advanced.status.detectVideo "全屏观看HTML5视频时隐藏状态栏弹出消息。">
 <!ENTITY toolkit.classic.download.window.label "使用经典下载窗口">
diff --git a/chrome/locale/zh-TW/overlay.properties b/chrome/locale/zh-TW/overlay.properties
index ccade24..0c0d36e 100644
--- a/chrome/locale/zh-TW/overlay.properties
+++ b/chrome/locale/zh-TW/overlay.properties
@@ -5,3 +5,4 @@ nv_done=完成
 nv_stopped=已停止
 nv_timeout=已逾時
 statusText=狀態文字
+legacyWidgetTitle=Legacy Status Bar
diff --git a/chrome/locale/zh-TW/prefs.dtd b/chrome/locale/zh-TW/prefs.dtd
index b82e047..cd2cfea 100644
--- a/chrome/locale/zh-TW/prefs.dtd
+++ b/chrome/locale/zh-TW/prefs.dtd
@@ -35,9 +35,7 @@
 <!ENTITY status4evar.option.space "空白">
 <!ENTITY status4evar.option.round "圓角">
 <!ENTITY status4evar.option.firefoxdefault "Firefox 預設動作">
-<!ENTITY status4evar.option.download.panel "彈出下載面板">
 <!ENTITY status4evar.option.download.library "打開收藏庫">
-<!ENTITY status4evar.option.download.classic "打開傳統下載視窗">
 <!ENTITY status4evar.unit.milliseconds "毫秒">
 <!ENTITY status4evar.unit.seconds "秒後">
 <!ENTITY status4evar.unit.px "px">
@@ -88,8 +86,10 @@
 <!ENTITY status4evar.addonbar.borderStyle "使用替代的工具列邊框">
 <!ENTITY status4evar.addonbar.windowGripper "顯示視窗大小調整器">
 <!ENTITY status4evar.addonbar.closeButton "顯示關閉按鈕">
+<!ENTITY status4evar.addonbar.legacyShim "Enable legacy status bar panel support">
 <!ENTITY status4evar.advanced.warning "進階設定可能會使 Status-4-Evar 或其他套件出問題。修改時請自負風險。">
 <!ENTITY status4evar.advanced.urlbar.forceBinding "嘗試強制位址列 XBL binding。">
 <!ENTITY status4evar.advanced.urlbar.forceBinding.desc "只有在位址列進度條或狀態文字顯示有誤時才勾選此設定。另外這也有可能與其他試圖對位址列設定 XBL binding 的套件產生衝突。">
 <!ENTITY status4evar.advanced.status.detectFullScreen "偵測全螢幕模式並調整連結/狀態的顯示。">
+<!ENTITY status4evar.advanced.status.detectVideo "全螢幕播放 HTML5 影片時隱藏彈出的狀態通知。">
 <!ENTITY toolkit.classic.download.window.label "使用傳統的下載視窗">
diff --git a/chrome/skin/all/australis.css b/chrome/skin/all/australis.css
new file mode 100644
index 0000000..02a5eaf
--- /dev/null
+++ b/chrome/skin/all/australis.css
@@ -0,0 +1,50 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
+ * 
+ * Copyright (C) 2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+ * 
+ * Original Add-on bar styling by Mozilla Foundation.
+ * Adapted from the back-out patch:
+ * https://hg.mozilla.org/mozilla-central/rev/dd59f8effb73
+*/
+
+ at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#status-bar
+{
+	display: -moz-box;
+	min-width: 0;
+	min-height: 0;
+	-moz-appearance: none;
+	background-color: transparent;
+	border: none;
+}
+
+#status-bar > statusbarpanel
+{
+	border-width: 0;
+	-moz-appearance: none;
+}
+
+#status4evar-legacy-widget[cui-areatype="menu-panel"] #status-bar,
+toolbarpaletteitem[place="palette"] > #status4evar-legacy-widget #status-bar
+{
+	min-height: 32px;
+}
+
+toolbarpaletteitem #status-bar
+{
+	min-width: 32px;
+	background-image: repeating-linear-gradient(135deg,
+	                  rgba(255,255,255,0.1),
+	                  rgba(255,255,255,0.1) 5px,
+	                  rgba(0,0,0,0.1) 5px,
+	                  rgba(0,0,0,0.1) 10px);
+}
+
diff --git a/chrome/skin/all/dynamic.css b/chrome/skin/all/dynamic.css
index f2196a5..8867f49 100644
--- a/chrome/skin/all/dynamic.css
+++ b/chrome/skin/all/dynamic.css
@@ -1,39 +1,14 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * 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/.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * Copyright (C) 2010-2011, 2013 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
diff --git a/chrome/skin/all/legacy.css b/chrome/skin/all/legacy.css
new file mode 100644
index 0000000..5f9be6f
--- /dev/null
+++ b/chrome/skin/all/legacy.css
@@ -0,0 +1,19 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
+ * 
+ * Copyright (C) 2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
+
+ at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#urlbar .urlbar-origin-label
+{
+	-moz-padding-start: 1px;
+}
+
diff --git a/chrome/skin/all/overlay.css b/chrome/skin/all/overlay.css
index 66b3371..6003480 100644
--- a/chrome/skin/all/overlay.css
+++ b/chrome/skin/all/overlay.css
@@ -1,39 +1,34 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
+ * 
+ * Original code copyright (C) 2010 Margaret Leibovic <margaret.leibovic at gmail.com>. All Rights Reserved.
+ * Original code copyright (C) 2010 Drew Willcoxon <adw at mozilla.com>. All Rights Reserved.
+ * Original code copyright (C) 2013 Paolo Amadini <paolo.mozmail at amadzone.org>. All Rights Reserved.
+ * Original code copyright (C) 2013 Gijs Kruitbosch <gijskruitbosch at gmail.com>. All Rights Reserved.
+ * Copyright (C) 2010-2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+ * 
+ * Original status overlay implementation by Drew Willcoxon.
+ * Adapted from the back-out patch:
+ * https://hg.mozilla.org/mozilla-central/rev/d384e2adf22e
+ * 
+ * Original progress line code by Margaret Leibovic.
+ * Adapted from the back-out patch:
+ * https://hg.mozilla.org/mozilla-central/rev/42270894db65
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * Original download notification code by Paolo Amadini.
+ * Adapted from the check-in patch:
+ * https://hg.mozilla.org/mozilla-central/rev/9cb6dcfb0b85
  * 
- * ***** END LICENSE BLOCK ***** */
+ * Original download notification code by Gijs Kruitbosch.
+ * Adapted from the check-in patch:
+ * https://hg.mozilla.org/mozilla-central/rev/8a1d8044a4c8
+*/
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
@@ -114,25 +109,37 @@ toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label
 	background-image: url("chrome://status4evar/skin/pulse.png");
 }
 
+#status4evar-download-notification-container
+{
+	min-height: 1px;
+	min-width: 1px;
+	height: 1px;
+	margin-bottom: -1px;
+	position: relative;
+	z-index: 5;
+}
+
 #status4evar-download-notification-icon
 {
 	opacity: 0;
 	background-size: 16px;
 	background-position: center;
 	background-repeat: no-repeat;
+	width: 16px;
+	height: 16px;
 }
 
- at keyframes status4evar-download-button-finish
+ at keyframes status4evar-download-notification-finish
 {
 	from { opacity: 0; transform: scale(1); }
 	20%  { opacity: .65; animation-timing-function: ease-in; }
 	to   { opacity: 0; transform: scale(8); }
 }
 
-#status4evar-download-button[notification="finish"][forcevisible="true"] #status4evar-download-notification-icon
+#status4evar-download-notification-anchor[notification="finish"][forcevisible="true"] #status4evar-download-notification-icon
 {
 	background-image: url("chrome://browser/skin/downloads/download-notification-finish.png");
-	animation-name: status4evar-download-button-finish;
+	animation-name: status4evar-download-notification-finish;
 	animation-duration: 1s;
 }
 
@@ -232,22 +239,7 @@ splitter.status4evar-status-splitter:not(:hover)
 	opacity: 0;
 }
 
-#urlbar .urlbar-input-layer[overlinkstate="fade-in"]
-{
-	-moz-transition-property: color;
-	-moz-transition-duration: 150ms;
-	color: transparent;
-}
-
-/* < Firefox 19 */
-#urlbar .urlbar-input-layer[overlinkstate="fade-in"] html|input.urlbar-input:-moz-placeholder
-{
-	-moz-transition-property: color;
-	-moz-transition-duration: 150ms;
-	color: transparent;
-}
-
-/* >= Firefox 19 */
+#urlbar .urlbar-input-layer[overlinkstate="fade-in"],
 #urlbar .urlbar-input-layer[overlinkstate="fade-in"] html|input.urlbar-input::-moz-placeholder
 {
 	-moz-transition-property: color;
@@ -255,22 +247,7 @@ splitter.status4evar-status-splitter:not(:hover)
 	color: transparent;
 }
 
-#urlbar .urlbar-input-layer[overlinkstate="fade-out"]
-{
-	-moz-transition-property: color;
-	-moz-transition-duration: 150ms;
-	-moz-transition-timing-function: cubic-bezier(0.0, 1.0, 1.0, 1.0);
-}
-
-/* < Firefox 19 */
-#urlbar .urlbar-input-layer[overlinkstate="fade-out"] html|input.urlbar-input:-moz-placeholder
-{
-	-moz-transition-property: color;
-	-moz-transition-duration: 150ms;
-	-moz-transition-timing-function: cubic-bezier(0.0, 1.0, 1.0, 1.0);
-}
-
-/* >= Firefox 19 */
+#urlbar .urlbar-input-layer[overlinkstate="fade-out"],
 #urlbar .urlbar-input-layer[overlinkstate="fade-out"] html|input.urlbar-input::-moz-placeholder
 {
 	-moz-transition-property: color;
@@ -278,18 +255,7 @@ splitter.status4evar-status-splitter:not(:hover)
 	-moz-transition-timing-function: cubic-bezier(0.0, 1.0, 1.0, 1.0);
 }
 
-#urlbar .urlbar-input-layer[overlinkstate="showing"]
-{
-	color: transparent;
-}
-
-/* < Firefox 19 */
-#urlbar .urlbar-input-layer[overlinkstate="showing"] html|input.urlbar-input:-moz-placeholder
-{
-	color: transparent;
-}
-
-/* >= Firefox 19 */
+#urlbar .urlbar-input-layer[overlinkstate="showing"],
 #urlbar .urlbar-input-layer[overlinkstate="showing"] html|input.urlbar-input::-moz-placeholder
 {
 	color: transparent;
@@ -351,11 +317,6 @@ splitter.status4evar-status-splitter:not(:hover)
 	border: none;
 }
 
-#urlbar .urlbar-origin-label
-{
-	-moz-padding-start: 1px;
-}
-
 #urlbar .urlbar-over-link-box:-moz-locale-dir(ltr)
 {
 	-moz-padding-start: 18px;
diff --git a/chrome/skin/all/prefs.css b/chrome/skin/all/prefs.css
index 95e1fc0..91b8eb1 100644
--- a/chrome/skin/all/prefs.css
+++ b/chrome/skin/all/prefs.css
@@ -1,39 +1,14 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * 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/.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * Copyright (C) 2010-2011 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
diff --git a/chrome/skin/all/version/prefs19.css b/chrome/skin/all/version/prefs19.css
deleted file mode 100644
index b1158e4..0000000
--- a/chrome/skin/all/version/prefs19.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- * 
- * ***** END LICENSE BLOCK ***** */
-
- at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#status4evar-download-builtin
-{
-	display: none;
-}
-
diff --git a/chrome/skin/all/version/prefs26.css b/chrome/skin/all/version/prefs26.css
new file mode 100644
index 0000000..5539da9
--- /dev/null
+++ b/chrome/skin/all/version/prefs26.css
@@ -0,0 +1,19 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
+ * 
+ * Copyright (C) 2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
+
+ at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#status4evar-advanced-download
+{
+	display: none;
+}
+
diff --git a/chrome/skin/all/version/prefs28.css b/chrome/skin/all/version/prefs28.css
new file mode 100644
index 0000000..3c12b4d
--- /dev/null
+++ b/chrome/skin/all/version/prefs28.css
@@ -0,0 +1,19 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
+ * 
+ * Copyright (C) 2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
+
+ at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#status4evar-addonbar-legacyShim-check
+{
+	display: none;
+}
+
diff --git a/chrome/skin/all/version/prefs29.css b/chrome/skin/all/version/prefs29.css
new file mode 100644
index 0000000..8a452d1
--- /dev/null
+++ b/chrome/skin/all/version/prefs29.css
@@ -0,0 +1,19 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
+ * 
+ * Copyright (C) 2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
+
+ at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#status4evar-addonbar-closeButton-check
+{
+	display: none;
+}
+
diff --git a/chrome/skin/gnomestripe/australis.css b/chrome/skin/gnomestripe/australis.css
new file mode 100644
index 0000000..8bf3e5f
--- /dev/null
+++ b/chrome/skin/gnomestripe/australis.css
@@ -0,0 +1,52 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
+ * 
+ * Original code copyright (C) Mozilla Foundation. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+ * 
+ * Original Add-on bar styling by Mozilla Foundation.
+ * Adapted from the back-out patch:
+ * https://hg.mozilla.org/mozilla-central/rev/dd59f8effb73
+*/
+
+ at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#status4evar-status-bar
+{
+	box-shadow: 0 1px 0 rgba(0,0,0,.15) inset;
+	padding: 0;
+	min-height: 20px;
+}
+
+#status4evar-status-bar .toolbarbutton-1,
+#status4evar-status-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button
+{
+	-moz-appearance: none;
+	border-style: none;
+	padding: 0 3px;
+}
+
+#status4evar-status-bar .toolbarbutton-1:not([disabled]):hover,
+#status4evar-status-bar .toolbarbutton-1[open],
+#status4evar-status-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover
+{
+	background-image: linear-gradient(to top, transparent, rgba(0,0,0,.15)),
+	                  linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%),
+	                  linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%);
+	background-position: left, left, right;
+	background-size: auto, 1px 100%, 1px 100%;
+	background-repeat: no-repeat;
+}
+
+#status4evar-download-button #status4evar-download-icon
+{
+	background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 0, 198, 18, 180) center no-repeat;
+	min-width: 18px;
+	min-height: 18px;
+}
+
diff --git a/chrome/skin/gnomestripe/legacy.css b/chrome/skin/gnomestripe/legacy.css
new file mode 100644
index 0000000..bca240c
--- /dev/null
+++ b/chrome/skin/gnomestripe/legacy.css
@@ -0,0 +1,32 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
+ * 
+ * Copyright (C) 2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
+
+ at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#status4evar-download-button #status4evar-download-icon
+{
+	background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 0, 24, 24, 0) center no-repeat;
+	min-width: 24px;
+	min-height: 24px;
+}
+
+toolbar[iconsize="small"] #status4evar-download-button #status4evar-download-icon
+{
+	background: -moz-image-rect(url("chrome://browser/skin/Toolbar-small.png"), 0, 16, 16, 0) center no-repeat;
+	min-width: 16px;
+	min-height: 16px;
+}
+
+toolbar[iconsize="small"] > #status4evar-download-button[attention] #status4evar-download-icon {
+	background-image: url("chrome://browser/skin/downloads/download-glow-small.png");
+}
+
diff --git a/chrome/skin/gnomestripe/overlay.css b/chrome/skin/gnomestripe/overlay.css
index 5465c3b..1979e92 100644
--- a/chrome/skin/gnomestripe/overlay.css
+++ b/chrome/skin/gnomestripe/overlay.css
@@ -1,39 +1,14 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * Copyright (C) 2010-2013 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * ***** END LICENSE BLOCK *****
+*/
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -51,11 +26,6 @@
  * Download status
  */
 
-#status4evar-download-anchor
-{
-	position: relative;
-}
-
 #status4evar-download-progress-bar
 {
 	height: 6px;
@@ -66,29 +36,11 @@ toolbar[iconsize="small"] #status4evar-download-progress-bar
 	height: 4px;
 }
 
-#status4evar-download-button #status4evar-download-icon
-{
-	background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 0, 24, 24, 0) center no-repeat;
-	min-width: 24px;
-	min-height: 24px;
-}
-
 #status4evar-download-button[attention] #status4evar-download-icon
 {
 	background-image: url("chrome://browser/skin/downloads/download-glow.png");
 }
 
-toolbar[iconsize="small"] #status4evar-download-button #status4evar-download-icon
-{
-	background: -moz-image-rect(url("chrome://browser/skin/Toolbar-small.png"), 0, 16, 16, 0) center no-repeat;
-	min-width: 16px;
-	min-height: 16px;
-}
-
-toolbar[iconsize="small"] > #status4evar-download-button[attention] #status4evar-download-icon {
-	background-image: url("chrome://browser/skin/downloads/download-glow-small.png");
-}
-
 toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label
 {
 	margin: 0px 2px !important;
@@ -130,7 +82,7 @@ splitter.status4evar-status-splitter
  * Add-on bar
  */
 
-#browser-bottombox[s4eboarder="true"] #addon-bar
+#browser-bottombox[s4eboarder="true"] :-moz-any(#status4evar-status-bar, #addon-bar)
 {
 	-moz-appearance: none;
 }
diff --git a/chrome/skin/gnomestripe/prefs.css b/chrome/skin/gnomestripe/prefs.css
index a7c3827..a5d4869 100644
--- a/chrome/skin/gnomestripe/prefs.css
+++ b/chrome/skin/gnomestripe/prefs.css
@@ -1,39 +1,14 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * 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/.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * Copyright (C) 2010 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
diff --git a/chrome/skin/pinstripe/australis.css b/chrome/skin/pinstripe/australis.css
new file mode 100644
index 0000000..19179c8
--- /dev/null
+++ b/chrome/skin/pinstripe/australis.css
@@ -0,0 +1,58 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
+ * 
+ * Original code copyright (C) Mozilla Foundation. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+ * 
+ * Original Add-on bar styling by Mozilla Foundation.
+ * Adapted from the back-out patch:
+ * https://hg.mozilla.org/mozilla-central/rev/dd59f8effb73
+*/
+
+ at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#status4evar-status-bar
+{
+	min-height: 18px;
+}
+
+#status4evar-status-bar:not(:-moz-lwtheme)
+{
+	-moz-appearance: statusbar;
+}
+
+#status4evar-download-button #status4evar-download-icon
+{
+	background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 0, 198, 18, 180) center no-repeat;
+	min-width: 18px;
+	min-height: 18px;
+}
+
+#status4evar-download-button:-moz-lwtheme-brighttext #status4evar-download-icon
+{
+	background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), 0, 198, 18, 180) center no-repeat;
+}
+
+ at media (min-resolution: 2dppx)
+{
+	#status4evar-download-button #status4evar-download-icon
+	{
+		background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar@2x.png"), 0, 396, 36, 360);
+	}
+
+	#status4evar-download-button:-moz-lwtheme-brighttext #status4evar-download-icon
+	{
+		background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted@2x.png"), 0, 396, 36, 360);
+	}
+
+	#status4evar-download-button[attention] #status4evar-download-icon
+	{
+		background-image: url("chrome://browser/skin/downloads/download-glow@2x.png");
+	}
+}
+
diff --git a/chrome/skin/pinstripe/legacy.css b/chrome/skin/pinstripe/legacy.css
new file mode 100644
index 0000000..0ed159b
--- /dev/null
+++ b/chrome/skin/pinstripe/legacy.css
@@ -0,0 +1,50 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
+ * 
+ * Copyright (C) 2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
+
+ at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#status4evar-window-gripper
+{
+	display: none;
+}
+
+#status-bar
+{
+	padding-right: 0px;
+}
+
+#addon-bar
+{
+	padding-right: 16px;
+}
+
+#status4evar-download-button #status4evar-download-icon
+{
+	background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 0, 140, 20, 120) center no-repeat;
+	min-width: 20px;
+	min-height: 20px;
+}
+
+ at media (min-resolution: 2dppx)
+{
+	#status4evar-download-button #status4evar-download-icon
+	{
+		background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar@2x.png"), 0, 280, 40, 240);
+		background-size: 20px;
+	}
+
+	#status4evar-download-button[attention] #status4evar-download-icon
+	{
+		background-image: url("chrome://browser/skin/downloads/download-glow@2x.png");
+	}
+}
+
diff --git a/chrome/skin/pinstripe/overlay.css b/chrome/skin/pinstripe/overlay.css
index daf38f2..84a88fd 100644
--- a/chrome/skin/pinstripe/overlay.css
+++ b/chrome/skin/pinstripe/overlay.css
@@ -1,39 +1,14 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * Copyright (C) 2010-2013 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * ***** END LICENSE BLOCK *****
+*/
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -51,43 +26,16 @@
  * Download status
  */
 
-#status4evar-download-anchor
-{
-	position: relative;
-	z-index: 1;
-}
-
 #status4evar-download-progress-bar
 {
 	height: 5px;
 }
 
-#status4evar-download-button #status4evar-download-icon
-{
-	background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 0, 140, 20, 120) center no-repeat;
-	min-width: 20px;
-	min-height: 20px;
-}
-
 #status4evar-download-button[attention] #status4evar-download-icon
 {
 	background-image: url("chrome://browser/skin/downloads/download-glow.png");
 }
 
- at media (min-resolution: 2dppx)
-{
-	#status4evar-download-button #status4evar-download-icon
-	{
-		background-image: -moz-image-rect(url("chrome://browser/skin/Toolbar@2x.png"), 0, 280, 40, 240);
-		background-size: 20px;
-	}
-
-	#status4evar-download-button[attention] #status4evar-download-icon
-	{
-		background-image: url("chrome://browser/skin/downloads/download-glow@2x.png");
-	}
-}
-
 toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label
 {
 	margin: 0px 2px !important;
@@ -128,26 +76,3 @@ splitter.status4evar-status-splitter
 	background-color: white;
 }
 
-/*
- * Gripper
- */
-
-#status4evar-window-gripper
-{
-	display: none;
-}
-
-/*
- * Status bar
- */
-
-#status-bar
-{
-	padding-right: 0px;
-}
-
-#addon-bar
-{
-	padding-right: 16px;
-}
-
diff --git a/chrome/skin/pinstripe/prefs.css b/chrome/skin/pinstripe/prefs.css
index 5d94cfb..f619bb0 100644
--- a/chrome/skin/pinstripe/prefs.css
+++ b/chrome/skin/pinstripe/prefs.css
@@ -1,39 +1,14 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * 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/.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * Copyright (C) 2010-2011 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
diff --git a/chrome/skin/winstripe/australis.css b/chrome/skin/winstripe/australis.css
new file mode 100644
index 0000000..032ad24
--- /dev/null
+++ b/chrome/skin/winstripe/australis.css
@@ -0,0 +1,60 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
+ * 
+ * Original code copyright (C) Mozilla Foundation. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+ * 
+ * Original Add-on bar styling by Mozilla Foundation.
+ * Adapted from the back-out patch:
+ * https://hg.mozilla.org/mozilla-central/rev/dd59f8effb73
+*/
+
+ at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#status4evar-status-bar
+{
+	-moz-appearance: none;
+	min-height: 20px;
+	border-top-style: none;
+	border-bottom-style: none;
+	padding-top: 1px;
+	background-image: linear-gradient(rgba(0,0,0,.15) 1px, rgba(255,255,255,.15) 1px);
+	background-size: 100% 2px;
+	background-repeat: no-repeat;
+}
+
+#status4evar-status-bar .toolbarbutton-1,
+#status4evar-status-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button
+{
+	-moz-appearance: none;
+	border-style: none;
+	padding: 0 3px;
+}
+
+#status4evar-status-bar .toolbarbutton-1:not([disabled]):hover,
+#status4evar-status-bar .toolbarbutton-1[open],
+#status4evar-status-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover
+{
+	background-image: linear-gradient(to top, transparent, rgba(0,0,0,.15)),
+	                  linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%),
+	                  linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%);
+	background-position: left, left, right;
+	background-size: auto, 1px 100%, 1px 100%;
+	background-repeat: no-repeat;
+}
+
+#status4evar-download-button #status4evar-download-icon
+{
+	background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 0, 198, 18, 180) center no-repeat;
+}
+
+#status4evar-download-button:-moz-lwtheme-brighttext #status4evar-download-icon
+{
+	background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), 0, 198, 18, 180) center no-repeat;
+}
+
diff --git a/chrome/skin/winstripe/legacy.css b/chrome/skin/winstripe/legacy.css
new file mode 100644
index 0000000..f62dd7e
--- /dev/null
+++ b/chrome/skin/winstripe/legacy.css
@@ -0,0 +1,24 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
+ * 
+ * Copyright (C) 2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
+
+ at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#status4evar-download-button #status4evar-download-icon
+{
+	background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 0, 108, 18, 90) center no-repeat;
+}
+
+#status4evar-download-button:-moz-lwtheme-brighttext #status4evar-download-icon
+{
+	background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), 0, 108, 18, 90) center no-repeat;
+}
+
diff --git a/chrome/skin/winstripe/overlay.css b/chrome/skin/winstripe/overlay.css
index d554ce7..421589a 100644
--- a/chrome/skin/winstripe/overlay.css
+++ b/chrome/skin/winstripe/overlay.css
@@ -1,39 +1,14 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * Copyright (C) 2010-2013 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * ***** END LICENSE BLOCK *****
+*/
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -51,11 +26,6 @@
  * Download status
  */
 
-#status4evar-download-anchor
-{
-	position: relative;
-}
-
 #status4evar-download-progress-bar
 {
 	height: 4px;
@@ -63,16 +33,10 @@
 
 #status4evar-download-button #status4evar-download-icon
 {
-	background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 0, 108, 18, 90) center no-repeat;
 	min-width: 18px;
 	min-height: 18px;
 }
 
-#status4evar-download-button:-moz-lwtheme-brighttext #status4evar-download-icon
-{
-	background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), 0, 108, 18, 90) center no-repeat;
-}
-
 #status4evar-download-button[attention] #status4evar-download-icon
 {
 	background-image: url("chrome://browser/skin/downloads/download-glow.png");
@@ -106,7 +70,7 @@ splitter.status4evar-status-splitter
  * Status bar
  */
 
-#browser-bottombox[s4eboarder="true"] #addon-bar
+#browser-bottombox[s4eboarder="true"] :-moz-any(#status4evar-status-bar, #addon-bar)
 {
 	-moz-appearance: none;
 }
diff --git a/chrome/skin/winstripe/prefs.css b/chrome/skin/winstripe/prefs.css
index a7c3827..a5d4869 100644
--- a/chrome/skin/winstripe/prefs.css
+++ b/chrome/skin/winstripe/prefs.css
@@ -1,39 +1,14 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * 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/.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * Copyright (C) 2010 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
diff --git a/components/status4evar.js b/components/status4evar.js
index a692d57..e240c9e 100644
--- a/components/status4evar.js
+++ b/components/status4evar.js
@@ -1,39 +1,14 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * 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/.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * Copyright (C) 2010-2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
 
 "use strict";
 
@@ -45,65 +20,74 @@ const CU = Components.utils;
 CU.import("resource://gre/modules/XPCOMUtils.jsm");
 CU.import("resource://gre/modules/Services.jsm");
 
-const CURRENT_MIGRATION = 6;
+let AustralisTools = null;
+if(Services.vc.compare("28.*", Services.appinfo.version) < 0)
+{
+	AustralisTools = CU.import("resource://status4evar/Australis.jsm", {}).AustralisTools;
+}
+
+const CURRENT_MIGRATION = 7;
 
 function Status_4_Evar(){}
 
 Status_4_Evar.prototype =
 {
-	classID:		Components.ID("{13b3595e-7bb5-4cfe-bbfa-82c900a4d7bf}"),
-	QueryInterface:		XPCOMUtils.generateQI([
-					CI.nsISupportsWeakReference,
-					CI.nsIObserver,
-					CI.nsIStatus4Evar
-				]),
+	classID:        Components.ID("{13b3595e-7bb5-4cfe-bbfa-82c900a4d7bf}"),
+	QueryInterface: XPCOMUtils.generateQI([
+	                     CI.nsISupportsWeakReference,
+	                     CI.nsIObserver,
+	                     CI.nsIStatus4Evar
+	                ]),
 
-	prefs:				null,
+	prefs:          null,
 
-	addonbarBorderStyle:		false,
-	addonbarCloseButton:		false,
-	addonbarWindowGripper:		true,
+	addonbarBorderStyle:            false,
+	addonbarCloseButton:            false,
+	addonbarLegacyShim:             true,
+	addonbarWindowGripper:          true,
 
 	advancedStatusDetectFullScreen: true,
-	advancedUrlbarForceBinding:	false,
-
-	downloadButtonAction:		1,
-	downloadColorActive:		null,
-	downloadColorPaused:		null,
-	downloadForce:			false,
-	downloadLabel:			0,
-	downloadLabelForce:		true,
-	downloadNotifyAnimate:		true,
-	downloadNotifyTimeout:		60000,
-	downloadProgress:		1,
-	downloadTooltip:		1,
-
-	firstRun:			true,
-
-	progressToolbarCSS:		null,
-	progressToolbarForce:		false,
-	progressToolbarStyle:		false,
-
-	progressUrlbar:			1,
-	progressUrlbarCSS:		null,
-	progressUrlbarStyle:		true,
-
-	status:				1,
-	statusDefault:			true,
-	statusNetwork:			true,
-	statusTimeout:			10000,
-	statusLinkOver:			1,
-	statusLinkOverDelayShow:	70,
-	statusLinkOverDelayHide:	150,
-
-	statusToolbarMaxLength:		0,
-
-	statusUrlbarAlign:		null,
-	statusUrlbarColor:		null,
-	statusUrlbarPosition:		33,
-
-	statusUrlbarInvertMirror:	false,
-	statusUrlbarMouseMirror:	true,
+	advancedStatusDetectVideo:      true,
+	advancedUrlbarForceBinding:     false,
+
+	downloadButtonAction:           1,
+	downloadColorActive:            null,
+	downloadColorPaused:            null,
+	downloadForce:                  false,
+	downloadLabel:                  0,
+	downloadLabelForce:             true,
+	downloadNotifyAnimate:          true,
+	downloadNotifyTimeout:          60000,
+	downloadProgress:               1,
+	downloadTooltip:                1,
+
+	firstRun:                       true,
+	firstRunAustralis:              true,
+
+	progressToolbarCSS:             null,
+	progressToolbarForce:           false,
+	progressToolbarStyle:           false,
+
+	progressUrlbar:                 1,
+	progressUrlbarCSS:              null,
+	progressUrlbarStyle:            true,
+
+	status:                         1,
+	statusDefault:                  true,
+	statusNetwork:                  true,
+	statusTimeout:                  10000,
+	statusLinkOver:                 1,
+	statusLinkOverDelayShow:        70,
+	statusLinkOverDelayHide:        150,
+
+	statusToolbarMaxLength:         0,
+
+	statusUrlbarAlign:              null,
+	statusUrlbarColor:              null,
+	statusUrlbarPosition:           33,
+
+	statusUrlbarInvertMirror:       false,
+	statusUrlbarMouseMirror:        true,
 
 	pref_registry:
 	{
@@ -139,6 +123,18 @@ Status_4_Evar.prototype =
 			}
 		},
 
+		"addonbar.legacyShim":
+		{
+			update: function()
+			{
+				this.addonbarLegacyShim = this.prefs.getBoolPref("addonbar.legacyShim");
+				if(AustralisTools)
+				{
+					AustralisTools.updateLegacyShim(this.addonbarLegacyShim);
+				}
+			}
+		},
+
 		"addonbar.windowGripper":
 		{
 			update: function()
@@ -147,7 +143,7 @@ Status_4_Evar.prototype =
 			},
 			updateWindow: function(win)
 			{
-				win.caligon.status4evar.updateWindowGripper(true);
+				win.caligon.status4evar.toolbars.updateWindowGripper(true);
 			}
 		},
 
@@ -159,6 +155,14 @@ Status_4_Evar.prototype =
 			}
 		},
 
+		"advanced.status.detectVideo":
+		{
+			update: function()
+			{
+				this.advancedStatusDetectVideo = this.prefs.getBoolPref("advanced.status.detectVideo");
+			}
+		},
+
 		"advanced.urlbar.forceBinding":
 		{
 			update: function()
@@ -224,6 +228,9 @@ Status_4_Evar.prototype =
 				{
 					this.setBoolElementAttribute(download_button, "forcevisible", this.downloadForce);
 				}
+
+				let download_notify_anchor = win.caligon.status4evar.getters.downloadNotifyAnchor;
+				this.setBoolElementAttribute(download_notify_anchor, "forcevisible", this.downloadForce);
 			}
 		},
 
@@ -637,6 +644,12 @@ Status_4_Evar.prototype =
 			this.prefs.setBoolPref("firstRun", false);
 		}
 
+		this.firstRunAustralis = this.prefs.getBoolPref("firstRun.australis");
+		if(this.firstRunAustralis && Services.vc.compare("28.*", Services.appinfo.version) < 0)
+		{
+			this.prefs.setBoolPref("firstRun.australis", false);
+		}
+
 		this.migrate();
 
 		for(let pref in this.pref_registry)
@@ -689,6 +702,28 @@ Status_4_Evar.prototype =
 				case 5:
 					this.migrateBoolPref("status.detectFullScreen", "advanced.status.detectFullScreen");
 					break;
+				case 6:
+					let oldDownloadAction = this.prefs.getIntPref("download.button.action");
+					let newDownloadAction = 1;
+					switch(oldDownloadAction)
+					{
+						case 2:
+							newDownloadAction = 1;
+							break;
+						case 3:
+							newDownloadAction = 2;
+							break;
+						case 4:
+							newDownloadAction = 1;
+							break;
+					}
+					this.prefs.setIntPref("download.button.action", newDownloadAction);
+
+					if(oldDownloadAction == 4 && Services.vc.compare("26.0", Services.appinfo.version) > 0)
+					{
+						this.prefs.setBoolPref("browser.download.useToolkitUI", true);
+					}
+					break;
 				case CURRENT_MIGRATION:
 					break;
 			}
diff --git a/components/status4evar.xpt b/components/status4evar.xpt
index c8c99b8..6e29ac7 100644
Binary files a/components/status4evar.xpt and b/components/status4evar.xpt differ
diff --git a/defaults/preferences/defaults.js b/defaults/preferences/defaults.js
index 3a36daa..72597e0 100644
--- a/defaults/preferences/defaults.js
+++ b/defaults/preferences/defaults.js
@@ -1,46 +1,23 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * 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/.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * Copyright (C) 2010-2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
 
 pref("status4evar.addonbar.borderStyle", false);
 pref("status4evar.addonbar.closeButton", false);
+pref("status4evar.addonbar.legacyShim", true);
 pref("status4evar.addonbar.windowGripper", true);
 
 pref("status4evar.advanced.showWarning", true);
 pref("status4evar.advanced.status.detectFullScreen", true);
+pref("status4evar.advanced.status.detectVideo", true);
 pref("status4evar.advanced.urlbar.forceBinding", false);
 
 pref("status4evar.download.button.action", 1);
@@ -55,6 +32,7 @@ pref("status4evar.download.progress", 1);
 pref("status4evar.download.tooltip", 1);
 
 pref("status4evar.firstRun", true);
+pref("status4evar.firstRun.australis", true);
 
 //pref("status4evar.progress.tab", 1);
 //pref("status4evar.progress.tab.css", "#33FF33");
diff --git a/install.rdf b/install.rdf
index ceafdc9..0d0dffe 100644
--- a/install.rdf
+++ b/install.rdf
@@ -1,39 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
    - 
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Status-4-Evar.
-   -
-   - The Initial Developer of the Original Code is 
-   - Matthew Turnbull <sparky at bluefang-logic.com>.
-   -
-   - Portions created by the Initial Developer are Copyright (C) 2013
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
+   - 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/.
+   - 
+   - Copyright (C) 2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
    - 
    - ***** END LICENSE BLOCK ***** -->
 
@@ -45,7 +18,7 @@
 		<em:name>Status-4-Evar</em:name>
 		<em:description>Status widgets and progress indicators for Firefox 4+</em:description>
 		<em:id>status4evar at caligonstudios.com</em:id>
-		<em:version>2013.10.31.22</em:version>
+		<em:version>2014.05.03.06</em:version>
 		<em:creator>Sparky Bluefang</em:creator>
 		<em:type>2</em:type>
 		<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
@@ -256,7 +229,7 @@
 			<Description>
 				<em:locale>ro</em:locale>
 				<em:name>Status-4-Evar</em:name>
-				<em:description>Instrumente de indicare a stări și bare de progres pentru Firefox 4+.</em:description>
+				<em:description>Instrumente de indicare a stării navigatorului și indicatoare de progres pentru Firefox 4+.</em:description>
 				<em:creator>Sparky Bluefang</em:creator>
 				<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
 				<em:translator>Cătălin Zamfirescu (x10firefox) [ro]</em:translator>
@@ -334,8 +307,8 @@
 		<em:targetApplication><!-- Firefox -->
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-				<em:minVersion>17.0</em:minVersion>
-				<em:maxVersion>28.0a1</em:maxVersion>
+				<em:minVersion>24.0</em:minVersion>
+				<em:maxVersion>32.0a1</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 
diff --git a/modules/Australis.jsm b/modules/Australis.jsm
new file mode 100644
index 0000000..5d455cb
--- /dev/null
+++ b/modules/Australis.jsm
@@ -0,0 +1,181 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * 
+ * 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/.
+ * 
+ * Copyright (C) 2013-2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
+
+"use strict";
+
+const EXPORTED_SYMBOLS = ["AustralisTools"];
+
+const CU = Components.utils;
+
+const STATUS_BAR_ID = "status4evar-status-bar";
+const LEGACY_SHIM_ID = "status4evar-legacy-widget";
+const DEFAULT_WIDGETS = ["status4evar-status-widget", "status4evar-download-button", "status4evar-progress-widget"];
+const DEFAULT_POSITIONS = [0, 1, 2];
+
+CU.import("resource:///modules/CustomizableUI.jsm");
+CU.import("resource://gre/modules/Services.jsm");
+CU.import("resource://services-common/stringbundle.js");
+
+const strings = new StringBundle("chrome://status4evar/locale/overlay.properties");
+
+CustomizableUI.registerArea(STATUS_BAR_ID, {
+	type: CustomizableUI.TYPE_TOOLBAR,
+	defaultPlacements: DEFAULT_WIDGETS
+});
+
+let AustralisTools = {
+	migrateOnce: false,
+
+	migrate: function()
+	{
+		if(this.migrateOnce)
+		{
+			return;
+		}
+		this.migrateOnce = true;
+
+		DEFAULT_WIDGETS.forEach(function(id, index) {
+			let placement = CustomizableUI.getPlacementOfWidget(id);
+			if(!placement || placement.area === CustomizableUI.AREA_NAVBAR || placement.area === STATUS_BAR_ID)
+			{
+				Services.console.logStringMessage("S4E Australis migration - moving widget: " + id + " [" + CustomizableUI.isWidgetRemovable(id) + "]");
+				CustomizableUI.addWidgetToArea(id, STATUS_BAR_ID, DEFAULT_POSITIONS[index]);
+			}
+			else if(id === DEFAULT_WIDGETS[0])
+			{
+				Services.console.logStringMessage("S4E Australis migration - adding spring");
+				CustomizableUI.addWidgetToArea("spring", STATUS_BAR_ID, DEFAULT_POSITIONS[index]);
+			}
+		});
+
+		CustomizableUI.setToolbarVisibility(STATUS_BAR_ID, true);
+	},
+
+	updateLegacyShim: function(action)
+	{
+		if(action)
+		{
+			this.initLegacyShim();
+
+			let placement = CustomizableUI.getPlacementOfWidget(LEGACY_SHIM_ID);
+			if(!placement) {
+				CustomizableUI.addWidgetToArea(LEGACY_SHIM_ID, STATUS_BAR_ID);
+				CustomizableUI.setToolbarVisibility(STATUS_BAR_ID, true);
+			}
+		}
+		else
+		{
+			this.destroyLegacyShim();
+		}
+	},
+
+	initLegacyShim: function()
+	{
+		CustomizableUI.createWidget({
+			id: LEGACY_SHIM_ID,
+			type: "custom",
+			defaultArea: STATUS_BAR_ID,
+			onBuild: function(doc)
+			{
+				let item = doc.createElement("toolbaritem");
+				item.id = LEGACY_SHIM_ID;
+				item.setAttribute("removable", true);
+				item.setAttribute("label", strings.get("legacyWidgetTitle"));
+				item.setAttribute("class", "panel-wide-item");
+				item.setAttribute("closemenu", "none");
+				item.appendChild(doc.getElementById("status-bar") || palette.querySelector("status-bar"));
+
+				item.watcher = new doc.defaultView.MutationObserver(function(mutations)
+				{
+					if(!item.hasChildNodes())
+					{
+						Services.console.logStringMessage("S4E Repairing widget: " + LEGACY_SHIM_ID);
+						item.appendChild(doc.getElementById("status-bar"));
+					}
+				});
+				item.watcher.observe(item, { childList: true });
+
+				return item;
+			}
+		});
+	},
+
+	destroyLegacyShim: function()
+	{
+		let widgetInfo = CustomizableUI.getWidget(LEGACY_SHIM_ID);
+		if(widgetInfo)
+		{
+			widgetInfo.disabled = true;
+
+			widgetInfo.instances.forEach(function(instance)
+			{
+				let item = instance.node;
+
+				item.watcher.disconnect();
+
+				if(item.firstChild && item.firstChild.id === "status-bar")
+				{
+					item.ownerDocument.getElementById("addon-bar").appendChild(item.firstChild);
+				}
+			});
+		}
+
+		CustomizableUI.destroyWidget(LEGACY_SHIM_ID);
+	}
+}
+
+let statusBarHandler = {
+	getSpringId: function(aArea)
+	{
+		let springId = null;
+
+		let widgetIds = CustomizableUI.getWidgetIdsInArea(aArea);
+		if(widgetIds)
+		{
+			let widgetId = null;
+			for(let i = 0; i < widgetIds.length; i++)
+			{
+				widgetId = widgetIds[i];
+				if(CustomizableUI.isSpecialWidget(widgetId) && widgetId.indexOf('spring') > 0)
+				{
+					springId = widgetId;
+					break;
+				}
+			}
+		}
+
+		return springId;
+	},
+
+	onWidgetAdded: function(aWidgetId, aArea, aPosition)
+	{
+		if(aArea === STATUS_BAR_ID && aWidgetId === DEFAULT_WIDGETS[0])
+		{
+			let springId = this.getSpringId(aArea);
+			if(springId)
+			{
+				CustomizableUI.removeWidgetFromArea(springId, STATUS_BAR_ID, DEFAULT_POSITIONS[0]);
+			}
+		}
+	},
+
+	onWidgetRemoved: function(aWidgetId, aArea)
+	{
+		if(aArea === STATUS_BAR_ID && aWidgetId === DEFAULT_WIDGETS[0])
+		{
+			CustomizableUI.addWidgetToArea("spring", STATUS_BAR_ID, DEFAULT_POSITIONS[0]);
+		}
+	}
+}
+
+CustomizableUI.addListener(statusBarHandler);
+
diff --git a/modules/Downloads.jsm b/modules/Downloads.jsm
index 55b81a8..3b421b0 100644
--- a/modules/Downloads.jsm
+++ b/modules/Downloads.jsm
@@ -1,39 +1,23 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * 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/.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * Original code copyright (C) Mozilla Foundation. All Rights Reserved.
+ * Original code copyright (C) 2013 Gijs Kruitbosch <gijskruitbosch at gmail.com>. All Rights Reserved.
+ * Copyright (C) 2010-2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+ * 
+ * Download listener code based on Mozilla Foundation code:
+ * https://hg.mozilla.org/mozilla-central/file/eec9a82ad740/browser/base/content/browser.js#l7297
+ * 
+ * Original download notification code by Gijs Kruitbosch.
+ * Adapted from the check-in patch:
+ * https://hg.mozilla.org/mozilla-central/rev/8a1d8044a4c8
+*/
 
 "use strict";
 
@@ -57,32 +41,12 @@ function S4EDownloadService(window, service, getters)
 	this._service = service;
 	this._getters = getters;
 
-	let supportsJSTransfer = false;
-	try
-	{
-		supportsJSTransfer = (Services.vc.compare("25.*", Services.appinfo.version) < 0);
-	} catch(e) {}
-
-	let tryJSTransfer = true;
-	try
-	{
-		tryJSTransfer = Services.prefs.getBoolPref("browser.download.useJSTransfer");
-	} catch(e) {}
-
-	if(supportsJSTransfer && tryJSTransfer)
+	if(Services.vc.compare("26.0", Services.appinfo.version) <= 0)
 	{
-		try
-		{
-			this._handler = new JSTransferHandler(this);
-			Services.console.logStringMessage("S4EDownloadService using JSTransferHandler backend");
-		}
-		catch(e)
-		{
-			CU.reportError(e);
-		}
+		this._handler = new JSTransferHandler(this);
+		Services.console.logStringMessage("S4EDownloadService using JSTransferHandler backend");
 	}
-
-	if(this._handler == null)
+	else
 	{
 		this._handler = new DownloadManagerHandler(this);
 		Services.console.logStringMessage("S4EDownloadService using DownloadManagerHandler backend");
@@ -175,7 +139,6 @@ S4EDownloadService.prototype =
 		switch(this._service.downloadButtonAction)
 		{
 			case 1: // Default
-			case 2: // Show Panel
 				this.attachBinding();
 				break;
 			default:
@@ -243,7 +206,7 @@ S4EDownloadService.prototype =
 		let maxTime = -Infinity;
 
 		let dls = ((this.isPrivateWindow) ? this._handler.activePrivateEntries() : this._handler.activeEntries());
-		for(let dl in dls)
+		for(let dl of dls)
 		{
 			if(dl.state == CI.nsIDownloadManager.DOWNLOAD_DOWNLOADING)
 			{
@@ -393,15 +356,31 @@ S4EDownloadService.prototype =
 	{
 		if(this._dlNotifyTimer == 0 && this._service.downloadNotifyAnimate)
 		{
-			let download_button = this._getters.downloadButton;
-			if(download_button)
+			let download_button_anchor = this._getters.downloadButtonAnchor;
+			let download_notify_anchor = this._getters.downloadNotifyAnchor;
+			if(download_button_anchor)
 			{
-				download_button.setAttribute("notification", "finish");
-				this._dlNotifyTimer = this._window.setTimeout(function(self, button)
+				if(!download_notify_anchor.style.transform)
+				{
+					let bAnchorRect = download_button_anchor.getBoundingClientRect();
+					let nAnchorRect = download_notify_anchor.getBoundingClientRect();
+
+					let translateX = bAnchorRect.left - nAnchorRect.left;
+					translateX += .5 * (bAnchorRect.width  - nAnchorRect.width);
+
+					let translateY = bAnchorRect.top  - nAnchorRect.top;
+					translateY += .5 * (bAnchorRect.height - nAnchorRect.height);
+
+					download_notify_anchor.style.transform = "translate(" +  translateX + "px, " + translateY + "px)";
+				}
+
+				download_notify_anchor.setAttribute("notification", "finish");
+				this._dlNotifyTimer = this._window.setTimeout(function(self, anchor)
 				{
 					self._dlNotifyTimer = 0;
-					button.removeAttribute("notification");
-				}, 1000, this, download_button);
+					anchor.removeAttribute("notification");
+					anchor.style.transform = "";
+				}, 1000, this, download_notify_anchor);
 			}
 		}
 	},
@@ -433,7 +412,7 @@ S4EDownloadService.prototype =
 
 		switch(this._service.downloadButtonAction)
 		{
-			case 1: // Default
+			case 1: // Firefox Default
 				if(this._window.DownloadsCommon.useToolkitUI)
 				{
 					DownloadManagerUIClassic.show(this._window);
@@ -443,15 +422,9 @@ S4EDownloadService.prototype =
 					this._window.DownloadsPanel.showPanel();
 				}
 				break;
-			case 2: // Show Panel
-				this._window.DownloadsPanel.showPanel();
-				break;
-			case 3: // Show Library
+			case 2: // Show Library
 				this._window.PlacesCommandHook.showPlacesOrganizer("Downloads");
 				break;
-			case 4: // Show Classic
-				DownloadManagerUIClassic.show(this._window);
-				break;
 			default: // Nothing
 				break;
 		}
@@ -468,7 +441,7 @@ S4EDownloadService.prototype =
 	{
 		switch(this._service.downloadButtonAction)
 		{
-			case 1: // Default
+			case 1: // Firefox Default
 				if(this._window.DownloadsCommon.useToolkitUI)
 				{
 					return DownloadManagerUIClassic.visible;
@@ -477,9 +450,7 @@ S4EDownloadService.prototype =
 				{
 					return this._window.DownloadsPanel.isPanelShowing;
 				}
-			case 2: // Show Panel
-				return this._window.DownloadsPanel.isPanelShowing;
-			case 3: // Show Library
+			case 2: // Show Library
 				var organizer = Services.wm.getMostRecentWindow("Places:Organizer");
 				if(organizer)
 				{
@@ -488,8 +459,6 @@ S4EDownloadService.prototype =
 					return selectedNode && selectedNode.itemId === downloadsItemId;
 				}
 				return false;
-			case 4: // Show Classic
-				return DownloadManagerUIClassic.visible;
 			default: // Nothing
 				return false;
 		}
@@ -574,7 +543,7 @@ DownloadManagerHandler.prototype =
 	{
 		while(dls.hasMoreElements())
 		{
-			let dl = dls.getNext().QueryInterface(CI.nsIDownload);
+			let dl = dls.getNext();
 			yield { state: dl.state, size: dl.size, speed: dl.speed, transferred: dl.amountTransferred };
 		}
 	},
@@ -659,12 +628,12 @@ JSTransferHandler.prototype =
 
 	activeEntries: function()
 	{
-		return this._activePublic.generator();
+		return this._activePublic.downloads();
 	},
 
 	activePrivateEntries: function()
 	{
-		return this._activePrivate.generator();
+		return this._activePrivate.downloads();
 	}
 };
 
@@ -672,7 +641,7 @@ function JSTransferListener(downloadService, listPromise, isPrivate)
 {
 	this._downloadService = downloadService;
 	this._isPrivate = isPrivate;
-	this._downloads = {};
+	this._downloads = new Map();
 
 	listPromise.then(this.initList.bind(this)).then(null, CU.reportError);
 }
@@ -681,7 +650,7 @@ JSTransferListener.prototype =
 {
 	_downloadService: null,
 	_list:            null,
-	_downloads:       {},
+	_downloads:       null,
 	_isPrivate:       false,
 	_wantsStart:      false,
 
@@ -705,6 +674,8 @@ JSTransferListener.prototype =
 
 	destroy: function()
 	{
+		this._downloads.clear();
+
 		["_downloadService", "_list", "_downloads"].forEach(function(prop)
 		{
 			delete this[prop];
@@ -733,12 +704,9 @@ JSTransferListener.prototype =
 		this._list.removeView(this);
 	},
 
-	generator: function()
+	downloads: function()
 	{
-		for(let dl in this._downloads)
-		{
-			yield this._downloads[dl];
-		}
+		return this._downloads.values();
 	},
 
 	convertToState: function(dl)
@@ -772,11 +740,11 @@ JSTransferListener.prototype =
 
 	onDownloadAdded: function(aDownload)
 	{
-		let dl = this._downloads[aDownload];
+		let dl = this._downloads.get(aDownload);
 		if(!dl)
 		{
 			dl = {};
-			this._downloads[aDownload] = dl;
+			this._downloads.set(aDownload, dl);
 		}
 
 		dl.state = this.convertToState(aDownload);
@@ -804,6 +772,7 @@ JSTransferListener.prototype =
 
 	onDownloadRemoved: function(aDownload)
 	{
-		delete this._downloads[aDownload];
+		this._downloads.delete(aDownload);
 	}
-}
+};
+
diff --git a/modules/Progress.jsm b/modules/Progress.jsm
index b9db8c6..c4bcdb3 100644
--- a/modules/Progress.jsm
+++ b/modules/Progress.jsm
@@ -1,39 +1,18 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * 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/.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * Original code copyright (C) Mozilla Foundation. All Rights Reserved.
+ * Copyright (C) 2010-2013 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+ *
+ * Progress listener code based on Mozilla Foundation code:
+ * https://hg.mozilla.org/mozilla-central/file/9962128c19d6/browser/base/content/browser.js#l4130
+*/
 
 "use strict";
 
diff --git a/modules/Status.jsm b/modules/Status.jsm
index b982e4f..f539d39 100644
--- a/modules/Status.jsm
+++ b/modules/Status.jsm
@@ -1,39 +1,14 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * 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/.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * Copyright (C) 2010-2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
 
 "use strict";
 
@@ -44,7 +19,8 @@ const CU = Components.utils;
 CU.import("resource://gre/modules/Services.jsm");
 CU.import("resource://gre/modules/XPCOMUtils.jsm");
 
-function S4EStatusService(window, service, getters) {
+function S4EStatusService(window, service, getters)
+{
 	this._window = window;
 	this._service = service;
 	this._getters = getters;
@@ -66,6 +42,9 @@ S4EStatusService.prototype =
 	_jsStatus:               { val: "", type: "" },
 	_defaultStatus:          { val: "", type: "" },
 
+	_isFullScreen:           false,
+	_isFullScreenVideo:      false,
+
 	_statusText:             { val: "", type: "" },
 	_noUpdate:               false,
 	_statusChromeTimeoutID:  0,
@@ -256,6 +235,23 @@ S4EStatusService.prototype =
 		}
 	},
 
+	updateFullScreen: function()
+	{
+		this._isFullScreen = this._window.fullScreen;
+		this._isFullScreenVideo = false;
+		if(this._isFullScreen)
+		{
+			let fsEl = this._window.content.document.mozFullScreenElement;
+			if(fsEl && (fsEl.nodeName == "VIDEO" || fsEl.getElementsByTagName("VIDEO").length > 0))
+			{
+				this._isFullScreenVideo = true;
+			}
+		}
+
+		this.clearStatusField();
+		this.updateStatusField(true);
+	},
+
 	setTimer: function(type)
 	{
 		let typeArgs = type.split(" ", 3);
@@ -320,9 +316,14 @@ S4EStatusService.prototype =
 
 	setStatusField: function(location, text, allowTooltip)
 	{
+		if(!location)
+		{
+			return;
+		}
+
 		let label = null;
 
-		if(this._window.fullScreen && this._service.advancedStatusDetectFullScreen)
+		if(this._isFullScreen && this._service.advancedStatusDetectFullScreen)
 		{
 			switch(location)
 			{
@@ -340,8 +341,6 @@ S4EStatusService.prototype =
 
 		switch(location)
 		{
-			case 0: // Disable
-				break;
 			case 1: // Toolbar
 				label = this._getters.statusWidgetLabel;
 				break;
@@ -355,6 +354,10 @@ S4EStatusService.prototype =
 				break;
 			case 3: // Popup
 			default:
+				if(this._isFullScreenVideo && this._service.advancedStatusDetectVideo)
+				{
+					return;
+				}
 				label = this._getters.statusOverlay;
 				break;
 		}
diff --git a/modules/Status4Evar.jsm b/modules/Status4Evar.jsm
index 8538b1a..69afafe 100644
--- a/modules/Status4Evar.jsm
+++ b/modules/Status4Evar.jsm
@@ -1,39 +1,14 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * 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/.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * Copyright (C) 2010-2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
 
 "use strict";
 
@@ -54,38 +29,28 @@ CU.import("resource://status4evar/Progress.jsm");
 CU.import("resource://status4evar/Downloads.jsm");
 CU.import("resource://status4evar/Toolbars.jsm");
 
-function Status4Evar(window, gBrowser, gNavToolbox)
+function Status4Evar(window, gBrowser, toolbox)
 {
 	this._window = window;
-	this._gNavToolbox = gNavToolbox;
-
-	S4EToolbars.setup(this._window, this._gNavToolbox, s4e_service);
+	this._toolbox = toolbox;
 
 	this.getters = new S4EWindowGetters(this._window);
+	this.toolbars = new S4EToolbars(this._window, gBrowser, this._toolbox, s4e_service, this.getters);
 	this.statusService = new S4EStatusService(this._window, s4e_service, this.getters);
 	this.progressMeter = new S4EProgressService(gBrowser, s4e_service, this.getters, this.statusService);
 	this.downloadStatus = new S4EDownloadService(this._window, s4e_service, this.getters);
 	this.sizeModeService = new SizeModeService(this._window, this);
 
-	this.__bound_beforeCustomization = this.beforeCustomization.bind(this)
-	this.__bound_updateWindow = this.updateWindow.bind(this);
-	this.__bound_destroy = this.destroy.bind(this)
-
-	this._gNavToolbox.addEventListener("beforecustomization", this.__bound_beforeCustomization, false);
-	this._gNavToolbox.addEventListener("aftercustomization", this.__bound_updateWindow, false);
-	this._window.addEventListener("unload", this.__bound_destroy, false);
+	this._window.addEventListener("unload", this, false);
 }
 
 Status4Evar.prototype =
 {
-	_window:         null,
-	_gNavToolbox:    null,
-
-	__bound_beforeCustomization: null,
-	__bound_updateWindow:        null,
-	__bound_destroy:             null,
+	_window:  null,
+	_toolbox: null,
 
 	getters:         null,
+	toolbars:        null,
 	statusService:   null,
 	progressMeter:   null,
 	downloadStatus:  null,
@@ -93,6 +58,10 @@ Status4Evar.prototype =
 
 	setup: function()
 	{
+		this._toolbox.addEventListener("beforecustomization", this, false);
+		this._toolbox.addEventListener("aftercustomization", this, false);
+
+		this.toolbars.setup();
 		this.updateWindow();
 
 		// OMFG HAX! If a page is already loading, fake a network start event
@@ -105,108 +74,44 @@ Status4Evar.prototype =
 
 	destroy: function()
 	{
-		this._window.removeEventListener("unload", this.__bound_destroy, false);
-		this._gNavToolbox.removeEventListener("aftercustomization", this.__bound_updateWindow, false);
-		this._gNavToolbox.removeEventListener("beforecustomization", this.__bound_beforeCustomization, false);
+		this._window.removeEventListener("unload", this, false);
+		this._toolbox.removeEventListener("aftercustomization", this, false);
+		this._toolbox.removeEventListener("beforecustomization", this, false);
 
 		this.getters.destroy();
 		this.statusService.destroy();
 		this.downloadStatus.destroy();
 		this.progressMeter.destroy();
+		this.toolbars.destroy();
 		this.sizeModeService.destroy();
 
-		["_window", "_gNavToolbox", "getters", "statusService", "downloadStatus", "progressMeter", "sizeModeService",
-		"__bound_beforeCustomization", "__bound_destroy", "__bound_updateWindow"].forEach(function(prop)
+		["_window", "_toolbox", "getters", "statusService", "downloadStatus",
+		"progressMeter", "toolbars", "sizeModeService"].forEach(function(prop)
 		{
 			delete this[prop];
 		}, this);
 	},
 
-	updateSplitters: function(action)
+	handleEvent: function(aEvent)
 	{
-		let document = this._window.document;
-
-		let splitter_before = document.getElementById("status4evar-status-splitter-before");
-		if(splitter_before)
-		{
-			splitter_before.parentNode.removeChild(splitter_before);
-		}
-
-		let splitter_after = document.getElementById("status4evar-status-splitter-after");
-		if(splitter_after)
+		switch(aEvent.type)
 		{
-			splitter_after.parentNode.removeChild(splitter_after);
-		}
-
-		let status = this.getters.statusWidget;
-		if(!action || !status)
-		{
-			return;
-		}
-
-		let urlbar = document.getElementById("urlbar-container");
-		let stop = document.getElementById("stop-button");
-		let fullscreenflex = document.getElementById("fullscreenflex");
-
-		let nextSibling = status.nextSibling;
-		let previousSibling = status.previousSibling;
-
-		function getSplitter(splitter, suffix)
-		{
-			if(!splitter)
-			{
-				splitter = document.createElement("splitter");
-				splitter.id = "status4evar-status-splitter-" + suffix;
-				splitter.setAttribute("resizebefore", "flex");
-				splitter.setAttribute("resizeafter", "flex");
-				splitter.className = "chromeclass-toolbar-additional status4evar-status-splitter";
-			}
-			return splitter;
+			case "unload":
+				this.destroy();
+				break;
+			case "beforecustomization":
+				this.beforeCustomization();
+				break;
+			case "aftercustomization":
+				this.updateWindow();
+				break;
 		}
-
-		if((previousSibling && previousSibling.flex > 0)
-		|| (urlbar && stop && urlbar.getAttribute("combined") && stop == previousSibling))
-		{
-			status.parentNode.insertBefore(getSplitter(splitter_before, "before"), status);
-		}
-
-		if(nextSibling && nextSibling.flex > 0 && nextSibling != fullscreenflex)
-		{
-			status.parentNode.insertBefore(getSplitter(splitter_after, "after"), nextSibling);
-		}
-	},
-
-	updateWindowGripper: function(action)
-	{
-		let document = this._window.document;
-
-		let gripper = document.getElementById("status4evar-window-gripper");
-		let addon_bar = this.getters.addonbar;
-
-		if(!action || !addon_bar || !s4e_service.addonbarWindowGripper
-		|| this._window.windowState != CI.nsIDOMChromeWindow.STATE_NORMAL || addon_bar.toolbox.customizing)
-		{
-			if(gripper)
-			{
-				gripper.parentNode.removeChild(gripper);
-			}
-			return;
-		}
-
-		if(!gripper)
-		{
-			gripper = document.createElement("resizer");
-			gripper.id = "status4evar-window-gripper";
-			gripper.dir = "bottomend";
-		}
-
-		addon_bar.appendChild(gripper);
 	},
 
 	beforeCustomization: function()
 	{
-		this.updateSplitters(false);
-		this.updateWindowGripper(false);
+		this.toolbars.updateSplitters(false);
+		this.toolbars.updateWindowGripper(false);
 
 		this.statusService.setNoUpdate(true);
 		let status_label = this.getters.statusWidgetLabel;
@@ -226,7 +131,7 @@ Status4Evar.prototype =
 		this.statusService.buildBinding();
 		this.downloadStatus.init();
 		this.downloadStatus.customizing(false);
-		this.updateSplitters(true);
+		this.toolbars.updateSplitters(true);
 
 		s4e_service.updateWindow(this._window);
 		// This also handles the following:
@@ -285,6 +190,8 @@ S4EWindowGetters.prototype =
 			["downloadButtonProgress", "status4evar-download-progress-bar"],
 			["downloadButtonLabel",    "status4evar-download-label"],
 			["downloadButtonAnchor",   "status4evar-download-anchor"],
+			["downloadNotifyAnchor",   "status4evar-download-notification-anchor"],
+			["statusBar",              "status4evar-status-bar"],
 			["statusWidget",           "status4evar-status-widget"],
 			["statusWidgetLabel",      "status4evar-status-text"],
 			["strings",                "bundle_status4evar"],
@@ -350,7 +257,7 @@ S4EWindowGetters.prototype =
 			delete this[prop];
 		}, this);
 
-		["urlbar", "_window"].forEach(function(prop)
+		["urlbar", "statusOverlay", "statusOverlay", "_window"].forEach(function(prop)
 		{
 			delete this[prop];
 		}, this);
@@ -390,14 +297,13 @@ SizeModeService.prototype =
 		if(this._window.fullScreen != this.lastFullScreen)
 		{
 			this.lastFullScreen = this._window.fullScreen;
-			this._s4e.statusService.clearStatusField();
-			this._s4e.statusService.updateStatusField(true);
+			this._s4e.statusService.updateFullScreen();
 		}
 
 		if(this._window.windowState != this.lastwindowState)
 		{
 			this.lastwindowState = this._window.windowState;
-			this._s4e.updateWindowGripper(true);
+			this._s4e.toolbars.updateWindowGripper(true);
 		}
 	},
 
diff --git a/modules/Toolbars.jsm b/modules/Toolbars.jsm
index 5383fbf..8e41500 100644
--- a/modules/Toolbars.jsm
+++ b/modules/Toolbars.jsm
@@ -1,49 +1,161 @@
-/* ***** BEGIN LICENSE BLOCK *****
- *   Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+/*
+ * ***** BEGIN LICENSE BLOCK *****
  * 
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Status-4-Evar.
- *
- * The Initial Developer of the Original Code is 
- * Matthew Turnbull <sparky at bluefang-logic.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2013
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * 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/.
  * 
- * ***** END LICENSE BLOCK ***** */
+ * Copyright (C) 2010-2014 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * 
+ * ***** END LICENSE BLOCK *****
+*/
 
 "use strict";
 
 const EXPORTED_SYMBOLS = ["S4EToolbars"];
 
-const S4EToolbars =
+const CI = Components.interfaces;
+const CU = Components.utils;
+
+CU.import("resource://gre/modules/Services.jsm");
+
+function S4EToolbars(window, gBrowser, toolbox, service, getters)
+{
+	this._window = window;
+	this._toolbox = toolbox;
+	this._service = service;
+	this._getters = getters;
+
+	if(Services.vc.compare("28.*", Services.appinfo.version) < 0)
+	{
+		this._handler = new AustralisS4EToolbars(this._window, gBrowser, this._getters);
+		Services.console.logStringMessage("S4EToolbars using AustralisS4EToolbars backend");
+	}
+	else
+	{
+		this._handler = new ClassicS4EToolbars(this._window, this._toolbox);
+		Services.console.logStringMessage("S4EToolbars using ClassicS4EToolbars backend");
+	}
+}
+
+S4EToolbars.prototype =
+{
+	_window:  null,
+	_toolbox: null,
+	_service: null,
+	_getters: null,
+
+	_handler: null,
+
+	setup: function()
+	{
+		this.updateSplitters(false);
+		this.updateWindowGripper(false);
+		this._handler.setup(this._service.firstRun, this._service.firstRunAustralis);
+	},
+
+	destroy: function()
+	{
+		this._handler.destroy();
+
+		["_window", "_toolbox",  "_service", "_getters", "_handler"].forEach(function(prop)
+		{
+			delete this[prop];
+		}, this);
+	},
+
+	updateSplitters: function(action)
+	{
+		let document = this._window.document;
+
+		let splitter_before = document.getElementById("status4evar-status-splitter-before");
+		if(splitter_before)
+		{
+			splitter_before.parentNode.removeChild(splitter_before);
+		}
+
+		let splitter_after = document.getElementById("status4evar-status-splitter-after");
+		if(splitter_after)
+		{
+			splitter_after.parentNode.removeChild(splitter_after);
+		}
+
+		let status = this._getters.statusWidget;
+		if(!action || !status)
+		{
+			return;
+		}
+
+		let urlbar = document.getElementById("urlbar-container");
+		let stop = document.getElementById("stop-button");
+		let fullscreenflex = document.getElementById("fullscreenflex");
+
+		let nextSibling = status.nextSibling;
+		let previousSibling = status.previousSibling;
+
+		function getSplitter(splitter, suffix)
+		{
+			if(!splitter)
+			{
+				splitter = document.createElement("splitter");
+				splitter.id = "status4evar-status-splitter-" + suffix;
+				splitter.setAttribute("resizebefore", "flex");
+				splitter.setAttribute("resizeafter", "flex");
+				splitter.className = "chromeclass-toolbar-additional status4evar-status-splitter";
+			}
+			return splitter;
+		}
+
+		if((previousSibling && previousSibling.flex > 0)
+		|| (urlbar && stop && urlbar.getAttribute("combined") && stop == previousSibling))
+		{
+			status.parentNode.insertBefore(getSplitter(splitter_before, "before"), status);
+		}
+
+		if(nextSibling && nextSibling.flex > 0 && nextSibling != fullscreenflex)
+		{
+			status.parentNode.insertBefore(getSplitter(splitter_after, "after"), nextSibling);
+		}
+	},
+
+	updateWindowGripper: function(action)
+	{
+		let document = this._window.document;
+
+		let gripper = document.getElementById("status4evar-window-gripper");
+		let toolbar = this._getters.statusBar || this._getters.addonbar;
+
+		if(!action || !toolbar || !this._service.addonbarWindowGripper
+		|| this._window.windowState != CI.nsIDOMChromeWindow.STATE_NORMAL || toolbar.toolbox.customizing)
+		{
+			if(gripper)
+			{
+				gripper.parentNode.removeChild(gripper);
+			}
+			return;
+		}
+
+		gripper = this._handler.buildGripper(toolbar, gripper, "status4evar-window-gripper");
+
+		toolbar.appendChild(gripper);
+	}
+};
+
+function ClassicS4EToolbars(window, toolbox)
 {
-	setup: function(window, gNavToolbox, service)
+	this._window = window;
+	this._toolbox = toolbox;
+}
+
+ClassicS4EToolbars.prototype =
+{
+	_window:  null,
+	_toolbox: null,
+
+	setup: function(firstRun, firstRunAustralis)
 	{
-		let document = window.document;
+		let document = this._window.document;
+
 		let addon_bar = document.getElementById("addon-bar");
 		if(addon_bar)
 		{
@@ -66,7 +178,7 @@ const S4EToolbars =
 			addon_bar.setAttribute("defaultset", defaultSet);
 
 			// Update the currentSet
-			if(service.firstRun)
+			if(firstRun)
 			{
 				let isCustomizableToolbar = function(aElt)
 				{
@@ -74,8 +186,8 @@ const S4EToolbars =
 				}
 
 				let isCustomizedAlready = false;
-				let toolbars = Array.filter(gNavToolbox.childNodes, isCustomizableToolbar).concat(
-					       Array.filter(gNavToolbox.externalToolbars, isCustomizableToolbar));
+				let toolbars = Array.filter(this._toolbox.childNodes, isCustomizableToolbar).concat(
+					       Array.filter(this._toolbox.externalToolbars, isCustomizableToolbar));
 				toolbars.forEach(function(toolbar)
 				{
 					if(toolbar.currentSet.indexOf("status4evar") > -1)
@@ -98,15 +210,120 @@ const S4EToolbars =
 					addon_bar.currentSet = currentSet;
 					addon_bar.setAttribute("currentset", currentSet);
 					document.persist(addon_bar.id, "currentset");
-					window.setToolbarVisibility(addon_bar, true);
+					this._window.setToolbarVisibility(addon_bar, true);
 				}
 			}
 		}
 	},
 
-	restore: function(window, gNavToolbox)
+	destroy: function()
+	{
+		["_window", "_toolbox"].forEach(function(prop)
+		{
+			delete this[prop];
+		}, this);
+	},
+
+	buildGripper: function(toolbar, gripper, id)
+	{
+		if(!gripper)
+		{
+			let document = this._window.document;
+
+			gripper = document.createElement("resizer");
+			gripper.id = id;
+			gripper.dir = "bottomend";
+		}
+
+		return gripper;
+	}
+};
+
+function AustralisS4EToolbars(window, gBrowser, getters)
+{
+	this._window = window;
+	this._gBrowser = gBrowser;
+	this._getters = getters;
+
+	this.__bound_updateWindowResizers = this.updateWindowResizers.bind(this);
+
+	this._api = CU.import("resource://status4evar/Australis.jsm", {}).AustralisTools;
+}
+
+AustralisS4EToolbars.prototype =
+{
+	_window:   null,
+	_gBrowser: null,
+	_getters:  null,
+
+	__bound_updateWindowResizers: null,
+	__old_updateWindowResizers: null,
+
+	_api: null,
+
+	setup: function(firstRun, firstRunAustralis)
+	{
+		this.__old_updateWindowResizers = this._gBrowser.updateWindowResizers;
+		this._gBrowser.updateWindowResizers = this.__bound_updateWindowResizers;
+
+		if(!firstRun && firstRunAustralis)
+		{
+			this._api.migrate();
+		}
+	},
+
+	destroy: function()
 	{
-		
+		this._gBrowser.updateWindowResizers = this.__old_updateWindowResizers;
+
+		["_window", "_gBrowser", "_getters", "_api", "__bound_updateWindowResizers",
+		"__old_updateWindowResizers"].forEach(function(prop)
+		{
+			delete this[prop];
+		}, this);
+	},
+
+	updateWindowResizers: function()
+	{
+		if(!this._window.gShowPageResizers) {
+			return;
+		}
+
+		let toolbar = this._getters.statusBar;
+		let show = this._window.windowState == this._window.STATE_NORMAL && (!toolbar || toolbar.collapsed);
+		this._gBrowser.browsers.forEach(function(browser) {
+			browser.showWindowResizer = show;
+		});
+	},
+
+	buildGripper: function(toolbar, container, id)
+	{
+		if(!container)
+		{
+			let document = this._window.document;
+
+			let gripper = document.createElement("resizer");
+			gripper.dir = "bottomend";
+
+			container = document.createElement("hbox");
+			container.id = id;
+			container.pack = "end";
+			container.ordinal = 1000;
+			container.appendChild(gripper);
+		}
+
+		let needFlex = 1;
+		for(let node of toolbar.childNodes)
+		{
+			if(node.hasAttribute("flex") || node.flex)
+			{
+				needFlex = 0;
+				break;
+			}
+		}
+		container.flex = needFlex;
+
+		return container;
 	}
 };
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/status-4-evar.git



More information about the Pkg-mozext-commits mailing list