[Pkg-mozext-commits] [all-in-one-sidebar] 01/05: Imported Upstream version 0.7.22

David Prévot taffit at moszumanska.debian.org
Thu May 8 02:08:25 UTC 2014


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

taffit pushed a commit to branch master
in repository all-in-one-sidebar.

commit e02b08b5a2afe593ee77987e46282bf281d9bfad
Author: David Prévot <taffit at debian.org>
Date:   Wed May 7 21:39:40 2014 -0400

    Imported Upstream version 0.7.22
---
 chrome.manifest                         |   9 +-
 content/{_common.js => _helper.js}      | 146 +++---
 content/_lib.js                         | 148 +++---
 content/about.js                        |   2 +-
 content/about.xul                       |   2 +-
 content/about_content.xul               |   4 +-
 content/addons.js                       |   8 +-
 content/addons.xul                      |   2 +-
 content/addons_xpinstall.xul            |  40 +-
 content/aios.dtd                        |  28 +-
 content/aios.js                         | 830 ++------------------------------
 content/aios.properties                 |   0
 content/aios.xml                        |   0
 content/aios.xul                        | 111 +++--
 content/aios_compatibility.js           |   6 +-
 content/aios_customize.xul              |  13 -
 content/aios_fx.js                      |  47 +-
 content/{aios.js => aios_old.js}        | 171 ++++---
 content/aios_tbx.js                     |  97 ++--
 content/aios_tbx_customize.js           |  86 ----
 content/console.js                      |  14 +-
 content/console.xul                     |   6 +-
 content/downloads.js                    |  90 ++--
 content/downloads.xul                   |   2 +-
 content/downloads_alert.xul             |  22 +-
 content/multipanel.js                   |  41 +-
 content/multipanel.xul                  |  66 +--
 content/multipanel_config.xul           |   8 +-
 content/pageinfo.js                     |  26 +-
 content/pageinfo.xul                    |   2 +-
 content/places.js                       |  18 +-
 content/places.xul                      |   6 +-
 content/prefs/_keyconfig.js             |   2 +-
 content/prefs/_overlay.js               |   0
 content/prefs/general.js                |  34 +-
 content/prefs/keys.xul                  |   2 +-
 content/prefs/overlay_main.xul          |   4 +-
 content/prefs/prefs.js                  | 172 +++----
 content/prefs/prefs.xul                 | 112 ++---
 defaults/preferences/aios.js            |   0
 icon.png                                | Bin
 install.rdf                             |   6 +-
 license.txt                             |  14 +-
 locale/ar-SA/about.dtd                  |   1 -
 locale/ar-SA/aios.dtd                   |   2 +
 locale/ar-SA/lib.dtd                    |   0
 locale/ar-SA/lib.properties             |   0
 locale/ar-SA/multipanel.dtd             |   0
 locale/ar-SA/prefs.dtd                  |   0
 locale/be-BY/about.dtd                  |   1 -
 locale/be-BY/aios.dtd                   |   2 +
 locale/be-BY/lib.dtd                    |   2 +-
 locale/be-BY/lib.properties             |   0
 locale/be-BY/multipanel.dtd             |   0
 locale/be-BY/prefs.dtd                  |   0
 locale/cs-CZ/about.dtd                  |   1 -
 locale/cs-CZ/aios.dtd                   |   2 +
 locale/cs-CZ/lib.dtd                    |   2 +-
 locale/cs-CZ/lib.properties             |   0
 locale/cs-CZ/multipanel.dtd             |   0
 locale/cs-CZ/prefs.dtd                  |   0
 locale/da/about.dtd                     |   1 -
 locale/da/aios.dtd                      |   2 +
 locale/da/lib.dtd                       |   2 +-
 locale/da/lib.properties                |   0
 locale/da/multipanel.dtd                |   0
 locale/da/prefs.dtd                     |   0
 locale/de/about.dtd                     |   0
 locale/de/aios.dtd                      |   2 +
 locale/de/lib.dtd                       |   0
 locale/de/lib.properties                |   0
 locale/de/multipanel.dtd                |   0
 locale/de/prefs.dtd                     |   0
 locale/el/about.dtd                     |   1 -
 locale/el/aios.dtd                      |   2 +
 locale/el/lib.dtd                       |   0
 locale/el/lib.properties                |   0
 locale/el/multipanel.dtd                |   0
 locale/el/prefs.dtd                     |   0
 locale/en-GB/about.dtd                  |   1 -
 locale/en-GB/aios.dtd                   |   2 +
 locale/en-GB/lib.dtd                    |   0
 locale/en-GB/lib.properties             |   0
 locale/en-GB/multipanel.dtd             |   0
 locale/en-GB/prefs.dtd                  |   0
 locale/en-US/about.dtd                  |   0
 locale/en-US/aios.dtd                   |   2 +
 locale/en-US/lib.dtd                    |   0
 locale/en-US/lib.properties             |   0
 locale/en-US/multipanel.dtd             |   0
 locale/en-US/prefs.dtd                  |   0
 locale/es-AR/about.dtd                  |   1 -
 locale/es-AR/aios.dtd                   |   2 +
 locale/es-AR/lib.dtd                    |   0
 locale/es-AR/lib.properties             |   0
 locale/es-AR/multipanel.dtd             |   0
 locale/es-AR/prefs.dtd                  |   0
 locale/es-ES/about.dtd                  |   1 -
 locale/es-ES/aios.dtd                   |   2 +
 locale/es-ES/lib.dtd                    |   0
 locale/es-ES/lib.properties             |   0
 locale/es-ES/multipanel.dtd             |   0
 locale/es-ES/prefs.dtd                  |   0
 locale/et-EE/about.dtd                  |   1 -
 locale/et-EE/aios.dtd                   |   4 +-
 locale/et-EE/lib.dtd                    |   0
 locale/et-EE/lib.properties             |   0
 locale/et-EE/multipanel.dtd             |   0
 locale/et-EE/prefs.dtd                  |   0
 locale/fi/about.dtd                     |   1 -
 locale/fi/aios.dtd                      |   2 +
 locale/fi/lib.dtd                       |   0
 locale/fi/lib.properties                |   0
 locale/fi/multipanel.dtd                |   0
 locale/fi/prefs.dtd                     |   0
 locale/fr/about.dtd                     |   1 -
 locale/fr/aios.dtd                      |   2 +
 locale/fr/lib.dtd                       |   0
 locale/fr/lib.properties                |   0
 locale/fr/multipanel.dtd                |   0
 locale/fr/prefs.dtd                     |   0
 locale/he/about.dtd                     |   1 -
 locale/he/aios.dtd                      |   2 +
 locale/he/lib.dtd                       |   0
 locale/he/lib.properties                |   0
 locale/he/multipanel.dtd                |   0
 locale/he/prefs.dtd                     |   0
 locale/hr-HR/about.dtd                  |   1 -
 locale/hr-HR/aios.dtd                   |   2 +
 locale/hr-HR/lib.dtd                    |   2 +-
 locale/hr-HR/lib.properties             |   0
 locale/hr-HR/multipanel.dtd             |   0
 locale/hr-HR/prefs.dtd                  |   0
 locale/hu-HU/about.dtd                  |   1 -
 locale/hu-HU/aios.dtd                   |   2 +
 locale/hu-HU/lib.dtd                    |   0
 locale/hu-HU/lib.properties             |   0
 locale/hu-HU/multipanel.dtd             |   0
 locale/hu-HU/prefs.dtd                  |   0
 locale/hy-AM/about.dtd                  |   1 -
 locale/hy-AM/aios.dtd                   |   2 +
 locale/hy-AM/lib.dtd                    |   0
 locale/hy-AM/lib.properties             |   0
 locale/hy-AM/multipanel.dtd             |   0
 locale/hy-AM/prefs.dtd                  |   0
 locale/it/about.dtd                     |   1 -
 locale/it/aios.dtd                      |   2 +
 locale/it/lib.dtd                       |   0
 locale/it/lib.properties                |   0
 locale/it/multipanel.dtd                |   0
 locale/it/prefs.dtd                     |   0
 locale/ja-JP/about.dtd                  |   1 -
 locale/ja-JP/aios.dtd                   |   2 +
 locale/ja-JP/lib.dtd                    |   0
 locale/ja-JP/lib.properties             |   0
 locale/ja-JP/multipanel.dtd             |   0
 locale/ja-JP/prefs.dtd                  |   0
 locale/ko-KR/about.dtd                  |   1 -
 locale/ko-KR/aios.dtd                   |   2 +
 locale/ko-KR/lib.dtd                    |   0
 locale/ko-KR/lib.properties             |   0
 locale/ko-KR/multipanel.dtd             |   0
 locale/ko-KR/prefs.dtd                  |   0
 locale/lt-LT/about.dtd                  |   1 -
 locale/lt-LT/aios.dtd                   |   2 +
 locale/lt-LT/lib.dtd                    |   2 +-
 locale/lt-LT/lib.properties             |   0
 locale/lt-LT/multipanel.dtd             |   0
 locale/lt-LT/prefs.dtd                  |   0
 locale/nb-NO/about.dtd                  |   1 -
 locale/nb-NO/aios.dtd                   |   2 +
 locale/nb-NO/lib.dtd                    |   2 +-
 locale/nb-NO/lib.properties             |   0
 locale/nb-NO/multipanel.dtd             |   0
 locale/nb-NO/prefs.dtd                  |   0
 locale/nl/about.dtd                     |   3 +-
 locale/nl/aios.dtd                      |   2 +
 locale/nl/lib.dtd                       |   0
 locale/nl/lib.properties                |   0
 locale/nl/multipanel.dtd                |   0
 locale/nl/prefs.dtd                     |   2 +-
 locale/pl/about.dtd                     |   1 -
 locale/pl/aios.dtd                      |   2 +
 locale/pl/lib.dtd                       |   0
 locale/pl/lib.properties                |   0
 locale/pl/multipanel.dtd                |   0
 locale/pl/prefs.dtd                     |   0
 locale/pt-BR/about.dtd                  |   1 -
 locale/pt-BR/aios.dtd                   |   2 +
 locale/pt-BR/lib.dtd                    |   0
 locale/pt-BR/lib.properties             |   0
 locale/pt-BR/multipanel.dtd             |   0
 locale/pt-BR/prefs.dtd                  |   0
 locale/pt-PT/about.dtd                  |   1 -
 locale/pt-PT/aios.dtd                   |   2 +
 locale/pt-PT/lib.dtd                    |   0
 locale/pt-PT/lib.properties             |   0
 locale/pt-PT/multipanel.dtd             |   0
 locale/pt-PT/prefs.dtd                  |   0
 locale/ro/about.dtd                     |   1 -
 locale/ro/aios.dtd                      |   8 +-
 locale/ro/lib.dtd                       |   0
 locale/ro/lib.properties                |   0
 locale/ro/multipanel.dtd                |   0
 locale/ro/prefs.dtd                     |   0
 locale/ru/about.dtd                     |   1 -
 locale/ru/aios.dtd                      |   2 +
 locale/ru/lib.dtd                       |   0
 locale/ru/lib.properties                |   0
 locale/ru/multipanel.dtd                |   0
 locale/ru/prefs.dtd                     |   0
 locale/sk-SK/about.dtd                  |   1 -
 locale/sk-SK/aios.dtd                   |   2 +
 locale/sk-SK/lib.dtd                    |   2 +-
 locale/sk-SK/lib.properties             |   0
 locale/sk-SK/multipanel.dtd             |   0
 locale/sk-SK/prefs.dtd                  |   0
 locale/sq-AL/about.dtd                  |   1 -
 locale/sq-AL/aios.dtd                   |   2 +
 locale/sq-AL/lib.dtd                    |   0
 locale/sq-AL/lib.properties             |   0
 locale/sq-AL/multipanel.dtd             |   0
 locale/sq-AL/prefs.dtd                  |   2 +-
 locale/sr/about.dtd                     |   1 -
 locale/sr/aios.dtd                      |   2 +
 locale/sr/lib.dtd                       |   0
 locale/sr/lib.properties                |   0
 locale/sr/multipanel.dtd                |   0
 locale/sr/prefs.dtd                     |   0
 locale/sv-SE/about.dtd                  |   1 -
 locale/sv-SE/aios.dtd                   |   2 +
 locale/sv-SE/lib.dtd                    |   0
 locale/sv-SE/lib.properties             |   0
 locale/sv-SE/multipanel.dtd             |   0
 locale/sv-SE/prefs.dtd                  |   0
 locale/tr/about.dtd                     |  49 +-
 locale/tr/aios.dtd                      |  72 +--
 locale/tr/lib.dtd                       |  12 +-
 locale/tr/lib.properties                |  12 +-
 locale/tr/multipanel.dtd                |  32 +-
 locale/tr/prefs.dtd                     | 112 ++---
 locale/uk/about.dtd                     |   1 -
 locale/uk/aios.dtd                      |   2 +
 locale/uk/lib.dtd                       |   0
 locale/uk/lib.properties                |   0
 locale/uk/multipanel.dtd                |   0
 locale/uk/prefs.dtd                     |   0
 locale/vi/about.dtd                     |   1 -
 locale/vi/aios.dtd                      |   2 +
 locale/vi/lib.dtd                       |   0
 locale/vi/lib.properties                |   0
 locale/vi/multipanel.dtd                |   0
 locale/vi/prefs.dtd                     |   0
 locale/zh-CN/about.dtd                  |   1 -
 locale/zh-CN/aios.dtd                   |   2 +
 locale/zh-CN/lib.dtd                    |   0
 locale/zh-CN/lib.properties             |   0
 locale/zh-CN/multipanel.dtd             |   0
 locale/zh-CN/prefs.dtd                  |   0
 locale/zh-TW/about.dtd                  |   1 -
 locale/zh-TW/aios.dtd                   |   2 +
 locale/zh-TW/lib.dtd                    |   2 +-
 locale/zh-TW/lib.properties             |   0
 locale/zh-TW/multipanel.dtd             |   0
 locale/zh-TW/prefs.dtd                  |   0
 skin/css/addons.css                     |   2 +-
 skin/css/aios.css                       |   2 +-
 skin/css/aios_buttons_darwin.css        |   2 +-
 skin/css/aios_buttons_generic.css       |   2 +-
 skin/css/aios_buttons_winnt.css         |   2 +-
 skin/css/aios_theme_darwin.css          |   2 +-
 skin/css/aios_theme_generic.css         |   2 +-
 skin/css/aios_theme_winnt.css           |   2 +-
 skin/css/console.css                    |   2 +-
 skin/css/downloads.css                  |   2 +-
 skin/css/downloads.old.css              |   1 -
 skin/css/downloads_old.css              |   1 +
 skin/css/multipanel.css                 |   2 +-
 skin/css/multipanel_config.css          |   2 +-
 skin/css/multipanel_ssr.css             |   2 +-
 skin/css/pageinfo.css                   |   2 +-
 skin/css/places.css                     |   2 +-
 skin/css/prefs.css                      |   2 +-
 skin/icons/icon64.png                   | Bin 2228 -> 2093 bytes
 skin/icons/panels_menus.png             | Bin 11087 -> 10910 bytes
 skin/icons/prefs.png                    | Bin
 skin/icons/toolbar_darwin.png           | Bin 2804 -> 2238 bytes
 skin/icons/toolbar_darwin_inverted.png  | Bin 0 -> 1593 bytes
 skin/icons/toolbar_generic.png          | Bin 12835 -> 12724 bytes
 skin/icons/toolbar_inverted_windows.png | Bin 2330 -> 0 bytes
 skin/icons/toolbar_windows.png          | Bin 3242 -> 5322 bytes
 skin/icons/toolbar_windows_inverted.png | Bin 0 -> 2753 bytes
 skin/icons/topbar_darwin.png            | Bin 24413 -> 23628 bytes
 skin/img/arrow-dn.png                   | Bin
 skin/img/arrow-up.png                   | Bin
 skin/img/arrow.gif                      | Bin
 skin/img/console_css.png                | Bin
 skin/img/console_xml.png                | Bin
 skin/img/grippy-left.gif                | Bin
 skin/img/grippy-right.gif               | Bin
 skin/img/info.png                       | Bin
 skin/img/paypal.gif                     | Bin
 skin/img/sidebarheader.gif              | Bin
 skin/less/addons.less                   | 735 ----------------------------
 skin/less/aios.less                     | 441 -----------------
 skin/less/aios_buttons_darwin.less      | 218 ---------
 skin/less/aios_buttons_generic.less     | 123 -----
 skin/less/aios_buttons_winnt.less       | 346 -------------
 skin/less/aios_theme_darwin.less        | 253 ----------
 skin/less/aios_theme_generic.less       |  53 --
 skin/less/aios_theme_winnt.less         | 154 ------
 skin/less/console.less                  | 526 --------------------
 skin/less/downloads.less                |   6 -
 skin/less/downloads.old.less            | 307 ------------
 skin/less/multipanel.less               | 218 ---------
 skin/less/multipanel_config.less        |  74 ---
 skin/less/multipanel_ssr.less           | 131 -----
 skin/less/pageinfo.less                 | 288 -----------
 skin/less/places.less                   | 197 --------
 skin/less/prefs.less                    | 376 ---------------
 320 files changed, 1025 insertions(+), 6277 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
old mode 100755
new mode 100644
index 32e37a8..71e8d92
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -8,7 +8,7 @@ locale          aios            be-BY           locale/be-BY/
 locale          aios            cs-CZ           locale/cs-CZ/
 locale          aios            da              locale/da/
 locale          aios            de              locale/de/
-locale          aios            el           	locale/el/
+locale          aios            el              locale/el/
 locale          aios            en-GB           locale/en-GB/
 locale          aios            es-AR           locale/es-AR/
 locale          aios            es-ES           locale/es-ES/
@@ -49,13 +49,6 @@ style           chrome://browser/content/browser.xul                       chrom
 style           chrome://browser/content/browser.xul                       chrome://aios/skin/css/aios_buttons_winnt.css       os=WINNT
 style           chrome://browser/content/browser.xul                       chrome://aios/skin/css/aios_buttons_darwin.css      os=Darwin
 
-
-overlay         chrome://global/content/customizeToolbar.xul               chrome://aios/content/aios_customize.xul
-style           chrome://global/content/customizeToolbar.xul               chrome://aios/skin/css/aios_buttons_generic.css
-style           chrome://global/content/customizeToolbar.xul               chrome://aios/skin/css/aios_buttons_winnt.css       os=WINNT
-style           chrome://global/content/customizeToolbar.xul               chrome://aios/skin/css/aios_buttons_darwin.css      os=Darwin
-
-
 overlay         chrome://browser/content/bookmarks/bookmarksPanel.xul      chrome://aios/content/places.xul
 style           chrome://browser/content/bookmarks/bookmarksPanel.xul      chrome://aios/skin/css/places.css
 
diff --git a/content/_common.js b/content/_helper.js
old mode 100755
new mode 100644
similarity index 69%
rename from content/_common.js
rename to content/_helper.js
index 8d5a0f9..1579359
--- a/content/_common.js
+++ b/content/_helper.js
@@ -1,46 +1,54 @@
+var AiOS_HELPER = {
 
-// globale Variablen fuer Preferences-Zugriff
-var aios_pBranch = Components.interfaces.nsIPrefBranch;
-var aios_gPref = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
-var aios_gPrefBranchN = aios_gPref.getBranch(null);
-var aios_gPrefBranch = aios_gPref.getBranch("extensions.aios.");
+    init: function() {
 
-// globale Variablen fuer Browser-Zugriff
-var aios_WW = Components.classes["@mozilla.org/embedcomp/window-watcher;1"].getService(Components.interfaces.nsIWindowWatcher);
-var aios_WM = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService(Components.interfaces.nsIWindowMediator);
-var aios_WIN = aios_WM.getMostRecentWindow('navigator:browser');
-var aios_APPCONTENT = aios_WIN.document.getElementById('appcontent');
-aios_WIN.aiosIsWindow = false;
+        this.prefInterface = Components.interfaces.nsIPrefBranch;
+        this.prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
+        this.prefBranch = this.prefService.getBranch(null);
+        this.prefBranchAiOS = this.prefService.getBranch("extensions.aios.");
 
+        this.windowWatcher = Components.classes["@mozilla.org/embedcomp/window-watcher;1"].getService(Components.interfaces.nsIWindowWatcher);
+        this.windowMediator = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService(Components.interfaces.nsIWindowMediator);
+        this.mostRecentWindow = this.windowMediator.getMostRecentWindow('navigator:browser');
 
-var aios_XULAppInfo = Components.classes['@mozilla.org/xre/app-info;1'].getService(Components.interfaces.nsIXULAppInfo);
+        this.appInfo = Components.classes['@mozilla.org/xre/app-info;1'].getService(Components.interfaces.nsIXULAppInfo);
+        this.os = Components.classes['@mozilla.org/xre/app-info;1'].getService(Components.interfaces.nsIXULRuntime).OS;
+        this.osVersion = window.navigator.oscpu;
+        this.defTheme = (this.prefBranch.getCharPref('general.skins.selectedSkin') == "classic/1.0") ? true : false;
 
-// {ec8030f7-c20a-464f-9b0e-13a3a9e97384} => Firefox
-var aios_appID = aios_XULAppInfo.ID;
+    },
 
-// Mozilla, Flock
-var aios_appVendor = aios_XULAppInfo.vendor;
+    initOnDOMLoaded: function() {
 
-// z.B. 11.0
-var aios_appVersion = aios_XULAppInfo.version;
+        AiOS_HELPER.aiosToolbar = document.getElementById('aios-toolbar');
+        AiOS_HELPER.sbhToolbar = document.getElementById('aios-sbhtoolbar');
 
-// WINNT, Darwin
-var aios_appOS = Components.classes['@mozilla.org/xre/app-info;1'].getService(Components.interfaces.nsIXULRuntime).OS;
+    },
 
-// z.B. Windows NT 5.1
-var aios_appOSVersion = window.navigator.oscpu;
+    rememberAppInfo: function(aObj) {
 
-// true, false
-var aios_appDefTheme = (aios_gPrefBranchN.getCharPref('general.skins.selectedSkin') == "classic/1.0") ? true : false;
+        aObj.setAttribute('aios-appVendor', this.appInfo.vendor);
+        aObj.setAttribute('aios-appVersion', this.appInfo.version);
+        aObj.setAttribute('aios-appOS', this.os);
+        aObj.setAttribute('aios-appOSVersion', this.osVersion);
+        aObj.setAttribute('aios-appDefTheme', this.defTheme);
 
+    },
+
+    unload: function() {
+        window.removeEventListener("DOMContentLoaded", AiOS_HELPER.initOnDOMLoaded);
+        //window.removeEventListener("load", AiOS_HELPER.initOnLoad);
+        window.removeEventListener("unload", AiOS_HELPER.unload);
+    }
+
+};
+
+AiOS_HELPER.init();
+
+window.addEventListener("DOMContentLoaded", AiOS_HELPER.initOnDOMLoaded, false);
+//window.addEventListener("load", AiOS_HELPER.initOnLoad, false);
+window.addEventListener("unload", AiOS_HELPER.unload, false);
 
-function aios_appInfo(aObj) {
-    aObj.setAttribute('aios-appVendor', aios_appVendor);
-    aObj.setAttribute('aios-appVersion', aios_appVersion);
-    aObj.setAttribute('aios-appOS', aios_appOS);
-    aObj.setAttribute('aios-appOSVersion', aios_appOSVersion);
-    aObj.setAttribute('aios-appDefTheme', aios_appDefTheme);
-}
 
 
 // globale Variablen und Funktionen zur Ueberwachung auf Progress-Veraenderungen
@@ -90,37 +98,13 @@ var aiosProgListener = {
 
 
 /*
-	Variablen zur Verwendung der Erweiterung "DebugLogger" - http://mozmonkey.com/debuglogger/
-*/
-if(Components.classes["@mozmonkey.com/debuglogger/manager;1"]) {
-    var aios_debugLogMngr = Components.classes["@mozmonkey.com/debuglogger/manager;1"].
-    getService(Components.interfaces.nsIDebugLoggerManager);
-    var aios_debugLogger = aios_debugLogMngr.registerLogger("aios");
-}
-//aios_debugLogger.log(3, "Hello World");
-
-
-/*
-	Debug-Funktion unter Verwendung der JavaScript-Konsole
-*/
-function aios_debug(aMsg) {
-    var aConsoleService = Components.classes["@mozilla.org/consoleservice;1"].
-    getService(Components.interfaces.nsIConsoleService),
-
-    msg = 'AIOS: ' + aMsg;
-    aConsoleService.logStringMessage(msg);
-}
-//aios_debug('Hallo');
-
-
-/*
-	oeffnet ein neues Tab mit der uebergebenen Adresse im Vordergrund
+    oeffnet ein neues Tab mit der uebergebenen Adresse im Vordergrund
 */
-var aiosLastSelTab;		// wird fuer Page Info/MultiPanel im Tab benoetigt
+var aiosLastSelTab;     // wird fuer Page Info/MultiPanel im Tab benoetigt
 function aios_addTab(aUrl) {
 
-    var browser = aios_WIN.getBrowser();
-    aiosLastSelTab = aios_WIN.content;
+    var browser = AiOS_HELPER.mostRecentWindow.getBrowser();
+    aiosLastSelTab = AiOS_HELPER.mostRecentWindow.content;
 
     var browserDoc;
     var existTab = null;
@@ -135,10 +119,10 @@ function aios_addTab(aUrl) {
         //alert(isPermaTab);
 
         /*var attribs = browser.tabContainer.childNodes[i].attributes;
-		//var attribs = browser.mCurrentTab.attributes;
-		for(var a = 0; a < attribs.length; a++) {
-			alert(attribs[a].name + ": " + attribs[a].value);
-		}*/
+        //var attribs = browser.mCurrentTab.attributes;
+        for(var a = 0; a < attribs.length; a++) {
+            alert(attribs[a].name + ": " + attribs[a].value);
+        }*/
 
         // wenn der Tab leer ist
         if(browserDoc.location.href == "about:blank" && browser.selectedTab.getAttribute('openBy') != "aios" && !isPermaTab && emptyTab == null)
@@ -185,13 +169,13 @@ function aios_addCSS(aURI, aBefore) {
 
 
 /*
-	errechnet die Breite des Browsers exkl. der AIOS-Toolbar
-		=> Aufruf durch aios_setSidebarDefWidth() in aios.js und aios_setSidebarWidth() in general.js
+    errechnet die Breite des Browsers exkl. der AIOS-Toolbar
+        => Aufruf durch aios_setSidebarDefWidth() in aios.js und aios_setSidebarWidth() in general.js
 */
 function aios_getBrowserWidth() {
-    var cStyleSidebar = aios_WIN.document.defaultView.getComputedStyle(aios_WIN.document.getElementById('sidebar-box'), '');
-    var cStyleSplitter = aios_WIN.document.defaultView.getComputedStyle(aios_WIN.document.getElementById('sidebar-splitter'), '');
-    var cStyleContent = aios_WIN.document.defaultView.getComputedStyle(aios_WIN.document.getElementById('appcontent'), '');
+    var cStyleSidebar = AiOS_HELPER.mostRecentWindow.document.defaultView.getComputedStyle(AiOS_HELPER.mostRecentWindow.document.getElementById('sidebar-box'), '');
+    var cStyleSplitter = AiOS_HELPER.mostRecentWindow.document.defaultView.getComputedStyle(AiOS_HELPER.mostRecentWindow.document.getElementById('sidebar-splitter'), '');
+    var cStyleContent = AiOS_HELPER.mostRecentWindow.document.defaultView.getComputedStyle(AiOS_HELPER.mostRecentWindow.document.getElementById('appcontent'), '');
 
     var widthSidebar = parseInt(cStyleSidebar.width) + parseInt(cStyleSidebar.paddingLeft) + parseInt(cStyleSidebar.paddingRight) + parseInt(cStyleSidebar.marginLeft) + parseInt(cStyleSidebar.marginRight);
 
@@ -207,7 +191,7 @@ function aios_getBrowserWidth() {
 
 
 /*
-	erweitert das Attribut "class" eines Elementes
+    erweitert das Attribut "class" eines Elementes
 */
 function aios_appendClass(elem, appClass) {
     if(typeof elem == "string") elem = document.getElementById(elem);
@@ -218,7 +202,7 @@ function aios_appendClass(elem, appClass) {
 
 
 /*
-	loescht einen Klassennamen im Attribut "class" eines Elementes
+    loescht einen Klassennamen im Attribut "class" eines Elementes
 */
 function aios_stripClass(elem, stripClass) {
     if(typeof elem == "string") elem = document.getElementById(elem);
@@ -240,7 +224,7 @@ function aios_stripClass(elem, stripClass) {
 
 
 function aios_gElem(aID) {
-    if(aios_WIN && aios_WIN.document.getElementById(aID)) return aios_WIN.document.getElementById(aID);
+    if(AiOS_HELPER.mostRecentWindow && AiOS_HELPER.mostRecentWindow.document.getElementById(aID)) return AiOS_HELPER.mostRecentWindow.document.getElementById(aID);
     return false;
 }
 
@@ -260,8 +244,8 @@ function aios_replaceKey(aElem, aAttr, aKey) {
 
 
 /*
-	gibt den boolschen Wert eines Wertes zurueck
-		=> getAttribute(val) liefert nur "true" oder "false" als String
+    gibt den boolschen Wert eines Wertes zurueck
+        => getAttribute(val) liefert nur "true" oder "false" als String
 */
 function aios_getBoolean(aElem, aVal) {
     var elem, bool;
@@ -283,7 +267,7 @@ function aios_getBoolean(aElem, aVal) {
 
 
 /*
-	Dialoge oeffnen
+    Dialoge oeffnen
 */
 function aios_openDialog(which, args) {
     var theUrl, theId, theFeatures;
@@ -294,7 +278,7 @@ function aios_openDialog(which, args) {
             theUrl = "chrome://aios/content/prefs/prefs.xul";
             theId = "aiosPrefsDialog";
             theFeatures = "chrome,titlebar,toolbar,centerscreen,";
-            theFeatures+= (aios_appOS == "Darwin") ? "dialog=no" : "modal";
+            theFeatures+= (AiOS_HELPER.os == "Darwin") ? "dialog=no" : "modal";
             break;
 
         case "about":
@@ -328,8 +312,8 @@ function aios_openDialog(which, args) {
 
 
 /*
-	prueft welche Elemente angezeigt werden sollen
-		=> Aufruf jeweils durch Initialisierung
+    prueft welche Elemente angezeigt werden sollen
+        => Aufruf jeweils durch Initialisierung
 */
 function aios_synchElements(aElems) {
     var elem, child, childElems, childMode;
@@ -351,8 +335,8 @@ function aios_synchElements(aElems) {
 
 
 /*
-	toggelt einen Menuepunkt und das/die zugehoerige/n Element/e
-		=> Aufruf durch die menuitems in der aios.xul
+    toggelt einen Menuepunkt und das/die zugehoerige/n Element/e
+        => Aufruf durch die menuitems in der aios.xul
 */
 function aios_toggleElement(aMenuitem) {
     var menuitem;
@@ -375,8 +359,8 @@ function aios_toggleElement(aMenuitem) {
 
 
 /*
-	toggelt Kindelemente eines Menuepunkts
-		=> Aufruf durch aios_toggleElement()
+    toggelt Kindelemente eines Menuepunkts
+        => Aufruf durch aios_toggleElement()
 */
 function aios_toggleChilds(childElems, childMode) {
     var child_str, child;
diff --git a/content/_lib.js b/content/_lib.js
old mode 100755
new mode 100644
index e6dafa2..1d3f3e1
--- a/content/_lib.js
+++ b/content/_lib.js
@@ -1,7 +1,7 @@
 
 /*
-	modifiziert das Firefox-Sidebar-Menue
-		=> Aufruf durch aios_initSidebar() und aios_getSidebarMenu() (Menuebutton-Events 'onpopupshowing')
+    modifiziert das Firefox-Sidebar-Menue
+        => Aufruf durch aios_initSidebar() und aios_getSidebarMenu() (Menuebutton-Events 'onpopupshowing')
 */
 function aios_modSidebarMenu() {
     aios_getObjects();
@@ -18,7 +18,7 @@ function aios_modSidebarMenu() {
 
         // Icons ein- oder ausblenden
         try {
-            var enable_icons = aios_gPrefBranch.getBoolPref('menus.sidebar.icons');
+            var enable_icons = AiOS_HELPER.prefBranchAiOS.getBoolPref('menus.sidebar.icons');
             var theClass = (enable_icons) ? '' : 'aios-noIcons';
 
             if(theClass != '') aios_appendClass(item, theClass);
@@ -60,7 +60,7 @@ function aios_modSidebarMenu() {
         if(command && commandParent) {
 
             try {
-                var enable_deac = aios_gPrefBranch.getBoolPref('menus.sidebar.entrydeac');
+                var enable_deac = AiOS_HELPER.prefBranchAiOS.getBoolPref('menus.sidebar.entrydeac');
 
                 if(actSidebar && command.indexOf(actSidebar) != -1 && enable_deac) item.setAttribute('disabled', true);
                 else item.setAttribute('disabled', false);
@@ -88,8 +88,8 @@ function aios_modSidebarMenu() {
 
     // Eintraege/Icons ein- oder ausblenden
     try {
-        var enable_showhide = aios_gPrefBranch.getBoolPref('menus.sidebar.showhide');
-        var enable_entries = aios_gPrefBranch.getBoolPref('menus.sidebar.entries');
+        var enable_showhide = AiOS_HELPER.prefBranchAiOS.getBoolPref('menus.sidebar.showhide');
+        var enable_entries = AiOS_HELPER.prefBranchAiOS.getBoolPref('menus.sidebar.entries');
 
         var returnVals = aios_showHideEntries(entries, 'menus.sidebar.', 'aios-sidebar-mitem-');
 
@@ -122,16 +122,16 @@ function aios_modSidebarMenu() {
 
 
 /*
-	Eintraege/Icons ein- oder ausblenden
-		=> Aufruf durch aios_modSidebarMenu()
+    Eintraege/Icons ein- oder ausblenden
+        => Aufruf durch aios_modSidebarMenu()
 */
 function aios_showHideEntries(entries, prefPre_tmp, IDPre) {
     var prefPre = prefPre_tmp;
     var returnVals = new Array();
 
     try {
-        var enable_entries = aios_gPrefBranch.getBoolPref(prefPre + "entries");
-        var enable_icons = aios_gPrefBranch.getBoolPref(prefPre + "icons");
+        var enable_entries = AiOS_HELPER.prefBranchAiOS.getBoolPref(prefPre + "entries");
+        var enable_icons = AiOS_HELPER.prefBranchAiOS.getBoolPref(prefPre + "icons");
 
         var theClass = (enable_icons) ? '' : 'aios-noIcons';
 
@@ -140,7 +140,7 @@ function aios_showHideEntries(entries, prefPre_tmp, IDPre) {
             for(var j = 0; j < entries[i].length; j++) {
                 var pref = false;
                 // Pref fuer jeden Eintrag einlesen
-                if(enable_entries) pref = aios_gPrefBranch.getBoolPref(prefPre + entries[i][j]);
+                if(enable_entries) pref = AiOS_HELPER.prefBranchAiOS.getBoolPref(prefPre + entries[i][j]);
 
                 // Eintraege ein- oder ausblenden
                 var theID = IDPre + entries[i][j];
@@ -177,17 +177,17 @@ function aios_showHideEntries(entries, prefPre_tmp, IDPre) {
 
 
 /*
-	Oeffnet die Tab-URL in der Sidebar oder die Sidebar-URL in einem neuen Tab
-		=> Aufruf durch <command id="aiosCmd_panelTab1">
-										<command id="aiosCmd_panelTab2">
-										<toolbarbutton id="paneltab-button">
-			 in aios.xul
+    Oeffnet die Tab-URL in der Sidebar oder die Sidebar-URL in einem neuen Tab
+        => Aufruf durch <command id="aiosCmd_panelTab1">
+                                        <command id="aiosCmd_panelTab2">
+                                        <toolbarbutton id="paneltab-button">
+             in aios.xul
 */
 var aiosNewTab, aiosSidebarTitle;
 function aios_panelTab(event) {
     try {
-        var ptReverse = aios_gPrefBranch.getBoolPref("paneltab.reverse");
-        var enable_rightclick = aios_gPrefBranch.getBoolPref("rightclick");
+        var ptReverse = AiOS_HELPER.prefBranchAiOS.getBoolPref("paneltab.reverse");
+        var enable_rightclick = AiOS_HELPER.prefBranchAiOS.getBoolPref("rightclick");
     }
     catch(e) { }
 
@@ -217,8 +217,8 @@ function aios_panelTab(event) {
 
 
     /*
-		in SIDEBAR oeffnen
-	*/
+        in SIDEBAR oeffnen
+    */
     if(mode == "sidebar") {
         var tabHref = top.window.content.location.href;
 
@@ -255,8 +255,8 @@ function aios_panelTab(event) {
         }
     }
     /*
-		in TAB oder FENSTER oeffnen
-	*/
+        in TAB oder FENSTER oeffnen
+    */
     else {
         var newSrc;
 
@@ -274,7 +274,7 @@ function aios_panelTab(event) {
         // Bookmark-Manager statt Panel?
         if(sidebarHref == "chrome://browser/content/bookmarks/bookmarksPanel.xul") {
             try {
-                var enable_bmm = aios_gPrefBranch.getBoolPref("paneltab.bm");
+                var enable_bmm = AiOS_HELPER.prefBranchAiOS.getBoolPref("paneltab.bm");
             }
             catch(e) { }
             newSrc = (enable_bmm) ? "chrome://browser/content/places/places.xul" : sidebarHref;
@@ -300,9 +300,9 @@ function aios_panelTab(event) {
         else {
             // wird zur Abfrage in addons/downlaods_....xul und downloads.js benoetigt
             // sonst wuerden extra geoeffnete Fenster (Downloads, Add-ons) sofort wieder geschlossen
-            aios_WIN.aiosIsWindow = true;
+            AiOS_HELPER.mostRecentWindow.aiosIsWindow = true;
             window.setTimeout(function() {
-                aios_WIN.aiosIsWindow = false;
+                AiOS_HELPER.mostRecentWindow.aiosIsWindow = false;
             }, 500);
 
             var winID = "aiosPanelTabWindow_" + top.document.getElementById('sidebar-box').getAttribute('sidebarcommand');
@@ -324,7 +324,7 @@ function aios_isSidebar(aHref) {
     // => richtigen Sidebar-Toggle-Befehl anwenden
     //var isSidebar = null;
     var theSidebar = null;
-    var allSidebars = aios_WIN.document.getElementsByAttribute('group', 'sidebar');
+    var allSidebars = AiOS_HELPER.mostRecentWindow.document.getElementsByAttribute('group', 'sidebar');
 
     for(var i = 0; i < allSidebars.length; i++) {
 
@@ -346,12 +346,12 @@ function aios_isSidebar(aHref) {
 
 
 /*
-	Oeffnet div. Fenster u. Manager per Original-Anweisung
-		Aufruf durch Toolbarbuttons und Menueeintraege
+    Oeffnet div. Fenster u. Manager per Original-Anweisung
+        Aufruf durch Toolbarbuttons und Menueeintraege
 */
 function aios_contextEvent(event, which) {
     try {
-        var enable_rightclick = aios_gPrefBranch.getBoolPref("rightclick");
+        var enable_rightclick = AiOS_HELPER.prefBranchAiOS.getBoolPref("rightclick");
     }
     catch(e) { }
 
@@ -390,11 +390,11 @@ function aios_contextEvent(event, which) {
             toggleSidebar(cmdObj.getAttribute('aios_sbCmd'));
             break;
 
-        case "window":		// wird zur Abfrage in addons/downloads_....xul und downloads.js benoetigt
+        case "window":      // wird zur Abfrage in addons/downloads_....xul und downloads.js benoetigt
             // sonst wuerden extra geoeffnete Fenster (Downloads, Add-ons) sofort wieder geschlossen
-            aios_WIN.aiosIsWindow = true;
+            AiOS_HELPER.mostRecentWindow.aiosIsWindow = true;
             window.setTimeout(function() {
-                aios_WIN.aiosIsWindow = false;
+                AiOS_HELPER.mostRecentWindow.aiosIsWindow = false;
             }, 500);
 
             var winID = "aiosContextEventWindow_" + cmdObj.getAttribute('aios_sbCmd');
@@ -415,10 +415,10 @@ function aios_contextEvent(event, which) {
 
 
 /*
-	legt commands fuer Fenster fest, die lt. Einstellungen in der Sidebar geoeffnet werden sollen
-		=> dynamisch per JS, damit keinerlei Veraenderungen vorgenommen werden, wenn es nicht in der Sidebar geoeffnet werden soll
-				=> bessere Kompatibilitaet mit anderen Erweiterungen
-		=> Aufruf durch aios_initSidebar()
+    legt commands fuer Fenster fest, die lt. Einstellungen in der Sidebar geoeffnet werden sollen
+        => dynamisch per JS, damit keinerlei Veraenderungen vorgenommen werden, wenn es nicht in der Sidebar geoeffnet werden soll
+                => bessere Kompatibilitaet mit anderen Erweiterungen
+        => Aufruf durch aios_initSidebar()
 */
 function aios_setTargets() {
     var objects, i;
@@ -437,13 +437,13 @@ function aios_setTargets() {
 
 
     var targets = new Array();
-    targets['bm'] = new Array('View:Bookmarks', 	'viewBookmarksSidebar',     'bookmarks');
-    targets['hi'] = new Array('View:History', 		'viewHistorySidebar',       'history');
-    targets['dm'] = new Array('Tools:Downloads', 	'viewDownloadsSidebar',     'downloads');
-    targets['ad'] = new Array('Tools:Addons', 		'viewAddonsSidebar',        'addons');
-    targets['mp'] = new Array('Tools:MultiPanel', 	'viewWebPanelsSidebar',     'multipanel');
-    targets['pi'] = new Array('View:PageInfo', 		'viewPageInfoSidebar',      'pageinfo');
-    targets['co'] = new Array('Tools:Console', 		'viewConsoleSidebar',       'console');
+    targets['bm'] = new Array('View:Bookmarks',     'viewBookmarksSidebar',     'bookmarks');
+    targets['hi'] = new Array('View:History',       'viewHistorySidebar',       'history');
+    targets['dm'] = new Array('Tools:Downloads',    'viewDownloadsSidebar',     'downloads');
+    targets['ad'] = new Array('Tools:Addons',       'viewAddonsSidebar',        'addons');
+    targets['mp'] = new Array('Tools:MultiPanel',   'viewWebPanelsSidebar',     'multipanel');
+    targets['pi'] = new Array('View:PageInfo',      'viewPageInfoSidebar',      'pageinfo');
+    targets['co'] = new Array('Tools:Console',      'viewConsoleSidebar',       'console');
 
     if(document.getElementById('viewConsole2Sidebar'))
         targets['co'] = new Array('Tools:Console', 'viewConsole2Sidebar', 'console');
@@ -452,8 +452,8 @@ function aios_setTargets() {
     var prefInfotip = false;
     var ptReverse = false;
     try {
-        prefInfotip = aios_gPrefBranch.getBoolPref("infotips");
-        ptReverse = aios_gPrefBranch.getBoolPref("paneltab.reverse");
+        prefInfotip = AiOS_HELPER.prefBranchAiOS.getBoolPref("infotips");
+        ptReverse = AiOS_HELPER.prefBranchAiOS.getBoolPref("paneltab.reverse");
 
         if(prefInfotip) {
             if(elem_switch) elem_switch.removeAttribute('tooltiptext');
@@ -477,17 +477,17 @@ function aios_setTargets() {
         // in Sidebar oeffnen?
         var prefSidebar;
         try {
-            if(obj != "ad") prefSidebar = aios_gPrefBranch.getBoolPref(obj + ".sidebar");
-            else prefSidebar = aios_gPrefBranch.getBoolPref("em.sidebar");
+            if(obj != "ad") prefSidebar = AiOS_HELPER.prefBranchAiOS.getBoolPref(obj + ".sidebar");
+            else prefSidebar = AiOS_HELPER.prefBranchAiOS.getBoolPref("em.sidebar");
 
-            var enable_rightclick = aios_gPrefBranch.getBoolPref("rightclick");
+            var enable_rightclick = AiOS_HELPER.prefBranchAiOS.getBoolPref("rightclick");
         }
         catch(e) { }
 
-        var ffObj = document.getElementById(targets[obj][0]);			// Original-Objekt
-        var sbObj = document.getElementById(targets[obj][1]);			// Sidebar-Objekt
-        var tpObj = document.getElementById(targets[obj][2] + "-tooltip");	// Tooltip
-        var btObj = document.getElementById(targets[obj][2] + "-button");	// Button
+        var ffObj = document.getElementById(targets[obj][0]);           // Original-Objekt
+        var sbObj = document.getElementById(targets[obj][1]);           // Sidebar-Objekt
+        var tpObj = document.getElementById(targets[obj][2] + "-tooltip");  // Tooltip
+        var btObj = document.getElementById(targets[obj][2] + "-button");   // Button
 
         if(ffObj && sbObj) {
 
@@ -512,8 +512,8 @@ function aios_setTargets() {
 
 
             // Befehle merken
-            // 	=> fuer Context-Funktionen - aios_contextEvent() - abfragbar
-            // 	=> zuweisbar, wenn nicht mehr in Sidebar geoeffnet werden soll
+            //  => fuer Context-Funktionen - aios_contextEvent() - abfragbar
+            //  => zuweisbar, wenn nicht mehr in Sidebar geoeffnet werden soll
             if(!aios_getBoolean(ffObj, 'modByAIOS')) {
                 // fuer Klicks auf Toolbarbuttons und Menueeintraege
                 ffObj.setAttribute('aios_sbUri', sbObj.getAttribute('sidebarurl'));
@@ -568,7 +568,7 @@ function aios_setTargets() {
 
 
     // Oeffnen des Download-Fensters verhindern, wenn die Sidebar genutzt werden soll
-	if(aios_gPrefBranch.getBoolPref('dm.sidebar')) aios_gPref.setBoolPref("browser.download.manager.showWhenStarting", false);
+    if(AiOS_HELPER.prefBranchAiOS.getBoolPref('dm.sidebar')) AiOS_HELPER.prefService.setBoolPref("browser.download.manager.showWhenStarting", false);
 
 
     // Download-Observer hinzufuegen, falls Downloads in der Sidebar geoeffnet werden sollen
@@ -594,31 +594,31 @@ function aios_setTargets() {
 }
 
 /*
-	Oeffnet die Sidebar,
-		1. wenn ein Download gestartet wird ...
-		2. der Manager geoeffnet werden soll und ...
-		3. das Ziel die Sidebar sein soll
+    Oeffnet die Sidebar,
+        1. wenn ein Download gestartet wird ...
+        2. der Manager geoeffnet werden soll und ...
+        3. das Ziel die Sidebar sein soll
 */
 var aios_DownloadObserver = {
     observe: function (aSubject, aTopic, aState) {
 
-        var autoOpen = aios_gPrefBranch.getBoolPref('dm.autoopen');
-        var autoClose = aios_gPrefBranch.getBoolPref('dm.autoclose');
+        var autoOpen = AiOS_HELPER.prefBranchAiOS.getBoolPref('dm.autoopen');
+        var autoClose = AiOS_HELPER.prefBranchAiOS.getBoolPref('dm.autoclose');
         var mainWindow = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIWebNavigation).QueryInterface(Components.interfaces.nsIDocShellTreeItem).rootTreeItem.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIDOMWindow);
 
         switch (aTopic) {
             case "dl-start":
                 var comElem = document.getElementById('Tools:Downloads');
                 if(autoOpen && comElem.getAttribute('oncommand').indexOf('viewDownloadsSidebar') >= 0) {
-                    // aios_WW.activeWindow verhindert, dass die Sidebar in jedem Fenster geoeffnet wird
-                    if(typeof aios_WW.activeWindow.toggleSidebar == "function") aios_WW.activeWindow.toggleSidebar("viewDownloadsSidebar", true);
+                    // AiOS_HELPER.windowWatcher.activeWindow verhindert, dass die Sidebar in jedem Fenster geoeffnet wird
+                    if(typeof AiOS_HELPER.windowWatcher.activeWindow.toggleSidebar == "function") AiOS_HELPER.windowWatcher.activeWindow.toggleSidebar("viewDownloadsSidebar", true);
                 }
                 break;
 
             case "dl-done":
                 var sideSrc = document.getElementById('sidebar').getAttribute('src');
                 if(autoOpen && autoClose && sideSrc.indexOf('downloads.xul') >= 0) {
-                    if(typeof aios_WW.activeWindow.toggleSidebar == "function") aios_WW.activeWindow.toggleSidebar();
+                    if(typeof AiOS_HELPER.windowWatcher.activeWindow.toggleSidebar == "function") AiOS_HELPER.windowWatcher.activeWindow.toggleSidebar();
                 }
                 break;
         }
@@ -640,8 +640,8 @@ function aios_preventDblCmd(ev) {
 
 
 /*
-	prueft, ob das Browserfenster maximiert ist oder sich im Vollbildmodus befindet
-		=> Aufruf durch aios_checkThinSwitch()
+    prueft, ob das Browserfenster maximiert ist oder sich im Vollbildmodus befindet
+        => Aufruf durch aios_checkThinSwitch()
 */
 function aios_isWinMax() {
     var windowMax = document.getElementById('main-window').getAttribute('sizemode') == "maximized";
@@ -655,13 +655,13 @@ function aios_isWinMax() {
 
 
 /*
-	prueft, ob die Sidebar gerade sichtbar/unsichtbar ist => abhaengig von der Sidebar-Methode
+    prueft, ob die Sidebar gerade sichtbar/unsichtbar ist => abhaengig von der Sidebar-Methode
 */
 function aios_isSidebarHidden() {
     aios_getObjects();
 
     try {
-        var aios_collapseSidebar = aios_gPrefBranch.getBoolPref('collapse');
+        var aios_collapseSidebar = AiOS_HELPER.prefBranchAiOS.getBoolPref('collapse');
     }
     catch(e) { }
 
@@ -672,13 +672,13 @@ function aios_isSidebarHidden() {
 
 
 /*
-	Autohide-Feature initialisieren
-		=> Aufruf durch aios_initSidebar() und aios_savePrefs()
+    Autohide-Feature initialisieren
+        => Aufruf durch aios_initSidebar() und aios_savePrefs()
 */
 var aiosFocus = true;
 function aios_initAutohide() {
     // Zustand des Autohide-Buttons einstellen
-    document.getElementById('aios-enableAutohide').setAttribute('checked', aios_gPrefBranch.getBoolPref("gen.switch.autoshow"));
+    document.getElementById('aios-enableAutohide').setAttribute('checked', AiOS_HELPER.prefBranchAiOS.getBoolPref("gen.switch.autoshow"));
 
     // Autohide-Feature-Funktion hinzufuegen
     fx_sidebarBox.addEventListener("mouseover", function() {
@@ -696,12 +696,12 @@ function aios_initAutohide() {
 
 
 /*
-	Autohide ein- bzw. ausschalten per Toolbarbutton
-		=> Aufruf durch broadcaster 'aios-enableAutohide'
+    Autohide ein- bzw. ausschalten per Toolbarbutton
+        => Aufruf durch broadcaster 'aios-enableAutohide'
 */
 function aios_toggleAutohide(which) {
     try {
-        aios_gPrefBranch.setBoolPref("gen.switch.autoshow", aios_getBoolean(which, 'checked'));
+        AiOS_HELPER.prefBranchAiOS.setBoolPref("gen.switch.autoshow", aios_getBoolean(which, 'checked'));
     }
     catch(e) { }
 }
\ No newline at end of file
diff --git a/content/about.js b/content/about.js
old mode 100755
new mode 100644
index 2ed631c..2190b62
--- a/content/about.js
+++ b/content/about.js
@@ -19,7 +19,7 @@ var AiOS_About = {};
             }
         );
 
-        aios_appInfo( document.getElementById("aiosAbout") );
+        AiOS_HELPER.rememberAppInfo( document.getElementById("aiosAbout") );
 
     };
 
diff --git a/content/about.xul b/content/about.xul
old mode 100755
new mode 100644
index e57dc87..9a45e83
--- a/content/about.xul
+++ b/content/about.xul
@@ -19,7 +19,7 @@
     ondialogextra1 = "window.close();"
     ondialogextra2 = "aios_openDialog('prefs');" >
 
-    <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
+    <script type="application/x-javascript" src="chrome://aios/content/_helper.js" />
 
     <prefpane id="aiosAbout" src="chrome://aios/content/about_content.xul" />
 
diff --git a/content/about_content.xul b/content/about_content.xul
old mode 100755
new mode 100644
index 586cd04..b0398a1
--- a/content/about_content.xul
+++ b/content/about_content.xul
@@ -2,8 +2,8 @@
 
 <!-- locale -->
 <!DOCTYPE overlay [
-	<!ENTITY % aiosDTD SYSTEM "chrome://aios/content/aios.dtd"> %aiosDTD;
-	<!ENTITY % aboutDTD SYSTEM "chrome://aios/locale/about.dtd"> %aboutDTD;
+    <!ENTITY % aiosDTD SYSTEM "chrome://aios/content/aios.dtd"> %aiosDTD;
+    <!ENTITY % aboutDTD SYSTEM "chrome://aios/locale/about.dtd"> %aboutDTD;
 ]>
 
 <overlay id="aiosAboutOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/content/addons.js b/content/addons.js
old mode 100755
new mode 100644
index 35d52a5..d137134
--- a/content/addons.js
+++ b/content/addons.js
@@ -45,7 +45,7 @@ var AiOS_Addons = {};
         self.setTitle(true);
 
         // fuer CSS-Zwecke speichern
-        aios_appInfo(managerWindow);
+        AiOS_HELPER.rememberAppInfo( managerWindow );
 
         // CSS aktivieren
         managerWindow.setAttribute('aios-inSidebar', 'true');
@@ -175,7 +175,7 @@ var AiOS_Addons = {};
             newTitle,
 
             numberOfItems,
-            count = aios_gPrefBranch.getBoolPref("em.count"),
+            count = AiOS_HELPER.prefBranchAiOS.getBoolPref("em.count"),
             selectedCategory = document.getElementById('categories').getAttribute('last-selected'),
             isInSidebar = (top.document.getElementById('sidebar-box')) ? true : false;
 
@@ -184,8 +184,8 @@ var AiOS_Addons = {};
         }
 
         // bisherigen Titel feststellen
-        if(aios_WIN.document.getElementById("viewAddonsSidebar")) {
-            origTitle = aios_WIN.document.getElementById("viewAddonsSidebar").getAttribute('label');
+        if(AiOS_HELPER.mostRecentWindow.document.getElementById("viewAddonsSidebar")) {
+            origTitle = AiOS_HELPER.mostRecentWindow.document.getElementById("viewAddonsSidebar").getAttribute('label');
         }
 
         // originalen Titel um das aktivierte Panel erweitern
diff --git a/content/addons.xul b/content/addons.xul
old mode 100755
new mode 100644
index 4bcf11a..c9200c8
--- a/content/addons.xul
+++ b/content/addons.xul
@@ -8,7 +8,7 @@
 
 <overlay id="aios_AddonsOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
+    <script type="application/x-javascript" src="chrome://aios/content/_helper.js" />
     <script type="application/x-javascript" src="chrome://aios/content/addons.js" />
 
     <richlistbox id="categories">
diff --git a/content/addons_xpinstall.xul b/content/addons_xpinstall.xul
old mode 100755
new mode 100644
index 0332a25..9544d93
--- a/content/addons_xpinstall.xul
+++ b/content/addons_xpinstall.xul
@@ -2,34 +2,34 @@
 
 <overlay id="aios_installOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
+    <script type="application/x-javascript" src="chrome://aios/content/_helper.js" />
 
     <script><![CDATA[
 
-		window.addEventListener("DOMContentLoaded", aios_XPInstallConfirm);
+        window.addEventListener("DOMContentLoaded", aios_XPInstallConfirm);
 
-		function aios_XPInstallConfirm() {
+        function aios_XPInstallConfirm() {
 
-	    	var enable_sidebar = aios_gPrefBranch.getBoolPref("em.sidebar");
+            var enable_sidebar = AiOS_HELPER.prefBranchAiOS.getBoolPref("em.sidebar");
 
-	    	/*
-				Sidebar oeffnen, wenn der Manager nur in der Sidebar geoeffnet werden soll
-					=> enable_sidebar => Manager soll in der Sidebar geoeffnet werden
-					=> !top.document.getElementById('sidebar') => ich bin keine Sidebar
-					=> top.toString() != "[object Window]" => ich bin kein Tab
-					=> !aios_WIN.aiosIsWindow => nicht explizit im Fenster (z.B. durch Shift+Linksklick auf Toolbarbutton)
-			*/
-			if(enable_sidebar && !top.document.getElementById('sidebar') && top.toString() != "[object Window]" && !aios_WIN.aiosIsWindow) {
-				aios_WIN.toggleSidebar("viewAddonsSidebar", true);
-	    	}
+            /*
+                Sidebar oeffnen, wenn der Manager nur in der Sidebar geoeffnet werden soll
+                    => enable_sidebar => Manager soll in der Sidebar geoeffnet werden
+                    => !top.document.getElementById('sidebar') => ich bin keine Sidebar
+                    => top.toString() != "[object Window]" => ich bin kein Tab
+                    => !AiOS_HELPER.mostRecentWindow.aiosIsWindow => nicht explizit im Fenster (z.B. durch Shift+Linksklick auf Toolbarbutton)
+            */
+            if(enable_sidebar && !top.document.getElementById('sidebar') && top.toString() != "[object Window]" && !AiOS_HELPER.mostRecentWindow.aiosIsWindow) {
+                AiOS_HELPER.mostRecentWindow.toggleSidebar("viewAddonsSidebar", true);
+            }
 
-	    	//document.documentElement.getButton("cancel").focus();
-	    	window.setTimeout(function() {
-	    	    document.documentElement.getButton("cancel").focus();
-	    	}, 500);
-	    }
+            //document.documentElement.getButton("cancel").focus();
+            window.setTimeout(function() {
+                document.documentElement.getButton("cancel").focus();
+            }, 500);
+        }
 
-	]]>
+    ]]>
     </script>
 
 </overlay>
\ No newline at end of file
diff --git a/content/aios.dtd b/content/aios.dtd
old mode 100755
new mode 100644
index b09e664..a5f3141
--- a/content/aios.dtd
+++ b/content/aios.dtd
@@ -7,9 +7,9 @@
 <!ENTITY about6.link            "http://firefox.exxile.net/aios/changelog.php">
 <!ENTITY about7.link            "http://firefox.exxile.net/aios/todo.php">
 
-<!ENTITY contrib1.name          "alta88">
-<!ENTITY contrib1.ext           "TotalToolbar">
-<!ENTITY contrib1.link          "http://totaltoolbar.mozdev.org/">
+<!ENTITY contrib1.name          "Gomita">
+<!ENTITY contrib1.ext           "Vertical Toolbar">
+<!ENTITY contrib1.link          "http://www.xuldev.org/verticaltoolbar/‎">
 
 <!ENTITY contrib2.name          "CPU">
 <!ENTITY contrib2.ext           "Tab Mix Plus">
@@ -30,37 +30,37 @@
 <!ENTITY trans.ar-SA.name       "Natty Dreed">
 <!ENTITY trans.be-BY.name       "Drive DRKA">
 <!ENTITY trans.cs-CZ.name       "Jiří Doubravský">
-<!ENTITY trans.da.name       	"Finn Sørensen">
-<!ENTITY trans.de.name       	"Ingo Wennemaring">
-<!ENTITY trans.el.name       	"Sonickydon">
+<!ENTITY trans.da.name          "Finn Sørensen">
+<!ENTITY trans.de.name          "Ingo Wennemaring">
+<!ENTITY trans.el.name          "Sonickydon">
 <!ENTITY trans.en-GB.name       "Ian Moody">
 <!ENTITY trans.en-US.name       "Ingo Wennemaring, Ian Moody">
 <!ENTITY trans.es-AR.name       "Alberto Jorge Cushnir">
 <!ENTITY trans.es-ES.name       "Proyecto NAVE">
 <!ENTITY trans.et-EE.name       "stabisol">
 <!ENTITY trans.fi-FI.name       "Mikko Tervahauta">
-<!ENTITY trans.fr.name       	"Jean-Bernard Marcon">
-<!ENTITY trans.he.name       	"SiiiE">
+<!ENTITY trans.fr.name          "Jean-Bernard Marcon">
+<!ENTITY trans.he.name          "SiiiE">
 <!ENTITY trans.hr-HR.name       "Krcko">
 <!ENTITY trans.hu-HU.name       "kami, Henriett Peller, Sil">
 <!ENTITY trans.hy-AM.name       "Babayan Eduard">
-<!ENTITY trans.it.name       	"Luana di Muzio, Roccobot">
+<!ENTITY trans.it.name          "Luana di Muzio, Roccobot">
 <!ENTITY trans.ja-JP.name       "javascript, Premier">
 <!ENTITY trans.ko-KR.name       "Flactal">
 <!ENTITY trans.lt-LT.name       "Jonas Slivka">
 <!ENTITY trans.nb-NO.name       "Anders Aase Martinsen">
-<!ENTITY trans.nl.name       	"Gert-Paul van der Beek">
-<!ENTITY trans.pl.name       	"Leszek Życzkowski, Tomasz Lipski">
+<!ENTITY trans.nl.name          "Gert-Paul van der Beek">
+<!ENTITY trans.pl.name          "Leszek Życzkowski, Tomasz Lipski">
 <!ENTITY trans.pt-BR.name       "Rodrigo Bergmann Laurindo, E.R.D'Avila">
 <!ENTITY trans.pt-PT.name       "Carlos Simão, Jorge Laranjo, zefranc">
-<!ENTITY trans.ro.name       	"Cătălin Zamfirescu">
+<!ENTITY trans.ro.name          "Cătălin Zamfirescu">
 <!ENTITY trans.ru-RU.name       "Quicksilver tears">
 <!ENTITY trans.sk-SK.name       "Martin Peterčák">
 <!ENTITY trans.sq-AL.name       "Puntori">
-<!ENTITY trans.sr.name       	"ДакСРБИЈА, dragan021, Rasa">
+<!ENTITY trans.sr.name          "ДакСРБИЈА, dragan021, Rasa">
 <!ENTITY trans.sv-SE.name       "Cecilia B, Carlos Murakami, Richard Norén">
 <!ENTITY trans.tr-TR.name       "Erkan Kaplan, Mehmet Gokhan">
 <!ENTITY trans.uk-UA.name       "Yaroslav Krytsun">
-<!ENTITY trans.vi.name       	"Trần Anh Minh, NGUYỄN Mạnh Hùng">
+<!ENTITY trans.vi.name          "Trần Anh Minh, NGUYỄN Mạnh Hùng">
 <!ENTITY trans.zh-CN.name       "blackdire, Long G.W., George C. Tsoi">
 <!ENTITY trans.zh-TW.name       "Unicorn2, Willy Young">
\ No newline at end of file
diff --git a/content/aios.js b/content/aios.js
old mode 100755
new mode 100644
index 0162c73..4db01a3
--- a/content/aios.js
+++ b/content/aios.js
@@ -1,819 +1,95 @@
+var AiOS = {
 
-// dem Sidebarheader eine ID zuweisen => dann per CSS ansprechbar (bei load oder DOMContentLoaded zu spaet)
-//top.document.getElementById("sidebar-throbber").parentNode.setAttribute('id', 'sidebar-header');
+    mainWindow: document.getElementById('main-window'),
 
-window.addEventListener("load", aios_initSidebar, false);
-window.addEventListener("resize", aios_checkThinSwitch, false);
-window.addEventListener("mozfullscreenchange", aios_BrowserFullScreen, false);
 
-// sonst werden neu definierte Shortcuts bei Browser-Neustart zurueckgesetzt
-extLoad.add(30, function() {
-    aiosKeyconfig.loadkeys(aiosKeyconfig.prefService.getCharPref("extensions.aios.keyconf.profile"));
-});
+    initOnDOMLoaded: function() {
 
-var initialised = false;
+        AiOS_HELPER.rememberAppInfo( AiOS.mainWindow );
 
-var fx_mainWindow, fx_browser, fx_sidebar, fx_sidebarBox, fx_sidebarHeader, fx_sidebarSplitter, fx_sidebarMenu, fx_maximizedWindow;
-var aios_toggleBox, aios_toggleBar, aios_toggleSwitchItem, aios_toggleToolbarItem, aios_toolbar;
-var elem_switch, elem_tbb, elem_key, elem_close, elem_close2;
+    },
 
-var aios_enterFullScreen = 0;
-var aios_leaveFullScreen = 0;
 
-// Sidebar nur zusammenklappen statt schliessen
-var aios_collapseSidebar = aios_gPrefBranch.getBoolPref('collapse');
+    // initOnLoad: function() {
 
+    // },
 
-function aios_getObjects() {
-    try {
-        fx_mainWindow = document.getElementById('main-window');
-        fx_browser = document.getElementById('browser');
-        fx_sidebar = document.getElementById('sidebar');
-        fx_sidebarBox = document.getElementById('sidebar-box');
-        fx_sidebarHeader = document.getElementById('sidebar-header');
-        fx_sidebarSplitter = document.getElementById('sidebar-splitter');
-        fx_sidebarMenu = document.getElementById('viewSidebarMenu');
 
-        aios_toggleBox = document.getElementById('aios-toggle-toolbox');
-        aios_toggleBar = document.getElementById('aios-toggle-toolbar');
+    beforeCustomization: function() {
 
-        // broadcaster in aios.xul mit gespeichertem Wunsch-Toolbar-Zustand
-        // 	=> gespeichert durch onViewToolbarCommand() in tbx.js (AiOS < 0.7.7)
-        // 	=> gespeichert/gesetzt durch aios_toggleToolbar()
-        aios_toggleSwitchItem = document.getElementById('aios-viewTogglebar');
-        aios_toggleToolbarItem = document.getElementById('aios-viewToolbar');
+        var toolbars = new Array(AiOS_HELPER.aiosToolbar, AiOS_HELPER.sbhToolbar);
 
-        aios_toolbar = document.getElementById('aios-toolbar');
+        PlacesToolbarHelper.customizeStart();
 
-        elem_switch = document.getElementById('aios-toggle-button');
-        elem_tbb = document.getElementById('sidebars-togglebutton');
-        elem_key = document.getElementById('aiosKey_sidebar');
-        elem_close = document.getElementById('sidebarclose-button');
-        elem_close2 = document.getElementById('sbh-sidebarclose-button');
-    }
-    catch(e) { }
-}
-
-
-/*
-	Initialisierung
-		=> Aufruf durch das onload-Event
-*/
-function aios_initSidebar() {
-    aios_getObjects();
-
-    // Toolbarbuttons in der Sidebarheader Toolbar ohne Button-Gedoens anzeigen
-    /*for(var i = 0; i < document.getElementById('aios-sbhtoolbar').childNodes.length; i++) {
-        aios_stripClass(document.getElementById('aios-sbhtoolbar').childNodes[i], 'toolbarbutton-1');
-    }*/
-
-    // MacOS X => Tastaturkuerzel ersetzen (Strg. wird durch Command ersetzt und Umschalt durch das Symbol dafuer)
-    if(aios_appOS == "Darwin") {
-        aios_replaceKey('switch-tooltip-box', 'r2c2', 'command');
-        aios_replaceKey('template-sidebar-tooltip-box', 'r2c2', 'command');
-        aios_replaceKey('template-window-tooltip-box', 'r2c2', 'command');
-        aios_replaceKey('paneltab-tooltip-box', 'r2c2', 'command');
-        aios_replaceKey('paneltab-tooltip-reverse-box', 'r2c2', 'command');
-        aios_replaceKey('sidebarheader-tooltip-box', 'r3c2', 'command');
-
-        aios_replaceKey('switch-tooltip-box', 'r3c2', 'shift');
-        aios_replaceKey('template-sidebar-tooltip-box', 'r3c2', 'shift');
-        aios_replaceKey('template-window-tooltip-box', 'r3c2', 'shift');
-        aios_replaceKey('paneltab-tooltip-box', 'r3c2', 'shift');
-        aios_replaceKey('paneltab-tooltip-reverse-box', 'r3c2', 'shift');
-        aios_replaceKey('sidebarheader-tooltip-box', 'r1c2', 'shift');
-    }
-
-    // fuer CSS-Zwecke speichern
-    aios_appInfo(fx_mainWindow);
-
-    // Sidebar li. oder re.
-    // Eigenschaftenzuweisung fuer CSS (LTR <=> RTL; Sidebar links <=> rechts)
-    aios_setSidebarOrient();
-
-    // beim ersten Start (bzw. nach loeschen der localstore.rdf) => ...
-    if(!aios_getBoolean(fx_sidebarBox, 'aiosInit')) {
-        // Icongroesse an die der Nav-Toolbar anpassen
-        fx_sidebarBox.setAttribute('aiosInit', true);
-        document.persist(fx_sidebarBox.id, 'aiosInit');
-
-        if(aios_toolbar) aios_toolbar.setAttribute('iconsize', document.getElementById('nav-bar').getAttribute('iconsize'));
-
-        // Sidebar-Breite nach Konfiguration festsetzen
-        aios_setConfSidebarWidth();
-    }
-
-
-    // Sidebarheader-Symbolleiste aus der Navigations-Symbolleiste in den Sidebarheader verschieben
-    // wenn die Symbolleiste gleich im Header waere, wuerden keine Icons angezeigt werden, wenn die Sidebar beim Start geschlossen ist
-    //document.getElementById('aios-sbhtoolbox').appendChild(document.getElementById('aios-sbhtoolbar'));
-
-
-    // legt commands (Ziele) fuer Manager und Fenster lt. Einstellungen fest
-    window.setTimeout(function() {
-        aios_setTargets();
-    }, 50);
-
-    // Autohide-Feature initialisieren
-    aios_initAutohide();
-
-
-    // Sidebar nur zusammenklappen statt schliessen
-    var lp;
-    if(aios_collapseSidebar) {
-
-        // in jedem Fall das Hidden-Attribut zuruecksetzen
-        document.getElementById('sidebar-box').setAttribute('hidden', false);
-
-        // wenn die Sidebar beim Start nicht geoeffnet sein soll
-        // neues bzw. weiteres Fenster
-        if(window.opener) {
-
-            fx_sidebarBox.setAttribute('collapsed', window.opener.document.getElementById('sidebar-box').getAttribute('collapsed'));
-
-            /* CollapseByStyle-Methode
-            if(window.opener.document.getElementById('sidebar-box').getAttribute('style') != "")
-                fx_sidebarBox.setAttribute('style', 'display:none;');
-            else
-                fx_sidebarBox.removeAttribute('style');*/
-
-            aios_toolbar.setAttribute('hidden', window.opener.document.getElementById('aios-toolbar').getAttribute('hidden'));
-        }
-        // Browserstart
-        else {
-            //alert(aios_getBoolean('main-window', 'aiosOpen'));
-            if(!aios_getBoolean('main-window', 'aiosOpen')) {
-                fx_sidebarBox.setAttribute('collapsed', true);
-                // CollapseByStyle-Methode fx_sidebarBox.setAttribute('style', 'display:none;');
-                fx_sidebarSplitter.setAttribute('hidden', true);
-            }
-        }
-
-        // sonst ist nach Deaktivieren/Aktivieren die Sidebar sichtbar aber leer
-        lp = document.getElementById('sidebar-box').getAttribute("aiosLastPanel");
-        if(aios_getBoolean(document.getElementById('main-window'), 'aiosOpen') && lp != "") {
-            toggleSidebar(lp, true);
-            document.getElementById('sidebar-splitter').hidden = false;
-            document.getElementById('sidebar-splitter').setAttribute('state', 'open');
-        }
-    }
-
-    // wenn es keine zuletzt geoeffnete Sidebar gibt oder diese nicht mehr existiert, dann nimm die Bookmarks
-    lp = fx_sidebarBox.getAttribute("aiosLastPanel");
-    if(!lp || (lp && !document.getElementById(lp))) {
-        fx_sidebarBox.setAttribute("aiosLastPanel", "viewBookmarksSidebar");
-        document.persist(fx_sidebarBox.id, "aiosLastPanel");
-    }
-
-    // Sidebar, Toolbar u. Switch beim Start gem. Einstellungen
-    try {
-        var sidebarInit = aios_gPrefBranch.getCharPref('gen.init');
-        var toolbarInit = aios_gPrefBranch.getIntPref('gen.toolbar.init');
-        var switchInit = aios_gPrefBranch.getIntPref('gen.switch.init');
-
-        // Sidebar beim Start oeffnen
-        if(sidebarInit == "open") toggleSidebar(fx_sidebarBox.getAttribute('aiosLastPanel'), true);
-
-        // Sidebar beim Start schliessen
-        if(sidebarInit == "close" && !aios_isSidebarHidden()) {
-            toggleSidebar();
-            if(aios_collapseSidebar) {
-                document.getElementById('sidebar-box').setAttribute('collapsed', true);
-                // CollapseByStyle-Methode document.getElementById('sidebar-box').setAttribute('style', 'display:none;');
-            }
-        }
-
-        // bestimmte Sidebar beim Start oeffnen
-        if(sidebarInit != "rem" && sidebarInit != "open" && sidebarInit != "close") {
-            if(document.getElementById(sidebarInit)) toggleSidebar(sidebarInit, true);
-        }
-
-        if(toolbarInit != 2) aios_toolbar.setAttribute('hidden', !toolbarInit);
-        if(switchInit != 2) aios_toggleBox.setAttribute('hidden', !switchInit);
-    }
-    catch(e) { }
-
-    // bei Doppelklick die Standardgroesse der Sidebar einstellen
-    var fx_sidebarheader = document.getElementsByTagName('sidebarheader')[0];
-    fx_sidebarheader.addEventListener("dblclick", function(e) {
-        aios_setSidebarWidth(e);
-    }, false);
-
-    // Sidebars-Menue ueberwachen - noetig fuer den Fall, dass ein erster Aufruf durch das View-Menue erfolgt
-    //fx_sidebarMenu.addEventListener('popupshowing', aios_modSidebarMenu, false);
-
-    // Sidebar-Ladezustand ueberwachen
-    /*document.getElementById('sidebar').addProgressListener(aiosSBListener, Components.interfaces.nsIWebProgress.NOTIFY_STATE_DOCUMENT);*/
-
-    // Drag&Drop-Funktion fuer den Sidebar-Umschalter deaktivieren?
-    try {
-        var switchDrag = aios_gPrefBranch.getBoolPref("gen.switch.drag");
-        var switchDelay = aios_gPrefBranch.getIntPref("gen.switch.delay");
-
-        if(!switchDrag) elem_switch.removeAttribute('ondragenter');
-    }
-    catch(e) { }
-
-    // Changelog anzeigen?
-    try {
-        var changelog = aios_gPrefBranch.getCharPref('changelog');
-    }
-    catch(e) { }
-
-    // mit einer manuell gesetzten 0 laesst sich das abschalten
-    if(parseFloat(changelog) != 0) {
-
-        Components.utils.import("resource://gre/modules/AddonManager.jsm");
-
-        AddonManager.getAddonByID("{097d3191-e6fa-4728-9826-b533d755359d}", function(addon) {
-            var aiosVersion = addon.version;
-
-            if(aiosVersion && (aiosVersion != changelog)) {
-
-                var aiosUpdated = (changelog != "") ? true : false;
-
-                try {
-                    aios_gPrefBranch.setCharPref('changelog', aiosVersion);
-                    var changelog_new = aios_gPrefBranch.getCharPref('changelog');
-                }
-                catch(e) { }
-
-                // wenn das speichern der aktuellen Version geklappt hat
-                if(changelog_new === aiosVersion && gBrowser) {
-                    var hp = "http://www.exxile.de/aios_installed.htm?v=" + aiosVersion;
-                    if(aiosUpdated) hp = "http://www.exxile.de/aios_updated.htm?v=" + aiosVersion;
-
-                    window.setTimeout(function() {
-                        gBrowser.loadTabs(new Array(hp), false);
-                    }, 500);
-                }
-            }
-        });
-    }
-
-    // vertikale Buttons?
-    try {
-        var vButtons = aios_gPrefBranch.getBoolPref("vbuttons");
-
-        fx_mainWindow.setAttribute('aiosVButtons', 'true');
-        if(!vButtons) fx_mainWindow.setAttribute('aiosVButtons', 'false');
-        document.persist(fx_mainWindow.id, 'aiosVButtons');
-    }
-    catch(e) { }
-
-    // vertikale Bookmarkleiste?
-    // Attribut der Bookmarks-Leiste entfernen. Wenn sie auf der AiOS-Toolbar platziert wird, kann man per CSS die Orientation bestimmen.
-    if(document.getElementById('PlacesToolbarItems')) document.getElementById('PlacesToolbarItems').removeAttribute('orient');
-
-    initialised = true;
-}
-
-
-/*
-	stellt bei Doppelklick auf den Sidebarheader die Standardgroesse der Sidebar wieder her
-		=> Aufruf durch EventListener auf dem Header, gesetzt in aios_initSidebar()
-*/
-function aios_setSidebarWidth(event) {
-    aios_getObjects();
-
-    var mode = "def";
-    if(event) {
-        if(event.shiftKey) mode = "min";
-        if(event.ctrlKey || event.metaKey) mode = "max";    // metaKey = Mac
-    }
-
-    try {
-        var sWidthVal = aios_gPrefBranch.getIntPref('gen.width.' + mode + 'Val');
-        var sWidthUnit = aios_gPrefBranch.getCharPref('gen.width.' + mode + 'Unit');
-
-        if(sWidthUnit == "%") {
-            var browserWidth = aios_getBrowserWidth();
-            var compWidth = browserWidth[3];
-
-            sWidthVal = parseInt(Math.round((compWidth * sWidthVal) / 100));
-        }
-
-        // Sidebargoesse einstellen
-        fx_sidebarBox.setAttribute('width', sWidthVal);
-    }
-    catch(e) { }
-}
-
-
-/*
-stellt die Anzeige der Sidebar ein
-		=> Aufruf durch aios_initSidebar() und aios_savePrefs() in prefs.js
-		=> 1 = links, 2 = rechts
-*/
-function aios_setSidebarOrient() {
-    aios_getObjects();
-
-    try {
-        // Sidebar-Ausrichtung
-        var sidebarOrient = aios_gPrefBranch.getIntPref('gen.orient');
-        fx_mainWindow.setAttribute('aiosOrient', 'left');
-        if(sidebarOrient == 2) fx_mainWindow.setAttribute('aiosOrient', 'right');
-        //document.persist(fx_mainWindow.id, 'aiosOrient');
-
-        // Links-Rechts <=> Rechts-Links
-        var cStyleWindow = document.defaultView.getComputedStyle(fx_mainWindow, '');
-        fx_mainWindow.setAttribute('aiosMode', 'ltr');
-        if(cStyleWindow.direction == "rtl") fx_mainWindow.setAttribute('aiosMode', 'rtl');
-        //document.persist(fx_mainWindow.id, 'aiosMode');
-
-        // Fix fuer MileWideBack
-        if(document.getElementById('back-strip') && sidebarOrient == 2) {
-            var mwb = document.getElementById('back-strip');
-            var mwbParent = document.getElementById('back-strip').parentNode;
-            mwbParent.removeChild(mwb);
-            mwbParent.appendChild(mwb);
-        }
-    }
-    catch(e) { }
-
-    aios_setToolbarPos();
-}
-
-
-/*
-	Sidebar-Status auf Veraenderungen ueberwachen
-		=> Aufruf durch observes-Elemente (hidden und collapsed) in 'sidebar-box'
-*/
-function aios_observeSidebar(mode) {
-    aios_getObjects();
-
-    // fuer den Fall, dass vor dem Oeffnen die Toolbar ausgeblendet wurde (z.B. durch Switch im Opera-Modus)
-    var showToolbar = aios_getBoolean(aios_toggleToolbarItem, 'checked');
-    if(showToolbar && !aios_isSidebarHidden()) aios_toggleToolbar(false);
-
-    // fuer den Fall, dass vor dem Oeffnen der Switch ausgeblendet wurde (z.B. durch Startup-Verhalten)
-    var showSwitch = aios_getBoolean(aios_toggleSwitchItem, 'checked');
-    if(showSwitch && !aios_isSidebarHidden()) aios_toggleBox.setAttribute('hidden', false);
+        for(var i in toolbars) {
 
-    // Grippy-Status (CSS achtet auf Attribut 'aiosOpen')
-    fx_mainWindow.setAttribute('aiosOpen', !fx_sidebarBox.hidden && !fx_sidebarBox.collapsed);
-    // CollapseByStyle-Methode fx_mainWindow.setAttribute('aiosOpen', !fx_sidebarBox.hidden && fx_sidebarBox.getAttribute('style') == "");
-    document.persist(fx_mainWindow.id, 'aiosOpen');
+            toolbars[i].setAttribute('_toolbox', toolbars[i].parentNode.id);
 
-    // Toggle-Button-Status (Button achtet auf Attribut 'checked')
-    fx_sidebarBox.setAttribute('checked', !fx_sidebarBox.hidden && !fx_sidebarBox.collapsed);
-    // CollapseByStyle-Methode fx_sidebarBox.setAttribute('checked', !fx_sidebarBox.hidden && fx_sidebarBox.getAttribute('style') == "");
+            toolbars[i].setAttribute('_context', toolbars[i].getAttribute('context'));
+            toolbars[i].setAttribute('context', 'toolbar-context-menu');
+            toolbars[i].setAttribute('_orient', toolbars[i].getAttribute('orient'));
+            toolbars[i].setAttribute('orient', 'horizontal');
+            toolbars[i].setAttribute('_mode', toolbars[i].getAttribute('mode'));
+            toolbars[i].setAttribute('mode', 'icons');
 
-    // fuer den Fall, dass vor dem Oeffnen der Grippy benutzt wurde...
-    if(mode == "hidden") {
-        fx_sidebarBox.removeAttribute('collapsed');
-        // CollapseByStyle-Methode fx_sidebarBox.removeAttribute('style');
-        fx_sidebarSplitter.removeAttribute('hidden');
+            toolbars[i].setAttribute('align', 'center');
 
-        fx_sidebarSplitter.setAttribute('state', 'open');
-    }
-}
-
-
-/*
-	Letzte Sidebar merken und als persist speichern
-		=> Aufruf durch observes-Element in 'sidebar-box' und aios_modSidebarMenu()
-*/
-function aios_remLastSidebar() {
-    aios_getObjects();
-
-    var actSidebar = false;
-
-    // letzte Sidebar merken und speichern
-    var allSidebars = document.getElementsByAttribute('group', 'sidebar');
-    for(var i = 0; i < allSidebars.length; i++) {
-
-        // darf kein Element observen (Menueeintraege usw.), aber muss eine Sidebar-URL haben
-        if(!allSidebars[i].getAttribute('observes') && allSidebars[i].getAttribute('sidebarurl')) {
-
-            // muss eine ID haben und muss "checked" sein
-            if(allSidebars[i].getAttribute('id') && aios_getBoolean(allSidebars[i], 'checked')) {
-
-                // command in der "persist"-var "aiosLastPanel" speichern und zurueckgeben
-                fx_sidebarBox.setAttribute("aiosLastPanel", allSidebars[i].id);
-                document.persist(fx_sidebarBox.id, "aiosLastPanel");
-                actSidebar = allSidebars[i].id;
-
-            //fx_sidebarBox.setAttribute("sidebarcommand", allSidebars[i].id);
-            //document.persist(fx_sidebarBox.id, "sidebarcommand");
-
-            //fx_sidebarBox.setAttribute('src', fx_sidebar.getAttribute('src'));
-            //fx_sidebar.setAttribute('src', fx_sidebarBox.getAttribute('src'));
-            }
-        }
-    }
-
-    return actSidebar;
-}
-
-
-/*
-	toggelt die Sidebar im Opera-Verhalten
-		=> Aufruf durch aios_toggleSidebar() fuer Elemente im Opera-Verhalten
-*/
-function aios_toggleOperaMode(aForcePanel, aForceOpen) {
-    aios_getObjects();
-
-    var showToolbar = aios_getBoolean(aios_toggleToolbarItem, 'checked');
-
-    // zu oeffnende Sidebar feststellen
-    var openPanel = fx_sidebarBox.getAttribute('aiosLastPanel');						// zuletzt geoeffnete Sidebar
-    if(openPanel == "") openPanel = "viewBookmarksSidebar";								// Lesezeichen wenn keine Sidebar geoeffnet war
-    if(aForcePanel) openPanel = aForcePanel;											// bestimmte Sidebar gewuenscht (bei jedem oeffnen)
-
-    // vertikaler Toolbar-Modus
-    if(aios_toolbar.orient == "vertical") {
-
-        // wenn die Toolbar sichtbar ist
-        if(!aios_getBoolean(aios_toolbar, 'hidden')) {
-
-            // wenn die Sidebar sichtbar ist
-            if(!aios_isSidebarHidden() && !aForceOpen) {
-                fx_sidebarBox.setAttribute("aiosShouldOpen", true);							// Zustand der Sidebar merken (sichtbar)
-                document.persist(fx_sidebarBox.id, 'aiosShouldOpen');
-                toggleSidebar();															// Sidebar ausblenden
-            }
-            else {
-                fx_sidebarBox.setAttribute("aiosShouldOpen", false);						// Zustand der Sidebar merken (unsichtbar)
-                document.persist(fx_sidebarBox.id, 'aiosShouldOpen');
-            }
-
-            //aios_toolbar.setAttribute('hidden', true);
-            //if(!aForceOpen) onViewToolbarCommand(true);									// Toolbar ausblenden
-            if(!aForceOpen) aios_toggleToolbar(true);										// Toolbar ausblenden
-        }
-        // wenn die Toolbar nicht sichtbar ist
-        else {
-            if(showToolbar)																	// Toolbar anzeigen?
-                aios_toggleToolbar(false);												// Toolbar einblenden
-            //onViewToolbarCommand(false);												// Toolbar einblenden
-            //aios_toolbar.setAttribute('hidden', false);
-
-            // wenn Sidebar angezeigt werden soll (Status vor dem letzten Schliessen) oder die Toolbar abgeschaltet wurde
-            if(aios_getBoolean(fx_sidebarBox, 'aiosShouldOpen') || !showToolbar) toggleSidebar(openPanel);
-        }
-    }
-    // horizontaler Toolbar-Modus
-    else {
-        // wenn die Sidebar sichtbar ist
-        if(!aios_isSidebarHidden()) {
-            fx_sidebarBox.setAttribute("aiosShouldOpen", true);							// Zustand der Sidebar merken (sichtbar)
-            document.persist(fx_sidebarBox.id, 'aiosShouldOpen');
-            toggleSidebar();															// Sidebar ausblenden
-        }
-        else {
-            if(lastPanel == "") toggleSidebar(openPanel);
-
-        //if(showToolbar) aios_toolbar.setAttribute('hidden', false);
-        }
-    }
-
-}
-
-
-/*
-	klont das Firefox-Sidebar-Menue fuer die Sidebars-Buttons
-		=> Aufruf durch Menuebutton-Events 'onpopupshowing' aufgerufen
-*/
-function aios_getSidebarMenu(aPopup) {
-
-    aios_getObjects();
-
-    // Menue modifizieren (aktiven Menuepunkt deaktivieren, Ez Sidebar-Fix u.a.)
-    aios_modSidebarMenu();
-
-    /*var aios_sidebarMenu = fx_sidebarMenu.cloneNode(true);
-	aios_sidebarMenu.setAttribute('onpopupshowing', 'aios_getSidebarMenu(this);');
-	aPopup.parentNode.replaceChild(aios_sidebarMenu, aPopup);*/
-
-    while(aPopup.hasChildNodes()) {
-        aPopup.removeChild(aPopup.firstChild);
-    }
+            var label = document.createElement('label');
+            label.setAttribute('value', toolbars[i].getAttribute('toolbarlabel'));
+            toolbars[i].insertBefore(label, toolbars[i].firstChild);
 
-    for(var i = 0; i < fx_sidebarMenu.childNodes.length; i++) {
-        aPopup.appendChild(fx_sidebarMenu.childNodes[i].cloneNode(true));
-    }
-}
-
-
-/*
-	schliesst die Sidebar, wenn die Maus den Content-Bereich ueberfaehrt
-		=> Aufruf durch mouseover des 'appcontent' und des Sidebar-Switches (mit Uebergabe von mode)
-
-		=> aios_initSidebar() fuegt dem Object "sidebar-box" einen mouseover-Event hinzu,...
-		=> dieser mouseover-Event fuegt dem "appcontent" einen mouseover-Event hinzu,...
-		=> der diese Funktion aufruft
-*/
-var aios_autoTimeout;
-function aios_autoShowHide(mode) {
-    //try {
-    var autobutton = aios_getBoolean('aios-enableAutohide', 'checked');
-
-    var autoshow = aios_gPrefBranch.getBoolPref('gen.switch.autoshow');
-    var onlymax = aios_gPrefBranch.getBoolPref('gen.switch.onlymax');
-    var delay = aios_gPrefBranch.getIntPref('gen.switch.delay');
-    var hidemethod = aios_gPrefBranch.getIntPref('gen.switch.hidemethod');
-
-    //alert(mode);
-
-    // Feature nicht aktiviert, Feature soll nur bei max. Fenster greifen, Fenster hat nicht den Focus
-    if(!autoshow || !autobutton || (onlymax && !aios_isWinMax()) || !aiosFocus) return false;
-
-    /*
-     *  Ausloesung durch den Umschalter
-     **/
-    if(mode == "switch") {
-        // wenn Sidebar sichtbar und nicht ausgeblendet werden soll => ignorieren
-        if(!aios_isSidebarHidden() && hidemethod == 1) return false;
-
-        // nach bestimmter Zeit ein-/ausblenden
-        aios_autoTimeout = window.setTimeout(function() {
-            aios_toggleSidebar('switch');
-        }, delay);
-
-        // timeout wieder loeschen, wenn die Maus zu kurz auf dem Umschalter war oder geklickt wurde
-        elem_switch.addEventListener("mouseout", function(){
-            window.clearTimeout(aios_autoTimeout);
-        }, true);
-        elem_switch.addEventListener("click", function(){
-            window.clearTimeout(aios_autoTimeout);
-        }, true);
-
-        return true;
-    }
-    /*
-     *  Ausloesung durch den Contentbereich
-     **/
-    else {
-
-        // wenn Sidebar sichtbar und ausgeblendet werden soll
-        // mode.originalTarget.parentNode.id != "" => behebt Kompatibilitaetsproblem mit TabSidebar (Sidebar wird bei Rollover des SidebarTabs ausgeblendet)
-
-        // macht scheinbar Probleme, weil der Event auf appcontent nicht (immer) geloescht wird => TabSidebar wird nicht weiterentwickelt
-        //if(!aios_isSidebarHidden() && hidemethod == 1 && mode.originalTarget.parentNode.id != "") {
-        if(!aios_isSidebarHidden() && hidemethod == 1) {
-
-            // Event auf "appcontent" wieder loeschen, weil sonst die Sidebar wieder eingeblendet wuerde
-            // => mouseover der Sidebar (in aios_initSidebar()) fuegt dem "appcontent" dieses Feature wieder hinzu
-            document.getElementById('appcontent').removeEventListener("mouseover", aios_autoShowHide, true);
-
-            // nach bestimmter Zeit ausblenden
-            aios_autoTimeout = window.setTimeout(function() {
-                aios_toggleSidebar('switch');
-            }, delay);
-
-            // timeout wieder loeschen, wenn die Maus zurueck in die Sidebar kommt
-            fx_sidebarBox.addEventListener("mouseover", function(){
-                window.clearTimeout(aios_autoTimeout);
-            }, true);
-        }
-    }
-    //}
-    //catch(e) { }
-
-    return true;
-}
-
-
-/*
-	aktiviert/deaktiviert die Sidebar/Toolbar/Switch je nach Element und Einstellungen
-		=> Aufruf durch Toggle-Button, Switch, Shortcut, Open/Close-Menuitems, Sidebar-Close-Button
-			=> mode 1: nur die Sidebar oeffnen/schliessen
-			=> mode 2: Sidebar und Toolbar oeffnen/schliessen
-			=> mode 3: Sidebar, Toolbar und Togglebar oeffnen/schliessen
-			=> mode 4: Opera-Verhalten
-*/
-function aios_toggleSidebar(aMode, aForceOpen) {
-    aios_getObjects();
-    //aForceOpen = false;			// erlaubt das automatische ein-/ausblenden waehrend Drag auf Sidebar Switch
-
-    var prefstring = "key";
-    if(aMode == elem_switch || aMode == "switch") prefstring = "switch";
-    if(aMode == elem_tbb || aMode == "tbb") prefstring = "tbb";
-    if(aMode == elem_close || aMode == elem_close2 || aMode == "close") prefstring = "close";
-
-    try {
-        var mode = aios_gPrefBranch.getIntPref('cmode.' + prefstring);
-        var toolBox_enabled = aios_getBoolean('aios-viewToolbar', 'checked');
-        var toggleBox_enabled = aios_getBoolean(aios_toggleSwitchItem, 'checked');
-
-        // direkte Uebergabe per JavaScript z.B. per "Custom Buttons"
-        if(aMode === 1) mode = 1;
-        if(aMode === 2) mode = 2;
-        if(aMode === 3) mode = 3;
-        if(aMode === 4) mode = 4;
-
-
-        // bestimmtes Panel laden?
-        var forcePanel;
-        var openPanel = aios_gPrefBranch.getCharPref("gen.open.init");
-        if(openPanel != "rem" && (prefstring == "key" || prefstring == "switch" || prefstring == "tbb")) forcePanel = openPanel;
-        else forcePanel = false;
-
-        if(mode == 4) {
-            aios_toggleOperaMode(forcePanel, aForceOpen);
-        }
-        else {
-            // wenn Sidebar Collpasing aktiviert ist...
-            // ein bestimmtes Panel grundsaetzlich geoeffnet werden soll...
-            // es aber noch nicht geoeffnet ist...
-            // die Sidebar aber noch geoeffnet ist...
-            // dann soll das Panel zwar geladen, die Sidebar aber dennoch geschlossen werden => reiner Performance-Zweck
-            if(aios_collapseSidebar && forcePanel && fx_sidebarBox.getAttribute('aiosLastPanel') != forcePanel && !aios_isSidebarHidden()) var closeNow = true;
-
-            var tmpcmd = (forcePanel) ? forcePanel : fx_sidebarBox.getAttribute('aiosLastPanel');
-            toggleSidebar(tmpcmd, aForceOpen);
-
-            // Sidebar schliessen, wenn die obigen Bedingungen erfuellt sind
-            if(closeNow) toggleSidebar(tmpcmd, aForceOpen);
-
-
-            if((mode == 2 || mode == 3) && toolBox_enabled) {
-                //aios_toolbar.setAttribute('hidden', aios_isSidebarHidden());
-                //onViewToolbarCommand(aios_isSidebarHidden());
-                aios_toggleToolbar(aios_isSidebarHidden());
-            }
+            gNavToolbox.appendChild(toolbars[i]);
 
-            if(mode == 3 && toggleBox_enabled)
-                aios_toggleBox.setAttribute('hidden', aios_isSidebarHidden());
         }
-    }
-    catch(e) { }
-
-    return true;
-}
-
-
-/*
-	Sidebar-Toggle per collapsed
-		=> Aufruf durch den Grippy selbst bei onClick()
-*/
-function aios_useGrippy() {
-    fx_sidebarBox.collapsed = !fx_sidebarBox.collapsed;
-
-    // Fix fuer Win Vista & 7: aiosOpen wird durch fehlenden Aufruf von aios_observeSidebar nicht gesetzt
-    // aios_observeSidebar wird eigentlich durch Observer der sidebar-box aufgerufen, k.A. warum hier nicht
-    if(aios_appOS == "WINNT" && aios_appOSVersion.indexOf("5.1") == -1) aios_observeSidebar(true);
-
-    /* CollapseByStyle-Methode
-    if(fx_sidebarBox.getAttribute('style') != "") fx_sidebarBox.removeAttribute('style');
-    else fx_sidebarBox.setAttribute('style', 'display:none;')*/
-}
-
-
-/*
-	aktiviert/deaktiviert den schmalen Sidebar-Umschalter
-		=> Aufruf durch Event-Listener "onresize", observer (sizemode) in tbx.xul,
-			 aios_BrowserFullScreen() und aios_savePrefs() in prefs.js
-*/
-function aios_checkThinSwitch() {
-    if(!initialised) return;
-
-    aios_getObjects();
 
-    var thin_switch, thinmax_switch, switch_width, switch_twidth, athin_switch;
+        PlacesToolbarHelper.customizeDone();
 
-    try {
-        thin_switch = aios_gPrefBranch.getBoolPref('gen.switch.thin');
-        thinmax_switch = aios_gPrefBranch.getBoolPref('gen.switch.thinmax');
+    },
 
-        switch_width = aios_gPrefBranch.getIntPref('gen.switch.width');
-        switch_twidth = aios_gPrefBranch.getIntPref('gen.switch.twidth');
 
-        // soll er schmal sein?
-        var thin = thin_switch;
-        if(thin_switch && thinmax_switch && !aios_isWinMax()) thin = false;
+    afterCustomization: function() {
 
-        var width_val = (thin) ? switch_twidth : switch_width;
-        var barStyle = "min-width: " + width_val + "px; max-width: " + width_val + "px;";
+        var toolbars = new Array(AiOS_HELPER.aiosToolbar, AiOS_HELPER.sbhToolbar);
 
-        if(width_val < 4) elem_switch.setAttribute('style', 'background-image: none;');
-        else elem_switch.setAttribute('style', '');
+        PlacesToolbarHelper.customizeStart();
 
-        if(width_val < 2) barStyle += " border: none;";
-        aios_toggleBar.setAttribute('style', barStyle);
-    }
-    catch(e) { }
-}
+        for(var i in toolbars) {
 
+            toolbars[i].removeChild(toolbars[i].querySelector('label'));
 
-/*
-  Steuerung der Mausaktionen des Sidebar-Umschalters
-    => Aufruf durch onClick() des Umschalters
-*/
-function aios_controlSwitch(ev, which) {
+            toolbars[i].setAttribute('context', toolbars[i].getAttribute('_context'));
+            toolbars[i].removeAttribute('_context');
+            toolbars[i].setAttribute('orient', toolbars[i].getAttribute('_orient'));
+            toolbars[i].removeAttribute('_orient');
+            toolbars[i].setAttribute('mode', toolbars[i].getAttribute('_mode'));
+            toolbars[i].removeAttribute('_mode');
 
-    // Linksklick => metaKey = Mac
-    if(ev.button == 0 && (!ev.shiftKey && !ev.ctrlKey && !ev.metaKey)) {
-        aios_toggleSidebar(which);
-    }
+            toolbars[i].removeAttribute('align');
 
-    // Mittelklick / Ctrl+Linksklick => metaKey = Mac
-    if(ev.button == 1 || (ev.button == 0 && ev.ctrlKey) || (ev.button == 0 && ev.metaKey)) {
-        aios_toggleElement('aios-viewToolbar');
-        aios_toggleToolbar('aios-viewToolbar');
-    }
-
-    // Rechtsklick / Shift+Linksklick
-    if(ev.button == 2 || (ev.button == 0 && ev.shiftKey)) {
-        if(aios_isSidebarHidden()) toggleSidebar(fx_sidebarBox.getAttribute('aiosLastPanel'), true);
-        else toggleSidebar();
-    }
-}
-
-
-/*
-	Erweitert die FF-Funktion BrowserFullScreen() zur Steuerung der AIOS-Elemente
-		=> Aufruf durch aios_initSidebar()
-*/
-function aios_BrowserFullScreen() {
-    aios_getObjects();
-
-    try {
-        var enable_restore = aios_gPrefBranch.getBoolPref('fs.restore');
-    }
-    catch(e) {
-        return false;
-    }
+            document.getElementById(toolbars[i].getAttribute('_toolbox')).appendChild(toolbars[i]);
+            toolbars[i].removeAttribute('_toolbox');
 
-    // Fullscreen an
-    // 	=> Elemente ausblenden
-    if(document.mozFullScreenElement) {
-
-        // Fix für mehrmaliges feuern des mozfullscreenchange events
-        aios_leaveFullScreen = 0;
-        aios_enterFullScreen++;
-        if(aios_enterFullScreen > 1) return;
-
-        try {
-            // Soll-Zustaende
-            var close_switch = aios_gPrefBranch.getBoolPref('fs.switch');
-            var close_toolbar = aios_gPrefBranch.getBoolPref('fs.toolbar');
-            var close_sidebar = aios_gPrefBranch.getBoolPref('fs.sidebar');
-
-            // Ist-Zustaende
-            var rem_switchHidden = aios_getBoolean(aios_toggleBox, 'hidden');
-            var rem_toolbarHidden = aios_getBoolean(aios_toolbar, 'hidden');
-            var rem_sidebarHidden = aios_isSidebarHidden();
-        }
-        catch(e) {
-            return false;
         }
 
-        // Ist-Zustaende speichern
-        aios_toggleBox.setAttribute('fsSwitch', rem_switchHidden);
-        aios_toggleBox.setAttribute('fsToolbar', rem_toolbarHidden);
-        aios_toggleBox.setAttribute('fsToolbarMode', aios_toolbar.getAttribute("mode"));
-        aios_toggleBox.setAttribute('fsToolbarIconsize', aios_toolbar.getAttribute("iconsize"));
-        aios_toggleBox.setAttribute('fsSidebar', rem_sidebarHidden);
-
-        // Soll-Zustaende herstellen (SidebarSwitch und Toolbar werden standardmaessig ausgeblendet)
-        if(close_sidebar && !rem_sidebarHidden) toggleSidebar();
+        PlacesToolbarHelper.customizeDone();
 
-        aios_toggleBar.setAttribute("moz-collapsed", false);
-        if(close_switch && !rem_switchHidden) aios_toggleBox.hidden = true;
+    },
 
-        document.getElementById('aios-sbhtoolbar').setAttribute("moz-collapsed", false);
 
-        aios_toolbar.setAttribute("moz-collapsed", false);
-        //if(close_toolbar && !rem_toolbarHidden) onViewToolbarCommand(true);
-        if(close_toolbar && !rem_toolbarHidden) aios_toggleToolbar(true);
+    unload: function() {
+        window.removeEventListener("DOMContentLoaded", AiOS.initOnDOMLoaded);
+        //window.removeEventListener("load", AiOS.initOnLoad);
+        window.removeEventListener("unload", AiOS.unload);
 
-        // Toolbar fuer Fullscreen einstellen (nur ohne die Erweiterung Autohide)
-        if(typeof autoHIDE != "object") {
-            aios_toolbar.setAttribute("mode", "icons");
-            aios_toolbar.setAttribute("iconsize", "small");
-        }
-    }
-    // Fullscreen aus
-    // 	=> Elemente einblenden
-    else {
-
-        // Fix für mehrmaliges feuern des mozfullscreenchange events
-        aios_enterFullScreen = 0;
-        aios_leaveFullScreen++;
-        if(aios_leaveFullScreen > 1) return;
-
-        // Toolbareinstellungen wiederherstellen (nur ohne die Erweiterung Autohide)
-        if(typeof autoHIDE != "object") {
-            aios_toolbar.setAttribute("mode", aios_toggleBox.getAttribute('fsToolbarMode'));
-            aios_toolbar.setAttribute("iconsize", aios_toggleBox.getAttribute('fsToolbarIconsize'));
-        }
-
-        if(enable_restore) {
-            if(!aios_getBoolean(aios_toggleBox, 'fsSidebar')) toggleSidebar(fx_sidebarBox.getAttribute('aiosLastPanel'), true);
-            else if(!aios_isSidebarHidden()) toggleSidebar();
-
-            //onViewToolbarCommand(aios_getBoolean(aios_toggleBox, 'fsToolbar'));
-            aios_toggleToolbar(aios_getBoolean(aios_toggleBox, 'fsToolbar'));
-            aios_toggleBox.hidden = aios_getBoolean(aios_toggleBox, 'fsSwitch');
-        }
+        gNavToolbox.removeEventListener("beforecustomization", AiOS.beforeCustomization);
+        gNavToolbox.removeEventListener("aftercustomization", AiOS.afterCustomization);
     }
 
-    // aktiviert/deaktiviert den schmalen Sidebar-Umschalter
-    aios_checkThinSwitch();
+};
 
-    aios_adjustToolboxWidth(false);
+window.addEventListener("DOMContentLoaded", AiOS.initOnDOMLoaded, false);
+//window.addEventListener("load", AiOS.initOnLoad, false);
+window.addEventListener("unload", AiOS.unload, false);
 
-    return true;
-}
\ No newline at end of file
+gNavToolbox.addEventListener("beforecustomization", AiOS.beforeCustomization, false);
+gNavToolbox.addEventListener("aftercustomization", AiOS.afterCustomization, false);
\ No newline at end of file
diff --git a/content/aios.properties b/content/aios.properties
old mode 100755
new mode 100644
diff --git a/content/aios.xml b/content/aios.xml
old mode 100755
new mode 100644
diff --git a/content/aios.xul b/content/aios.xul
old mode 100755
new mode 100644
index 4523a51..fa911a4
--- a/content/aios.xul
+++ b/content/aios.xul
@@ -16,10 +16,12 @@
     <script type="application/x-javascript" src="chrome://aios/content/prefs/_overlay.js" />
     <script type="application/x-javascript" src="chrome://aios/content/prefs/general.js" />
 
-    <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
+    <script type="application/x-javascript" src="chrome://aios/content/_helper.js" />
     <script type="application/x-javascript" src="chrome://aios/content/_lib.js" />
     <script type="application/x-javascript" src="chrome://aios/content/multipanel.js" />
+
     <script type="application/x-javascript" src="chrome://aios/content/aios.js" />
+    <script type="application/x-javascript" src="chrome://aios/content/aios_old.js" />
     <script type="application/x-javascript" src="chrome://aios/content/aios_fx.js" />
     <script type="application/x-javascript" src="chrome://aios/content/aios_tbx.js" />
     <script type="application/x-javascript" src="chrome://aios/content/aios_compatibility.js" />
@@ -83,11 +85,11 @@
             oncommand="aios_toggleElement(this); event.stopPropagation();"
             label="&menu.togglebar.label;" />
 
-        <broadcaster id="aios-viewGrippy" type="checkbox" checked="false" persist="checked" aiosChilds="aios-sidebarGrippy"
+        <broadcaster id="aios-viewGrippy" type="checkbox" persist="checked" aiosChilds="aios-sidebarGrippy"
             oncommand="aios_toggleElement(this); document.getElementById('sidebar-splitter').setAttribute('grippy', this.getAttribute('checked')); event.stopPropagation();"
             label="&menu.grippy.label;" />
 
-        <broadcaster id="aios-enableAutohide" type="checkbox" checked="false" persist="checked"
+        <broadcaster id="aios-enableAutohide" type="checkbox" persist="checked"
             oncommand="aios_toggleElement(this); aios_toggleAutohide(this); event.stopPropagation();" />
 
     </broadcasterset>
@@ -124,7 +126,7 @@
 
     <!-- Sidebar-Status auf Veraenderungen ueberwachen -->
     <vbox id="sidebar-box">
-	<!--
+        <!--
             Darwin: => bei staendiger Ueberwachung der beiden Attribute startet Fx immer mit geoeffneter Sidebar
                     => ohne Ueberwachung und deaktiviertem SidebarCollapsing fehlt die Ausfuehrung der Funktion,
                        was dazu fuehrt, dass u.a. die Grippy-Pfeile nicht korrekt gewechselt werden
@@ -138,16 +140,11 @@
         <!-- CollapseByStyle-Methode <observes id="aios_observeStyle" element="sidebar-box" attribute="style"
             onbroadcast="if(aios_collapseSidebar) aios_observeSidebar('style');" />-->
 
-	<!-- "src"-Status der Sidebar ueberwachen => letzte Sidebar merken -->
+        <!-- "src"-Status der Sidebar ueberwachen => letzte Sidebar merken -->
         <observes element="sidebar" attribute="src" onbroadcast="aios_remLastSidebar();" />
     </vbox>
 
 
-    <!-- Tooltips zuweisen -->
-    <label id="sidebar-title" tooltip="sidebarheader-tooltip" />
-    <image id="sidebar-throbber" tooltip="sidebarheader-tooltip" />
-
-
     <!-- Grippy -->
     <splitter id="sidebar-splitter" orient="horizontal" grippy="false" persist="grippy">
         <grippy id="aios-sidebarGrippy" hidden="true" persist="hidden" onclick="aios_useGrippy();" />
@@ -156,23 +153,26 @@
 
     <!-- AIOS-Toolbar-Buttons -->
     <toolbarpalette id="BrowserToolbarPalette">
-        <toolbarbutton id="sidebarclose-button" class="tabs-closebutton"
+        <toolbarbutton id="sidebarclose-button" class="tabs-closebutton close-icon"
             oncommand="aios_toggleSidebar(this);" ondblclick="event.stopPropagation();"
             tooltiptext="&sidebarCloseButton.tooltip;" label="&sidebarCloseButton.tooltip;" />
 
-        <toolbarbutton id="bookmarks-button" tooltip="bookmarks-tooltip" tooltiptext="&bookmarksButton.tooltip;"
+        <toolbarbutton id="bookmarks-button" class="toolbarbutton-1 chromeclass-toolbar-additional aios-tbutton"
+            label="&bookmarksButton.label;" tooltip="bookmarks-tooltip" tooltiptext="&bookmarksButton.tooltip;"
             command="View:Bookmarks">
             <observes element="viewBookmarksSidebar" attribute="checked" />
             <observes element="viewBookmarksSidebar" attribute="onclick" />
         </toolbarbutton>
 
-        <toolbarbutton id="history-button" tooltip="history-tooltip" tooltiptext="&historyButton.tooltip;"
+        <toolbarbutton id="history-button" class="toolbarbutton-1 chromeclass-toolbar-additional aios-tbutton"
+            label="&historyButton.label;" tooltip="history-tooltip" tooltiptext="&historyButton.tooltip;"
             command="View:History">
             <observes element="viewHistorySidebar" attribute="checked" />
             <observes element="viewHistorySidebar" attribute="onclick" />
         </toolbarbutton>
 
-        <toolbarbutton id="downloads-button" tooltip="downloads-tooltip" tooltiptext="&downloads.tooltip;"
+        <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional aios-tbutton"
+            label="&downloads.label;" tooltip="downloads-tooltip" tooltiptext="&downloads.tooltip;"
             command="Tools:Downloads">
             <observes element="viewDownloadsSidebar" attribute="checked" />
             <observes element="viewDownloadsSidebar" attribute="onclick" />
@@ -220,7 +220,7 @@
             <menupopup onpopupshowing="aios_getSidebarMenu(this);" oncommand="event.stopPropagation();" />
         </toolbarbutton>
 
-    	<!-- ueber tooltip oder tooltiptext wird in aios_setTargets() [_lib.js] entschieden -->
+        <!-- ueber tooltip oder tooltiptext wird in aios_setTargets() [_lib.js] entschieden -->
         <toolbarbutton id="paneltab-button" class="toolbarbutton-1 chromeclass-toolbar-additional aios-tbutton"
             label="&button.paneltab.label;" onclick="aios_panelTab(event);"
             tooltip="paneltab-tooltip" tooltiptext="&button.paneltab.tooltip1; / &button.paneltab.tooltip2;" />
@@ -318,43 +318,43 @@
                 <box    id="switch-tooltip-box"
                         r1c1="&button.switch.tooltip1;:"    r1c2="&leftclick;"
                         r2c1="&button.switch.tooltip2;:"    r2c2="&key.ctrl;+&leftclick; / &middleclick;"
-			r3c1="&button.switch.tooltip3;:"    r3c2="&key.shift;+&leftclick; / &rightclick;" />
+            r3c1="&button.switch.tooltip3;:"    r3c2="&key.shift;+&leftclick; / &rightclick;" />
             </tooltip>
 
             <tooltip id="template-sidebar-tooltip">
-                <box 	id="template-sidebar-tooltip-box"
+                <box    id="template-sidebar-tooltip-box"
                         r1c1="&button.tooltip.sidebar;:"    r1c2="&leftclick;"
-			r2c1="&button.tooltip.tab;:"        r2c2="&key.ctrl;+&leftclick; / &middleclick;"
-			r3c1="&button.tooltip.window;:"     r3c2="&key.shift;+&leftclick;"      rightclick=" / &rightclick;" />
+            r2c1="&button.tooltip.tab;:"        r2c2="&key.ctrl;+&leftclick; / &middleclick;"
+            r3c1="&button.tooltip.window;:"     r3c2="&key.shift;+&leftclick;"      rightclick=" / &rightclick;" />
             </tooltip>
 
             <tooltip id="template-window-tooltip">
-                <box 	id="template-window-tooltip-box"
+                <box    id="template-window-tooltip-box"
                         r1c1="&button.tooltip.window;:"     r1c2="&leftclick;"
-			r2c1="&button.tooltip.tab;:"        r2c2="&key.ctrl;+&leftclick; / &middleclick;"
+            r2c1="&button.tooltip.tab;:"        r2c2="&key.ctrl;+&leftclick; / &middleclick;"
                         r3c1="&button.tooltip.sidebar;:"    r3c2="&key.shift;+&leftclick;"      rightclick=" / &rightclick;" />
             </tooltip>
 
 
             <!-- Tooltips fuer PanelTab werden nach Einstellung der 'Reverse'-Funktion in prefs.js gesetzt => aios_savePrefs() -->
             <tooltip id="paneltab-tooltip">
-                <box 	id="paneltab-tooltip-box"
+                <box    id="paneltab-tooltip-box"
                         r1c1="&button.paneltab.tooltip1;:"  r1c2="&leftclick;"
-			r2c1="&button.paneltab.tooltip2;:"  r2c2="&key.ctrl;+&leftclick; / &middleclick;"
-			r3c1="&button.paneltab.tooltip3;:"  r3c2="&key.shift;+&leftclick;"      rightclick=" / &rightclick;" />
+            r2c1="&button.paneltab.tooltip2;:"  r2c2="&key.ctrl;+&leftclick; / &middleclick;"
+            r3c1="&button.paneltab.tooltip3;:"  r3c2="&key.shift;+&leftclick;"      rightclick=" / &rightclick;" />
             </tooltip>
 
             <tooltip id="paneltab-tooltip-reverse">
-                <box 	id="paneltab-tooltip-reverse-box"
+                <box    id="paneltab-tooltip-reverse-box"
                         r1c1="&button.paneltab.tooltip2;:"  r1c2="&leftclick;"
-			r2c1="&button.paneltab.tooltip1;:"  r2c2="&key.ctrl;+&leftclick; / &middleclick;"
-			r3c1="&button.paneltab.tooltip3;:"  r3c2="&key.shift;+&leftclick;"      rightclick=" / &rightclick;" />
+            r2c1="&button.paneltab.tooltip1;:"  r2c2="&key.ctrl;+&leftclick; / &middleclick;"
+            r3c1="&button.paneltab.tooltip3;:"  r3c2="&key.shift;+&leftclick;"      rightclick=" / &rightclick;" />
             </tooltip>
 
             <tooltip id="sidebarheader-tooltip">
-                <box 	id="sidebarheader-tooltip-box"
+                <box    id="sidebarheader-tooltip-box"
                         r1c1="&sidebar.width.min;:"         r1c2="&key.shift;+&doubleclick;"
-			r2c1="&sidebar.width.def;:"         r2c2="&doubleclick;"
+            r2c1="&sidebar.width.def;:"         r2c2="&doubleclick;"
                         r3c1="&sidebar.width.max;:"         r3c2="&key.ctrl;+&doubleclick;" />
             </tooltip>
 
@@ -447,7 +447,7 @@
         <!-- fuer CSS benoetigt -->
         <observes element="aios-toolbar" attribute="posMode" />
 
-	<!-- Sidebar-Switch -->
+    <!-- Sidebar-Switch -->
         <toolbox id="aios-toggle-toolbox" insertafter="browser-border-start" class="chromeclass-toolbar"
             persist="hidden fsToolbar fsToolbarMode fsToolbarIconsize fsSidebar fsSwitch">
 
@@ -457,7 +457,7 @@
             <toolbar id="aios-toggle-toolbar" class="chromeclass-toolbar" flex="1"
                 style="min-width: 6px; max-width: 6px;" persist="style" fullscreentoolbar="true">
 
-        	<!-- ueber tooltip oder tooltiptext wird in aios_setTargets() [_lib.js] entschieden -->
+            <!-- ueber tooltip oder tooltiptext wird in aios_setTargets() [_lib.js] entschieden -->
                 <grippy flex="1" id="aios-toggle-button" tooltip="switch-tooltip" tooltiptext="&button.toggle.tooltip;"
                     onclick="aios_controlSwitch(event, this);"
                     onmouseover="aios_autoShowHide('switch'); event.stopPropagation();"
@@ -470,10 +470,13 @@
         </toolbox>
 
 
-  	<!-- TOOLBOX LINKS NEBEN DER SIDEBAR -->
-        <toolbox id="aios-toolbox-left" insertbefore="sidebar-box" defaultmode="icons" class="chromeclass-toolbar" vertical="true" palette="BrowserToolbarPalette">
+    <!-- TOOLBOX LINKS NEBEN DER SIDEBAR -->
+        <toolbox id="aios-toolbox-left" class="chromeclass-toolbar"
+            insertbefore="sidebar-box"
+            defaultmode="icons"
+            vertical="true">
 
-	    <!-- mode und iconsize noetig, um Optionen im Konfigrationsdialog syncron zu halten  -->
+        <!-- mode und iconsize noetig, um Optionen im Konfigrationsdialog syncron zu halten  -->
             <observes element="aios-toolbar" attribute="mode" />
             <observes element="aios-toolbar" attribute="defaultmode" />
             <observes element="aios-toolbar" attribute="iconsize" />
@@ -483,17 +486,29 @@
                 => die Toolbox darf nicht 'collapsed' sein, weil sonst die Sidebar nicht skalierbar ist
             -->
 
-            <toolbar id="aios-toolbar" toolbarname="&toolbar.name;" context="aios-toolbar-contextmenu" customizable="true" class="chromeclass-toolbar"
-                posMode="1" mode="icons" iconsize="large" flexbuttons="false" persist="posMode mode iconsize flexbuttons hidden"
+            <toolbar id="aios-toolbar" class="chromeclass-toolbar"
+                toolbarname="&toolbar.name;"
+                context="aios-toolbar-contextmenu"
+                fullscreentoolbar="true"
+                toolboxid="navigator-toolbox"
+                customizable="true"
+                mode="icons"
+                iconsize="large"
+                persist="posMode mode iconsize flexbuttons hidden"
                 defaultset="bookmarks-button,history-button,separator,downloads-button,addons-button,separator,multipanel-button,pageinfo-button"
-                toolboxid="navigator-toolbox" fullscreentoolbar="true" >
+                orient="vertical"
+                flex="1"
+
+                toolbarlabel="&toolbar.label;:"
+                posMode="1"
+                flexbuttons="false">
             </toolbar>
 
             <toolbarset />
         </toolbox>
 
 
-	<!-- TOOLBOX RECHTS NEBEN DER SIDEBAR -->
+    <!-- TOOLBOX RECHTS NEBEN DER SIDEBAR -->
         <toolbox id="aios-toolbox-right" insertbefore="sidebar-splitter" defaultmode="icons" class="chromeclass-toolbar" vertical="true" palette="BrowserToolbarPalette">
 
             <observes element="aios-toolbar" attribute="mode" />
@@ -523,7 +538,7 @@
             <!-- SIDEBARHEADER -->
             <sidebarheader id="sidebar-header" tooltip="sidebarheader-tooltip">
 
-		<!-- Attribut wird in CSS benoetigt (aios.css) -->
+        <!-- Attribut wird in CSS benoetigt (aios.css) -->
                 <observes element="aios-sbhtoolbar" attribute="iconsize" />
 
                 <toolbarbutton id="sidebars-titlebutton" type="menu" ondblclick="this.childNodes[1].hidePopup();" flex="1" position="1">
@@ -541,9 +556,18 @@
                     <observes element="aios-sbhtoolbar" attribute="defaultmode" />
                     <observes element="aios-sbhtoolbar" attribute="iconsize" />
 
-                    <toolbar id="aios-sbhtoolbar" toolbarname="&sbhtoolbar.name;" context="aios-sbhtoolbar-contextmenu" customizable="true" class="chromeclass-toolbar"
-                        mode="icons" iconsize="small" flexbuttons="false" persist="mode iconsize"
-                        defaultset="autohide-button,paneltab-button,sidebarclose-button" toolboxid="navigator-toolbox" >
+                    <toolbar id="aios-sbhtoolbar" class="chromeclass-toolbar"
+                        toolbarname="&sbhtoolbar.name;"
+                        context="aios-sbhtoolbar-contextmenu"
+                        toolboxid="navigator-toolbox"
+                        customizable="true"
+                        mode="icons"
+                        iconsize="small"
+                        persist="mode iconsize"
+                        defaultset="autohide-button,paneltab-button,sidebarclose-button"
+
+                        toolbarlabel="&sbhtoolbar.label;:"
+                        flexbuttons="false" >
 
                         <!-- verhindert, dass die Toolbar in einen anderen Modus ausser Icons versetzt wird -->
                         <observes element="aios-sbhtoolbar" attribute="mode" onbroadcast="document.getElementById('aios-sbhtoolbar').setAttribute('mode', 'icons');" />
@@ -578,7 +602,4 @@
 
     </hbox>
 
-
-    <toolbox id="navigator-toolbox" palette="BrowserToolbarPalette" />
-
 </overlay>
\ No newline at end of file
diff --git a/content/aios_compatibility.js b/content/aios_compatibility.js
old mode 100755
new mode 100644
index 9805a06..b28c3ea
--- a/content/aios_compatibility.js
+++ b/content/aios_compatibility.js
@@ -59,17 +59,17 @@ var AiOS_Compatibility = {};
 
             if(itemCmd.indexOf("toOpenWindowByType('Download:Manager'") >= 0) {
 
-                //newCmd = 'aios_WIN.aiosIsWindow = true; window.setTimeout(function(){ aios_WIN.aiosIsWindow=false; }, 500);' + itemCmd;
+                //newCmd = 'AiOS_HELPER.mostRecentWindow.aiosIsWindow = true; window.setTimeout(function(){ AiOS_HELPER.mostRecentWindow.aiosIsWindow=false; }, 500);' + itemCmd;
                 //mmttMenuItems[i].setAttribute('on//command', newCmd);
 
                 mmttMenuItems[i].removeAttribute('oncommand');
 
                 mmttMenuItems[i].addEventListener("command", function() {
 
-                    aios_WIN.aiosIsWindow = true;
+                    AiOS_HELPER.mostRecentWindow.aiosIsWindow = true;
 
                     window.setTimeout(function() {
-                        aios_WIN.aiosIsWindow = false;
+                        AiOS_HELPER.mostRecentWindow.aiosIsWindow = false;
                     }, 500);
 
                 });
diff --git a/content/aios_customize.xul b/content/aios_customize.xul
deleted file mode 100755
index b02fd80..0000000
--- a/content/aios_customize.xul
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" ?>
-
-<overlay id="aiosOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-    <!-- scripts -->
-    <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
-    <script type="application/x-javascript" src="chrome://aios/content/aios_tbx_customize.js" />
-    <script type="application/x-javascript" src="chrome://aios/content/aios_compatibility.js" />
-
-    <!-- Elements - taken from TotalToolbar 1.8 by alta88 */ -->
-    <window id="CustomizeToolbarWindow" persist="screenX screenY width height"/>
-
-</overlay>
\ No newline at end of file
diff --git a/content/aios_fx.js b/content/aios_fx.js
old mode 100755
new mode 100644
index 9f3596c..dc19ec4
--- a/content/aios_fx.js
+++ b/content/aios_fx.js
@@ -151,7 +151,7 @@ if(aios_collapseSidebar) BrowserStartup = function() {
 
 //@line 1362 "e:\builds\moz2_slave\rel-m-beta-w32-bld\build\browser\base\content\browser.js"
     //mod by exxile: updateAppButtonDisplay();
-    if(aios_appOS != "Darwin") updateAppButtonDisplay();
+    if(AiOS_HELPER.os != "Darwin") updateAppButtonDisplay();
 //@line 1364 "e:\builds\moz2_slave\rel-m-beta-w32-bld\build\browser\base\content\browser.js"
 
   CombinedStopReload.init();
@@ -178,6 +178,9 @@ if(aios_collapseSidebar) BrowserStartup = function() {
 */
 
 
+/*
+  from chrome://browser/content/browser.js
+*/
 
 /**
  * Opens or closes the sidebar identified by commandID.
@@ -199,15 +202,20 @@ if(aios_collapseSidebar) BrowserStartup = function() {
  *                 it changes the sidebar's visibility.
  *  - group        this attribute must be set to "sidebar".
  */
+// modified by exxile
+//    => original: function toggleSidebar(commandID, forceOpen) {
 if(aios_collapseSidebar) toggleSidebar = function(commandID, forceOpen) {
+// end modified by exxile
 
   var sidebarBox = document.getElementById("sidebar-box");
   if (!commandID)
     commandID = sidebarBox.getAttribute("sidebarcommand");
 
-  //add by exxile => sonst gibt es Fehler bei der 2. Druckvorschau, wenn SidebarCollapsing aktiv ist und die Sidebar zugeklappt
-  // => commandID ist in diesem Fall nicht definiert
+  // added by exxile
+  //    => sonst gibt es Fehler bei der 2. Druckvorschau, wenn SidebarCollapsing aktiv ist und die Sidebar zugeklappt
+  //    => commandID ist in diesem Fall nicht definiert
   if(!commandID) return;
+  // end added by exxile
 
   var sidebarBroadcaster = document.getElementById(commandID);
   var sidebar = document.getElementById("sidebar"); // xul:browser
@@ -227,15 +235,19 @@ if(aios_collapseSidebar) toggleSidebar = function(commandID, forceOpen) {
       sidebarBroadcaster.removeAttribute("checked");
       sidebarBox.setAttribute("sidebarcommand", "");
 
-      //mod by exxile sidebarTitle.value = "";
-      //mod by exxile sidebar.setAttribute("src", "about:blank");
-      //mod by exxile sidebarBox.hidden = true;
+      // commented by exxile
+      // sidebarTitle.value = "";
+      // sidebarBox.hidden = true;
+      // end commented by exxile
+
+      // added by exxile
       sidebarBox.removeAttribute('hidden');
       sidebarBox.collapsed = true;
       // CollapseByStyle-Methode sidebarBox.setAttribute('style', 'display:none;');
+      // end added by exxile
 
       sidebarSplitter.hidden = true;
-      content.focus();
+      gBrowser.selectedBrowser.focus();
     } else {
       fireSidebarFocusedEvent();
     }
@@ -246,22 +258,27 @@ if(aios_collapseSidebar) toggleSidebar = function(commandID, forceOpen) {
 
   // ..but first update the 'checked' state of all sidebar broadcasters
   var broadcasters = document.getElementsByAttribute("group", "sidebar");
-  for (var i = 0; i < broadcasters.length; ++i) {
+  for (let broadcaster of broadcasters) {
     // skip elements that observe sidebar broadcasters and random
     // other elements
-    if (broadcasters[i].localName != "broadcaster")
+    if (broadcaster.localName != "broadcaster")
       continue;
 
-    if (broadcasters[i] != sidebarBroadcaster)
-      broadcasters[i].removeAttribute("checked");
+    if (broadcaster != sidebarBroadcaster)
+      broadcaster.removeAttribute("checked");
     else
       sidebarBroadcaster.setAttribute("checked", "true");
   }
 
-  //mod by exxile sidebarBox.hidden = false;
+  // commented by exxile
+  // sidebarBox.hidden = false;
+  // end commented by exxile
+
+  // added by exxile
   sidebarBox.removeAttribute('hidden');
   sidebarBox.removeAttribute('collapsed');
   // CollapseByStyle-Methode sidebarBox.removeAttribute('style');
+  // end added by exxile
 
   sidebarSplitter.hidden = false;
 
@@ -284,4 +301,8 @@ if(aios_collapseSidebar) toggleSidebar = function(commandID, forceOpen) {
     sidebar.addEventListener("load", sidebarOnLoad, true);
   else // older code handled this case, so we do it too
     fireSidebarFocusedEvent();
-}
\ No newline at end of file
+
+// modified by exxile
+//    => original: }
+};
+// end modified by exxile
\ No newline at end of file
diff --git a/content/aios.js b/content/aios_old.js
old mode 100755
new mode 100644
similarity index 78%
copy from content/aios.js
copy to content/aios_old.js
index 0162c73..00ec1a0
--- a/content/aios.js
+++ b/content/aios_old.js
@@ -21,7 +21,7 @@ var aios_enterFullScreen = 0;
 var aios_leaveFullScreen = 0;
 
 // Sidebar nur zusammenklappen statt schliessen
-var aios_collapseSidebar = aios_gPrefBranch.getBoolPref('collapse');
+var aios_collapseSidebar = AiOS_HELPER.prefBranchAiOS.getBoolPref('collapse');
 
 
 function aios_getObjects() {
@@ -38,8 +38,8 @@ function aios_getObjects() {
         aios_toggleBar = document.getElementById('aios-toggle-toolbar');
 
         // broadcaster in aios.xul mit gespeichertem Wunsch-Toolbar-Zustand
-        // 	=> gespeichert durch onViewToolbarCommand() in tbx.js (AiOS < 0.7.7)
-        // 	=> gespeichert/gesetzt durch aios_toggleToolbar()
+        //  => gespeichert durch onViewToolbarCommand() in tbx.js (AiOS < 0.7.7)
+        //  => gespeichert/gesetzt durch aios_toggleToolbar()
         aios_toggleSwitchItem = document.getElementById('aios-viewTogglebar');
         aios_toggleToolbarItem = document.getElementById('aios-viewToolbar');
 
@@ -56,8 +56,8 @@ function aios_getObjects() {
 
 
 /*
-	Initialisierung
-		=> Aufruf durch das onload-Event
+    Initialisierung
+        => Aufruf durch das onload-Event
 */
 function aios_initSidebar() {
     aios_getObjects();
@@ -68,7 +68,7 @@ function aios_initSidebar() {
     }*/
 
     // MacOS X => Tastaturkuerzel ersetzen (Strg. wird durch Command ersetzt und Umschalt durch das Symbol dafuer)
-    if(aios_appOS == "Darwin") {
+    if(AiOS_HELPER.os == "Darwin") {
         aios_replaceKey('switch-tooltip-box', 'r2c2', 'command');
         aios_replaceKey('template-sidebar-tooltip-box', 'r2c2', 'command');
         aios_replaceKey('template-window-tooltip-box', 'r2c2', 'command');
@@ -84,9 +84,6 @@ function aios_initSidebar() {
         aios_replaceKey('sidebarheader-tooltip-box', 'r1c2', 'shift');
     }
 
-    // fuer CSS-Zwecke speichern
-    aios_appInfo(fx_mainWindow);
-
     // Sidebar li. oder re.
     // Eigenschaftenzuweisung fuer CSS (LTR <=> RTL; Sidebar links <=> rechts)
     aios_setSidebarOrient();
@@ -167,9 +164,9 @@ function aios_initSidebar() {
 
     // Sidebar, Toolbar u. Switch beim Start gem. Einstellungen
     try {
-        var sidebarInit = aios_gPrefBranch.getCharPref('gen.init');
-        var toolbarInit = aios_gPrefBranch.getIntPref('gen.toolbar.init');
-        var switchInit = aios_gPrefBranch.getIntPref('gen.switch.init');
+        var sidebarInit = AiOS_HELPER.prefBranchAiOS.getCharPref('gen.init');
+        var toolbarInit = AiOS_HELPER.prefBranchAiOS.getIntPref('gen.toolbar.init');
+        var switchInit = AiOS_HELPER.prefBranchAiOS.getIntPref('gen.switch.init');
 
         // Sidebar beim Start oeffnen
         if(sidebarInit == "open") toggleSidebar(fx_sidebarBox.getAttribute('aiosLastPanel'), true);
@@ -207,8 +204,8 @@ function aios_initSidebar() {
 
     // Drag&Drop-Funktion fuer den Sidebar-Umschalter deaktivieren?
     try {
-        var switchDrag = aios_gPrefBranch.getBoolPref("gen.switch.drag");
-        var switchDelay = aios_gPrefBranch.getIntPref("gen.switch.delay");
+        var switchDrag = AiOS_HELPER.prefBranchAiOS.getBoolPref("gen.switch.drag");
+        var switchDelay = AiOS_HELPER.prefBranchAiOS.getIntPref("gen.switch.delay");
 
         if(!switchDrag) elem_switch.removeAttribute('ondragenter');
     }
@@ -216,7 +213,7 @@ function aios_initSidebar() {
 
     // Changelog anzeigen?
     try {
-        var changelog = aios_gPrefBranch.getCharPref('changelog');
+        var changelog = AiOS_HELPER.prefBranchAiOS.getCharPref('changelog');
     }
     catch(e) { }
 
@@ -233,8 +230,8 @@ function aios_initSidebar() {
                 var aiosUpdated = (changelog != "") ? true : false;
 
                 try {
-                    aios_gPrefBranch.setCharPref('changelog', aiosVersion);
-                    var changelog_new = aios_gPrefBranch.getCharPref('changelog');
+                    AiOS_HELPER.prefBranchAiOS.setCharPref('changelog', aiosVersion);
+                    var changelog_new = AiOS_HELPER.prefBranchAiOS.getCharPref('changelog');
                 }
                 catch(e) { }
 
@@ -253,7 +250,7 @@ function aios_initSidebar() {
 
     // vertikale Buttons?
     try {
-        var vButtons = aios_gPrefBranch.getBoolPref("vbuttons");
+        var vButtons = AiOS_HELPER.prefBranchAiOS.getBoolPref("vbuttons");
 
         fx_mainWindow.setAttribute('aiosVButtons', 'true');
         if(!vButtons) fx_mainWindow.setAttribute('aiosVButtons', 'false');
@@ -270,8 +267,8 @@ function aios_initSidebar() {
 
 
 /*
-	stellt bei Doppelklick auf den Sidebarheader die Standardgroesse der Sidebar wieder her
-		=> Aufruf durch EventListener auf dem Header, gesetzt in aios_initSidebar()
+    stellt bei Doppelklick auf den Sidebarheader die Standardgroesse der Sidebar wieder her
+        => Aufruf durch EventListener auf dem Header, gesetzt in aios_initSidebar()
 */
 function aios_setSidebarWidth(event) {
     aios_getObjects();
@@ -283,8 +280,8 @@ function aios_setSidebarWidth(event) {
     }
 
     try {
-        var sWidthVal = aios_gPrefBranch.getIntPref('gen.width.' + mode + 'Val');
-        var sWidthUnit = aios_gPrefBranch.getCharPref('gen.width.' + mode + 'Unit');
+        var sWidthVal = AiOS_HELPER.prefBranchAiOS.getIntPref('gen.width.' + mode + 'Val');
+        var sWidthUnit = AiOS_HELPER.prefBranchAiOS.getCharPref('gen.width.' + mode + 'Unit');
 
         if(sWidthUnit == "%") {
             var browserWidth = aios_getBrowserWidth();
@@ -302,23 +299,23 @@ function aios_setSidebarWidth(event) {
 
 /*
 stellt die Anzeige der Sidebar ein
-		=> Aufruf durch aios_initSidebar() und aios_savePrefs() in prefs.js
-		=> 1 = links, 2 = rechts
+        => Aufruf durch aios_initSidebar() und aios_savePrefs() in prefs.js
+        => 1 = links, 2 = rechts
 */
 function aios_setSidebarOrient() {
     aios_getObjects();
 
     try {
         // Sidebar-Ausrichtung
-        var sidebarOrient = aios_gPrefBranch.getIntPref('gen.orient');
+        var sidebarOrient = AiOS_HELPER.prefBranchAiOS.getIntPref('gen.orient');
         fx_mainWindow.setAttribute('aiosOrient', 'left');
         if(sidebarOrient == 2) fx_mainWindow.setAttribute('aiosOrient', 'right');
         //document.persist(fx_mainWindow.id, 'aiosOrient');
 
         // Links-Rechts <=> Rechts-Links
-        var cStyleWindow = document.defaultView.getComputedStyle(fx_mainWindow, '');
+        //var cStyleWindow = document.defaultView.getComputedStyle(fx_mainWindow, '');
         fx_mainWindow.setAttribute('aiosMode', 'ltr');
-        if(cStyleWindow.direction == "rtl") fx_mainWindow.setAttribute('aiosMode', 'rtl');
+        //if(typeof cStyleWindow === 'object' && typeof cStyleWindow.direction === 'string' && cStyleWindow.direction == "rtl") fx_mainWindow.setAttribute('aiosMode', 'rtl');
         //document.persist(fx_mainWindow.id, 'aiosMode');
 
         // Fix fuer MileWideBack
@@ -336,8 +333,8 @@ function aios_setSidebarOrient() {
 
 
 /*
-	Sidebar-Status auf Veraenderungen ueberwachen
-		=> Aufruf durch observes-Elemente (hidden und collapsed) in 'sidebar-box'
+    Sidebar-Status auf Veraenderungen ueberwachen
+        => Aufruf durch observes-Elemente (hidden und collapsed) in 'sidebar-box'
 */
 function aios_observeSidebar(mode) {
     aios_getObjects();
@@ -371,8 +368,8 @@ function aios_observeSidebar(mode) {
 
 
 /*
-	Letzte Sidebar merken und als persist speichern
-		=> Aufruf durch observes-Element in 'sidebar-box' und aios_modSidebarMenu()
+    Letzte Sidebar merken und als persist speichern
+        => Aufruf durch observes-Element in 'sidebar-box' und aios_modSidebarMenu()
 */
 function aios_remLastSidebar() {
     aios_getObjects();
@@ -408,8 +405,8 @@ function aios_remLastSidebar() {
 
 
 /*
-	toggelt die Sidebar im Opera-Verhalten
-		=> Aufruf durch aios_toggleSidebar() fuer Elemente im Opera-Verhalten
+    toggelt die Sidebar im Opera-Verhalten
+        => Aufruf durch aios_toggleSidebar() fuer Elemente im Opera-Verhalten
 */
 function aios_toggleOperaMode(aForcePanel, aForceOpen) {
     aios_getObjects();
@@ -417,9 +414,9 @@ function aios_toggleOperaMode(aForcePanel, aForceOpen) {
     var showToolbar = aios_getBoolean(aios_toggleToolbarItem, 'checked');
 
     // zu oeffnende Sidebar feststellen
-    var openPanel = fx_sidebarBox.getAttribute('aiosLastPanel');						// zuletzt geoeffnete Sidebar
-    if(openPanel == "") openPanel = "viewBookmarksSidebar";								// Lesezeichen wenn keine Sidebar geoeffnet war
-    if(aForcePanel) openPanel = aForcePanel;											// bestimmte Sidebar gewuenscht (bei jedem oeffnen)
+    var openPanel = fx_sidebarBox.getAttribute('aiosLastPanel');                        // zuletzt geoeffnete Sidebar
+    if(openPanel == "") openPanel = "viewBookmarksSidebar";                             // Lesezeichen wenn keine Sidebar geoeffnet war
+    if(aForcePanel) openPanel = aForcePanel;                                            // bestimmte Sidebar gewuenscht (bei jedem oeffnen)
 
     // vertikaler Toolbar-Modus
     if(aios_toolbar.orient == "vertical") {
@@ -429,24 +426,24 @@ function aios_toggleOperaMode(aForcePanel, aForceOpen) {
 
             // wenn die Sidebar sichtbar ist
             if(!aios_isSidebarHidden() && !aForceOpen) {
-                fx_sidebarBox.setAttribute("aiosShouldOpen", true);							// Zustand der Sidebar merken (sichtbar)
+                fx_sidebarBox.setAttribute("aiosShouldOpen", true);                         // Zustand der Sidebar merken (sichtbar)
                 document.persist(fx_sidebarBox.id, 'aiosShouldOpen');
-                toggleSidebar();															// Sidebar ausblenden
+                toggleSidebar();                                                            // Sidebar ausblenden
             }
             else {
-                fx_sidebarBox.setAttribute("aiosShouldOpen", false);						// Zustand der Sidebar merken (unsichtbar)
+                fx_sidebarBox.setAttribute("aiosShouldOpen", false);                        // Zustand der Sidebar merken (unsichtbar)
                 document.persist(fx_sidebarBox.id, 'aiosShouldOpen');
             }
 
             //aios_toolbar.setAttribute('hidden', true);
-            //if(!aForceOpen) onViewToolbarCommand(true);									// Toolbar ausblenden
-            if(!aForceOpen) aios_toggleToolbar(true);										// Toolbar ausblenden
+            //if(!aForceOpen) onViewToolbarCommand(true);                                   // Toolbar ausblenden
+            if(!aForceOpen) aios_toggleToolbar(true);                                       // Toolbar ausblenden
         }
         // wenn die Toolbar nicht sichtbar ist
         else {
-            if(showToolbar)																	// Toolbar anzeigen?
-                aios_toggleToolbar(false);												// Toolbar einblenden
-            //onViewToolbarCommand(false);												// Toolbar einblenden
+            if(showToolbar)                                                                 // Toolbar anzeigen?
+                aios_toggleToolbar(false);                                              // Toolbar einblenden
+            //onViewToolbarCommand(false);                                              // Toolbar einblenden
             //aios_toolbar.setAttribute('hidden', false);
 
             // wenn Sidebar angezeigt werden soll (Status vor dem letzten Schliessen) oder die Toolbar abgeschaltet wurde
@@ -457,9 +454,9 @@ function aios_toggleOperaMode(aForcePanel, aForceOpen) {
     else {
         // wenn die Sidebar sichtbar ist
         if(!aios_isSidebarHidden()) {
-            fx_sidebarBox.setAttribute("aiosShouldOpen", true);							// Zustand der Sidebar merken (sichtbar)
+            fx_sidebarBox.setAttribute("aiosShouldOpen", true);                         // Zustand der Sidebar merken (sichtbar)
             document.persist(fx_sidebarBox.id, 'aiosShouldOpen');
-            toggleSidebar();															// Sidebar ausblenden
+            toggleSidebar();                                                            // Sidebar ausblenden
         }
         else {
             if(lastPanel == "") toggleSidebar(openPanel);
@@ -472,8 +469,8 @@ function aios_toggleOperaMode(aForcePanel, aForceOpen) {
 
 
 /*
-	klont das Firefox-Sidebar-Menue fuer die Sidebars-Buttons
-		=> Aufruf durch Menuebutton-Events 'onpopupshowing' aufgerufen
+    klont das Firefox-Sidebar-Menue fuer die Sidebars-Buttons
+        => Aufruf durch Menuebutton-Events 'onpopupshowing' aufgerufen
 */
 function aios_getSidebarMenu(aPopup) {
 
@@ -483,8 +480,8 @@ function aios_getSidebarMenu(aPopup) {
     aios_modSidebarMenu();
 
     /*var aios_sidebarMenu = fx_sidebarMenu.cloneNode(true);
-	aios_sidebarMenu.setAttribute('onpopupshowing', 'aios_getSidebarMenu(this);');
-	aPopup.parentNode.replaceChild(aios_sidebarMenu, aPopup);*/
+    aios_sidebarMenu.setAttribute('onpopupshowing', 'aios_getSidebarMenu(this);');
+    aPopup.parentNode.replaceChild(aios_sidebarMenu, aPopup);*/
 
     while(aPopup.hasChildNodes()) {
         aPopup.removeChild(aPopup.firstChild);
@@ -497,22 +494,22 @@ function aios_getSidebarMenu(aPopup) {
 
 
 /*
-	schliesst die Sidebar, wenn die Maus den Content-Bereich ueberfaehrt
-		=> Aufruf durch mouseover des 'appcontent' und des Sidebar-Switches (mit Uebergabe von mode)
+    schliesst die Sidebar, wenn die Maus den Content-Bereich ueberfaehrt
+        => Aufruf durch mouse-over des 'appcontent' und des Sidebar-Switches (mit Uebergabe von mode)
 
-		=> aios_initSidebar() fuegt dem Object "sidebar-box" einen mouseover-Event hinzu,...
-		=> dieser mouseover-Event fuegt dem "appcontent" einen mouseover-Event hinzu,...
-		=> der diese Funktion aufruft
+        => aios_initSidebar() fuegt dem Object "sidebar-box" einen mouse-over-Event hinzu,...
+        => dieser mouse-over-Event fuegt dem "appcontent" einen mouse-over-Event hinzu,...
+        => der diese Funktion aufruft
 */
 var aios_autoTimeout;
 function aios_autoShowHide(mode) {
     //try {
     var autobutton = aios_getBoolean('aios-enableAutohide', 'checked');
 
-    var autoshow = aios_gPrefBranch.getBoolPref('gen.switch.autoshow');
-    var onlymax = aios_gPrefBranch.getBoolPref('gen.switch.onlymax');
-    var delay = aios_gPrefBranch.getIntPref('gen.switch.delay');
-    var hidemethod = aios_gPrefBranch.getIntPref('gen.switch.hidemethod');
+    var autoshow = AiOS_HELPER.prefBranchAiOS.getBoolPref('gen.switch.autoshow');
+    var onlymax = AiOS_HELPER.prefBranchAiOS.getBoolPref('gen.switch.onlymax');
+    var delay = AiOS_HELPER.prefBranchAiOS.getIntPref('gen.switch.delay');
+    var hidemethod = AiOS_HELPER.prefBranchAiOS.getIntPref('gen.switch.hidemethod');
 
     //alert(mode);
 
@@ -554,7 +551,7 @@ function aios_autoShowHide(mode) {
         if(!aios_isSidebarHidden() && hidemethod == 1) {
 
             // Event auf "appcontent" wieder loeschen, weil sonst die Sidebar wieder eingeblendet wuerde
-            // => mouseover der Sidebar (in aios_initSidebar()) fuegt dem "appcontent" dieses Feature wieder hinzu
+            // => mouse-over der Sidebar (in aios_initSidebar()) fuegt dem "appcontent" dieses Feature wieder hinzu
             document.getElementById('appcontent').removeEventListener("mouseover", aios_autoShowHide, true);
 
             // nach bestimmter Zeit ausblenden
@@ -576,16 +573,16 @@ function aios_autoShowHide(mode) {
 
 
 /*
-	aktiviert/deaktiviert die Sidebar/Toolbar/Switch je nach Element und Einstellungen
-		=> Aufruf durch Toggle-Button, Switch, Shortcut, Open/Close-Menuitems, Sidebar-Close-Button
-			=> mode 1: nur die Sidebar oeffnen/schliessen
-			=> mode 2: Sidebar und Toolbar oeffnen/schliessen
-			=> mode 3: Sidebar, Toolbar und Togglebar oeffnen/schliessen
-			=> mode 4: Opera-Verhalten
+    aktiviert/deaktiviert die Sidebar/Toolbar/Switch je nach Element und Einstellungen
+        => Aufruf durch Toggle-Button, Switch, Shortcut, Open/Close-Menuitems, Sidebar-Close-Button
+            => mode 1: nur die Sidebar oeffnen/schliessen
+            => mode 2: Sidebar und Toolbar oeffnen/schliessen
+            => mode 3: Sidebar, Toolbar und Togglebar oeffnen/schliessen
+            => mode 4: Opera-Verhalten
 */
 function aios_toggleSidebar(aMode, aForceOpen) {
     aios_getObjects();
-    //aForceOpen = false;			// erlaubt das automatische ein-/ausblenden waehrend Drag auf Sidebar Switch
+    //aForceOpen = false;           // erlaubt das automatische ein-/ausblenden waehrend Drag auf Sidebar Switch
 
     var prefstring = "key";
     if(aMode == elem_switch || aMode == "switch") prefstring = "switch";
@@ -593,7 +590,7 @@ function aios_toggleSidebar(aMode, aForceOpen) {
     if(aMode == elem_close || aMode == elem_close2 || aMode == "close") prefstring = "close";
 
     try {
-        var mode = aios_gPrefBranch.getIntPref('cmode.' + prefstring);
+        var mode = AiOS_HELPER.prefBranchAiOS.getIntPref('cmode.' + prefstring);
         var toolBox_enabled = aios_getBoolean('aios-viewToolbar', 'checked');
         var toggleBox_enabled = aios_getBoolean(aios_toggleSwitchItem, 'checked');
 
@@ -606,7 +603,7 @@ function aios_toggleSidebar(aMode, aForceOpen) {
 
         // bestimmtes Panel laden?
         var forcePanel;
-        var openPanel = aios_gPrefBranch.getCharPref("gen.open.init");
+        var openPanel = AiOS_HELPER.prefBranchAiOS.getCharPref("gen.open.init");
         if(openPanel != "rem" && (prefstring == "key" || prefstring == "switch" || prefstring == "tbb")) forcePanel = openPanel;
         else forcePanel = false;
 
@@ -645,15 +642,15 @@ function aios_toggleSidebar(aMode, aForceOpen) {
 
 
 /*
-	Sidebar-Toggle per collapsed
-		=> Aufruf durch den Grippy selbst bei onClick()
+    Sidebar-Toggle per collapsed
+        => Aufruf durch den Grippy selbst bei onClick()
 */
 function aios_useGrippy() {
     fx_sidebarBox.collapsed = !fx_sidebarBox.collapsed;
 
     // Fix fuer Win Vista & 7: aiosOpen wird durch fehlenden Aufruf von aios_observeSidebar nicht gesetzt
     // aios_observeSidebar wird eigentlich durch Observer der sidebar-box aufgerufen, k.A. warum hier nicht
-    if(aios_appOS == "WINNT" && aios_appOSVersion.indexOf("5.1") == -1) aios_observeSidebar(true);
+    if(AiOS_HELPER.os == "WINNT" && AiOS_HELPER.osVersion.indexOf("5.1") == -1) aios_observeSidebar(true);
 
     /* CollapseByStyle-Methode
     if(fx_sidebarBox.getAttribute('style') != "") fx_sidebarBox.removeAttribute('style');
@@ -662,9 +659,9 @@ function aios_useGrippy() {
 
 
 /*
-	aktiviert/deaktiviert den schmalen Sidebar-Umschalter
-		=> Aufruf durch Event-Listener "onresize", observer (sizemode) in tbx.xul,
-			 aios_BrowserFullScreen() und aios_savePrefs() in prefs.js
+    aktiviert/deaktiviert den schmalen Sidebar-Umschalter
+        => Aufruf durch Event-Listener "onresize", observer (sizemode) in tbx.xul,
+             aios_BrowserFullScreen() und aios_savePrefs() in prefs.js
 */
 function aios_checkThinSwitch() {
     if(!initialised) return;
@@ -674,11 +671,11 @@ function aios_checkThinSwitch() {
     var thin_switch, thinmax_switch, switch_width, switch_twidth, athin_switch;
 
     try {
-        thin_switch = aios_gPrefBranch.getBoolPref('gen.switch.thin');
-        thinmax_switch = aios_gPrefBranch.getBoolPref('gen.switch.thinmax');
+        thin_switch = AiOS_HELPER.prefBranchAiOS.getBoolPref('gen.switch.thin');
+        thinmax_switch = AiOS_HELPER.prefBranchAiOS.getBoolPref('gen.switch.thinmax');
 
-        switch_width = aios_gPrefBranch.getIntPref('gen.switch.width');
-        switch_twidth = aios_gPrefBranch.getIntPref('gen.switch.twidth');
+        switch_width = AiOS_HELPER.prefBranchAiOS.getIntPref('gen.switch.width');
+        switch_twidth = AiOS_HELPER.prefBranchAiOS.getIntPref('gen.switch.twidth');
 
         // soll er schmal sein?
         var thin = thin_switch;
@@ -723,21 +720,21 @@ function aios_controlSwitch(ev, which) {
 
 
 /*
-	Erweitert die FF-Funktion BrowserFullScreen() zur Steuerung der AIOS-Elemente
-		=> Aufruf durch aios_initSidebar()
+    Erweitert die FF-Funktion BrowserFullScreen() zur Steuerung der AIOS-Elemente
+        => Aufruf durch aios_initSidebar()
 */
 function aios_BrowserFullScreen() {
     aios_getObjects();
 
     try {
-        var enable_restore = aios_gPrefBranch.getBoolPref('fs.restore');
+        var enable_restore = AiOS_HELPER.prefBranchAiOS.getBoolPref('fs.restore');
     }
     catch(e) {
         return false;
     }
 
     // Fullscreen an
-    // 	=> Elemente ausblenden
+    //  => Elemente ausblenden
     if(document.mozFullScreenElement) {
 
         // Fix für mehrmaliges feuern des mozfullscreenchange events
@@ -747,9 +744,9 @@ function aios_BrowserFullScreen() {
 
         try {
             // Soll-Zustaende
-            var close_switch = aios_gPrefBranch.getBoolPref('fs.switch');
-            var close_toolbar = aios_gPrefBranch.getBoolPref('fs.toolbar');
-            var close_sidebar = aios_gPrefBranch.getBoolPref('fs.sidebar');
+            var close_switch = AiOS_HELPER.prefBranchAiOS.getBoolPref('fs.switch');
+            var close_toolbar = AiOS_HELPER.prefBranchAiOS.getBoolPref('fs.toolbar');
+            var close_sidebar = AiOS_HELPER.prefBranchAiOS.getBoolPref('fs.sidebar');
 
             // Ist-Zustaende
             var rem_switchHidden = aios_getBoolean(aios_toggleBox, 'hidden');
@@ -786,7 +783,7 @@ function aios_BrowserFullScreen() {
         }
     }
     // Fullscreen aus
-    // 	=> Elemente einblenden
+    //  => Elemente einblenden
     else {
 
         // Fix für mehrmaliges feuern des mozfullscreenchange events
diff --git a/content/aios_tbx.js b/content/aios_tbx.js
old mode 100755
new mode 100644
index 6ac6100..8a19bf1
--- a/content/aios_tbx.js
+++ b/content/aios_tbx.js
@@ -1,43 +1,8 @@
-
-/* Clean up options from root doc for removed or empty toolbars */
-/* Original: handleOptions() => taken from TotalToolbar 1.8 by alta88 */
-function handleOptions(aType, toolbar, aNavToolbox) {
-    if (toolbar.localName != "toolbar")
-        return;
-    let attr = "_toolbar." + toolbar.id + ".";
-    let toolbarOptions = ["mode",
-        "iconsize",
-        "fullscreentoolbar",
-        "flexbuttons",
-        "collapsed"];
-
-    var docElt = aNavToolbox.ownerDocument.documentElement;
-
-    toolbarOptions.forEach(function(option) {
-        if (docElt.hasAttribute(attr + option)) {
-            if (aType == "remove") {
-                if (toolbar.hasAttribute(option)) {
-                    // Remove global iconsize/mode options.
-                    toolbar.removeAttribute(option);
-                }
-                // Remove customtoolbar options.
-                docElt.removeAttribute(attr + option);
-                aNavToolbox.ownerDocument.persist(docElt.id, attr + option);
-            }
-            if (aType == "copy") {
-                let val = docElt.getAttribute(attr + option);
-                toolbar.setAttribute(option, val);
-            }
-        }
-    });
-}
-
-
 /*
-	Breite der vertikalen Toolboxen freigeben bzw. festsetzen
-		=> Aufruf durch aios_toggleToolbar(), aios_setToolbarView(), aios_setToolbarPos(), aios_customizeToolbar() und aios_BrowserFullScreen()
-		=> Aufruf indirekt auch durch aios_initSidebar() => aios_setSidebarOrient() loest aios_setToolbarPos() aus
-		=> per JS statt CSS, weil es wegen Themes dynamisch sein muss
+    Breite der vertikalen Toolboxen freigeben bzw. festsetzen
+        => Aufruf durch aios_toggleToolbar(), aios_setToolbarView(), aios_setToolbarPos(), aios_customizeToolbar() und aios_BrowserFullScreen()
+        => Aufruf indirekt auch durch aios_initSidebar() => aios_setSidebarOrient() loest aios_setToolbarPos() aus
+        => per JS statt CSS, weil es wegen Themes dynamisch sein muss
  */
 function aios_adjustToolboxWidth(aMode) {
     aios_getObjects();
@@ -101,8 +66,8 @@ function aios_adjustToolboxWidth(aMode) {
 
 
 /*
-	Ansichtoptionen der Toolbars (AiOS-Toolbar, Sidebarheader-Toolbar) initialisieren
-		=> Aufruf durch onpopupshowing-Handler der Kontextmenues in aios.xul
+    Ansichtoptionen der Toolbars (AiOS-Toolbar, Sidebarheader-Toolbar) initialisieren
+        => Aufruf durch onpopupshowing-Handler der Kontextmenues in aios.xul
  */
 function aios_onToolbarPopupShowing(aWhich) {
     aios_getObjects();
@@ -110,7 +75,7 @@ function aios_onToolbarPopupShowing(aWhich) {
     var mode;
 
     /*
-	AiOS-Toolbar
+    AiOS-Toolbar
      */
     if(aWhich.id == "aios-toolbar-contextmenu") {
 
@@ -137,7 +102,7 @@ function aios_onToolbarPopupShowing(aWhich) {
         document.getElementById('aios-view-mitem5').setAttribute('checked', aios_toolbar.getAttribute('flexbuttons') == "true");
 
         /*/ keine Konfigurationsmoeglichkeiten in Mac OS X
-        if(aios_appOS == "Darwin") {
+        if(AiOS_HELPER.os == "Darwin") {
             if(document.getElementById('aios-customize-separator'))
                 document.getElementById('aios-toolbar-contextmenu').removeChild(document.getElementById('aios-customize-separator'));
 
@@ -146,7 +111,7 @@ function aios_onToolbarPopupShowing(aWhich) {
         }*/
     }
     /*
-	Sidebarheader-Toolbar
+    Sidebarheader-Toolbar
      */
     else if(aWhich.id == "aios-sbhtoolbar-contextmenu") {
 
@@ -158,7 +123,7 @@ function aios_onToolbarPopupShowing(aWhich) {
         fx_sidebarHeader.setAttribute('iconsize', aios_gElem("aios-sbhtoolbar").getAttribute('iconsize'));
 
         /*/ keine Konfigurationsmoeglichkeiten in Mac OS X
-        if(aios_appOS == "Darwin") {
+        if(AiOS_HELPER.os == "Darwin") {
             if(document.getElementById('aios-sbhcustomize-separator'))
                 document.getElementById('aios-sbhtoolbar-contextmenu').removeChild(document.getElementById('aios-sbhcustomize-separator'));
 
@@ -170,14 +135,14 @@ function aios_onToolbarPopupShowing(aWhich) {
 
 
 /*
-	positioniert die AiOS- und die Sidebarheader-Toolbar
-		=> Aufruf durch die Menueoptionen des Kontextmenues und aios_setSidebarOrient()
-		=> Aufruf indirekt auch durch aios_initSidebar() => aios_setSidebarOrient() loest aios_setToolbarPos() aus
-			=> posMode 1 = links neben der Sidebar (vertikal)
-			=> posMode 2 = rechts neben der Sidebar (vertikal)
-			=> posMode 3 = ueber dem Sidebarheader (horizontal)
-			=> posMode 4 = unter dem Sidebarheader (horizontal)
-			=> posMode 5 = unter der Sidebar (horizontal)
+    positioniert die AiOS- und die Sidebarheader-Toolbar
+        => Aufruf durch die Menueoptionen des Kontextmenues und aios_setSidebarOrient()
+        => Aufruf indirekt auch durch aios_initSidebar() => aios_setSidebarOrient() loest aios_setToolbarPos() aus
+            => posMode 1 = links neben der Sidebar (vertikal)
+            => posMode 2 = rechts neben der Sidebar (vertikal)
+            => posMode 3 = ueber dem Sidebarheader (horizontal)
+            => posMode 4 = unter dem Sidebarheader (horizontal)
+            => posMode 5 = unter der Sidebar (horizontal)
  */
 function aios_setToolbarPos(posMode) {
     aios_getObjects();
@@ -187,7 +152,7 @@ function aios_setToolbarPos(posMode) {
     if(!posMode) posMode = parseInt(aios_toolbar.getAttribute('posMode'));
 
     try {
-        var sidebarOrient = aios_gPrefBranch.getIntPref('gen.orient');
+        var sidebarOrient = AiOS_HELPER.prefBranchAiOS.getIntPref('gen.orient');
     }
     catch(e) { }
 
@@ -230,13 +195,13 @@ function aios_setToolbarPos(posMode) {
 
 
 /*
-	stellt die Ansichtsoptionen der Symbolleisten ein
-		=> Aufruf durch die Menueoptionen der Symbolleisten-Kontextmenues
-			=> viewMode 1 = Symbole und Text
-			=> viewMode 2 = Symbole
-			=> viewMode 3 = Text
-			=> viewMode 4 = kleine Symbole an/aus
-			=> viewMode 5 = flexible Buttons an/aus
+    stellt die Ansichtsoptionen der Symbolleisten ein
+        => Aufruf durch die Menueoptionen der Symbolleisten-Kontextmenues
+            => viewMode 1 = Symbole und Text
+            => viewMode 2 = Symbole
+            => viewMode 3 = Text
+            => viewMode 4 = kleine Symbole an/aus
+            => viewMode 5 = flexible Buttons an/aus
  */
 function aios_setToolbarView(aViewMode, aWhich) {
     aios_getObjects();
@@ -297,9 +262,9 @@ function aios_setToolbarView(aViewMode, aWhich) {
 
 
 /*
-	Aktiviert/Deaktiviert die AiOS-Toolbar
-		=> Aufruf durch Menueoption (Ansicht > Symbolleisten)
-		=> Aufruf durch aios_observeSidebar(), aios_toggleOperaMode(), aios_toggleSidebar(), aios_controlSwitch(), aios_BrowserFullScreen
+    Aktiviert/Deaktiviert die AiOS-Toolbar
+        => Aufruf durch Menueoption (Ansicht > Symbolleisten)
+        => Aufruf durch aios_observeSidebar(), aios_toggleOperaMode(), aios_toggleSidebar(), aios_controlSwitch(), aios_BrowserFullScreen
  */
 function aios_toggleToolbar(aWhich) {
     aios_getObjects();
@@ -320,8 +285,8 @@ function aios_toggleToolbar(aWhich) {
 
 
 /*
-	fuegt dem Menue Ansicht > Symbolleisten und dem Kontextmenue der Symbolleisten eine Option hinzu
-		=> Aufruf durch onpopupshowing-Handler der Menues in aios.xul
+    fuegt dem Menue Ansicht > Symbolleisten und dem Kontextmenue der Symbolleisten eine Option hinzu
+        => Aufruf durch onpopupshowing-Handler der Menues in aios.xul
  */
 function aios_addToolbarMitem(aWhich) {
     aios_getObjects();
diff --git a/content/aios_tbx_customize.js b/content/aios_tbx_customize.js
deleted file mode 100755
index 5a1a93b..0000000
--- a/content/aios_tbx_customize.js
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// fuer CSS-Zwecke speichern
-aios_appInfo( document.getElementById('CustomizeToolbarWindow') );
-
-
-/**
- *  Breite der vertikalen Toolbar bei jeder Aenderung der Toolbox (Drag 'n Drop) neu definieren
- **/
-var fx_toolboxChanged = toolboxChanged;
-toolboxChanged = function() {
-    fx_toolboxChanged();
-    aios_WIN.aios_adjustToolboxWidth();
-};
-
-
-/**
- *  Positionierung des Dialogs unter Mac OS X verhindern
- **/
-if(aios_appOS != "Darwin") repositionDialog = function(aWindow) {
-    // Always use persisted dimensions and position!
-    return;
-}
-
-
-/**
- * Restore the default set of buttons to fixed toolbars,
- * remove all custom toolbars, and rebuild the palette.
- */
-/* Original: restoreDefaultSet() => taken from TotalToolbar 1.8 by alta88 */
-restoreDefaultSet = function () {
-    // Unwrap the items on the toolbar.
-    unwrapToolbarItems();
-
-    // Remove all of the customized toolbars.
-    forEachCustomizableToolbar(function (toolbar) {
-        let customIndex = toolbar.getAttribute("customindex");
-        if (customIndex) {
-            // Clean up any customizations from the root doc.
-            aios_WIN.handleOptions("remove", toolbar, gToolbox);
-
-            // Reset externalToolbars list.
-            let newExternalToolbars = [];
-            gToolbox.externalToolbars.forEach(function (extToolbar, index) {
-                if (extToolbar.id != toolbar.id)
-                    newExternalToolbars.push(extToolbar);
-            });
-            gToolbox.externalToolbars = newExternalToolbars;
-
-            let toolbox = toolbar.parentNode;
-            toolbox.toolbarset.removeAttribute("toolbar"+customIndex);
-            gToolboxDocument.persist(toolbox.toolbarset.id, "toolbar"+customIndex);
-            toolbar.currentSet = "__empty";
-            toolbox.removeChild(toolbar);
-            --toolbox.customToolbarCount;
-        }
-    });
-
-    // mod by exxile: Werte fuer AiOS-Toolbar zuruecksetzen => bevor defaultset zurueckgesetzt wird => sonst fehler (zu viele separators)
-    aios_WIN.aios_setToolbarPos(1);
-    aios_WIN.aios_toolbar.setAttribute('flexbuttons', 'false');
-
-    // Restore the defaultset for fixed toolbars.
-    forEachCustomizableToolbar(function (toolbar) {
-        var defaultSet = toolbar.getAttribute("defaultset");
-        if (defaultSet)
-            toolbar.currentSet = defaultSet;
-
-        // Remove any contextmenu options.
-        aios_WIN.handleOptions("remove", toolbar, gToolbox);
-    });
-
-    // Restore the default icon size and mode.
-    document.getElementById("smallicons").checked = (updateIconSize() == "small");
-    document.getElementById("modelist").value = updateToolbarMode();
-
-    // Now rebuild the palette.
-    buildPalette();
-
-    // Now re-wrap the items on the toolbar.
-    wrapToolbarItems();
-
-    toolboxChanged("reset");
-
-    // mod by exxile: Iconsize der Sidebarheader-Toolbar zuruecksetzen => nachdem die globale Groesse zurueckgesetzt wurde
-    aios_WIN.document.getElementById('aios-sbhtoolbar').setAttribute('iconsize', 'small');
-}
\ No newline at end of file
diff --git a/content/console.js b/content/console.js
old mode 100755
new mode 100644
index bd260d7..b3dbef8
--- a/content/console.js
+++ b/content/console.js
@@ -6,14 +6,14 @@ if(document.getElementById('Console2Window')) conWindow = document.getElementByI
 
 
 /*
-	Initialisierung
-		=> Aufruf durch onload in console.xul
+    Initialisierung
+        => Aufruf durch onload in console.xul
 */
 function aios_init() {
 
     try {
-        var enable_layout = aios_gPrefBranch.getBoolPref("co.layout");
-        var enable_layoutall = aios_gPrefBranch.getBoolPref("co.layoutall");
+        var enable_layout = AiOS_HELPER.prefBranchAiOS.getBoolPref("co.layout");
+        var enable_layoutall = AiOS_HELPER.prefBranchAiOS.getBoolPref("co.layoutall");
 
         var aios_inSidebar = (top.document.getElementById('sidebar-box')) ? true : false;
     }
@@ -23,7 +23,7 @@ function aios_init() {
     aios_hideMacMenubar();
 
     // fuer CSS-Zwecke speichern
-    aios_appInfo(conWindow);
+    AiOS_HELPER.rememberAppInfo( conWindow );
 
     // Layout-Optimierungen aktivieren?
     if((enable_layout && aios_inSidebar) || enable_layoutall) aios_sidebarLayout();
@@ -34,8 +34,8 @@ function aios_init() {
 
 
 /*
-	aktiviert das an die Sidebar angepasste Layout
-		=> Aufruf durch aios_init()
+    aktiviert das an die Sidebar angepasste Layout
+        => Aufruf durch aios_init()
 */
 function aios_sidebarLayout() {
 
diff --git a/content/console.xul b/content/console.xul
old mode 100755
new mode 100644
index 0d9e842..d3da4e8
--- a/content/console.xul
+++ b/content/console.xul
@@ -2,14 +2,14 @@
 
 <overlay id="aios_consoleOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
+    <script type="application/x-javascript" src="chrome://aios/content/_helper.js" />
     <script type="application/x-javascript" src="chrome://aios/content/console.js" />
 
     <script><![CDATA[
 
-		window.addEventListener("DOMContentLoaded", aios_init, false);
+        window.addEventListener("DOMContentLoaded", aios_init, false);
 
-	]]>
+    ]]>
     </script>
 
 </overlay>
\ No newline at end of file
diff --git a/content/downloads.js b/content/downloads.js
old mode 100755
new mode 100644
index 6a1ab4b..0835291
--- a/content/downloads.js
+++ b/content/downloads.js
@@ -21,13 +21,13 @@ function aios_init() {
     aios_posElem = document.getElementById("downloadView");
 
     // fuer CSS-Zwecke speichern
-    aios_appInfo(aios_managerWindow);
+    AiOS_HELPER.rememberAppInfo( aios_managerWindow );
 
     try {
-        enable_sidebar = aios_gPrefBranch.getBoolPref("dm.sidebar");
-        enable_count = aios_gPrefBranch.getBoolPref("dm.count");
-        enable_layout = aios_gPrefBranch.getBoolPref("dm.layout");
-        enable_layoutall = aios_gPrefBranch.getBoolPref("dm.layoutall");
+        enable_sidebar = AiOS_HELPER.prefBranchAiOS.getBoolPref("dm.sidebar");
+        enable_count = AiOS_HELPER.prefBranchAiOS.getBoolPref("dm.count");
+        enable_layout = AiOS_HELPER.prefBranchAiOS.getBoolPref("dm.layout");
+        enable_layoutall = AiOS_HELPER.prefBranchAiOS.getBoolPref("dm.layoutall");
     }
     catch(e) {
         return false;
@@ -45,23 +45,23 @@ function aios_init() {
             aios_countItems();
         };
 
-		// bei neuen Downloads oder Statuswechseln den Titel aktualisieren
-		// https://developer.mozilla.org/en/DOM/Mutation_events
-		// https://developer.mozilla.org/en/DOM/DOM_Mutation_Observers
-		var dm = Components.classes["@mozilla.org/download-manager;1"]
-		         .getService(Components.interfaces.nsIDownloadManager);
-
-		dm.addListener({
-		    onStateChange : function(state, dl) { aios_countItems(); },
-		    onDownloadStateChange : function(state, dl) { aios_countItems(); }
-		});
-
-		// beim Loeschen der Downloadliste den Titel aktualisieren
-		var orig_clearDownloadList = clearDownloadList;
-		clearDownloadList = function() {
-		    orig_clearDownloadList();
-		    aios_countItems();
-		};
+        // bei neuen Downloads oder Statuswechseln den Titel aktualisieren
+        // https://developer.mozilla.org/en/DOM/Mutation_events
+        // https://developer.mozilla.org/en/DOM/DOM_Mutation_Observers
+        var dm = Components.classes["@mozilla.org/download-manager;1"]
+                 .getService(Components.interfaces.nsIDownloadManager);
+
+        dm.addListener({
+            onStateChange : function(state, dl) { aios_countItems(); },
+            onDownloadStateChange : function(state, dl) { aios_countItems(); }
+        });
+
+        // beim Loeschen der Downloadliste den Titel aktualisieren
+        var orig_clearDownloadList = clearDownloadList;
+        clearDownloadList = function() {
+            orig_clearDownloadList();
+            aios_countItems();
+        };
     }
     else {
         // Zahl im Titel entfernen
@@ -73,7 +73,7 @@ function aios_init() {
                 var newTitle = title.substring(0, title.indexOf(" ["));
                 top.document.getElementById('sidebar-title').setAttribute("value", newTitle);
 
-                if(aios_inSidebar) aios_WIN.document.getElementById("viewDownloadsSidebar").setAttribute('sidebartitle', newTitle);
+                if(aios_inSidebar) AiOS_HELPER.mostRecentWindow.document.getElementById("viewDownloadsSidebar").setAttribute('sidebartitle', newTitle);
             }
         }
     }
@@ -94,8 +94,8 @@ function aios_init() {
 
 
 /*
-	aktiviert das an die Sidebar angepasste Layout
-		=> Aufruf durch aios_init()
+    aktiviert das an die Sidebar angepasste Layout
+        => Aufruf durch aios_init()
 */
 function aios_sidebarLayout() {
     var cmdBar, i;
@@ -110,7 +110,6 @@ function aios_sidebarLayout() {
 
 
     // Buttons durch Toolbarbuttons ersetzen
-    //if(aios_WIN.aios_appDefTheme) {
     var tbChilds = cmdBar.childNodes;
     var tbutton, tobserver;
     for(i = 0; i < tbChilds.length; i++) {
@@ -125,22 +124,21 @@ function aios_sidebarLayout() {
             tbChilds[i].parentNode.replaceChild(tbutton, tbChilds[i]);
         }
     }
-//}
 }
 
 
 /*
-	zaehlt und zeigt die aktivierten und deaktivierten Extensions im Sidebartitel an
-		=> Aufruf durch aios_init()
+    zaehlt und zeigt die aktivierten und deaktivierten Extensions im Sidebartitel an
+        => Aufruf durch aios_init()
 */
 function aios_countItems() {
-    if(!aios_WIN.document) return false;
+    if(!AiOS_HELPER.mostRecentWindow.document) return false;
 
     // Fix fuer MR Tech Local Install
     var li_count = false;
 
     if(typeof Local_Install == "object") {
-        var li_gPrefBranch = aios_gPref.getBranch("local_install.");
+        var li_gPrefBranch = AiOS_HELPER.prefService.getBranch("local_install.");
         li_count = li_gPrefBranch.getBoolPref("showManagerTotals");
         if(li_count) return false;
         else Local_Install.setWindowTitle = function(){};
@@ -149,7 +147,7 @@ function aios_countItems() {
     // bisherigen Titel feststellen
     var newTitle;
     var origTitle = "";
-    if(aios_WIN.document.getElementById("viewDownloadsSidebar")) origTitle = aios_WIN.document.getElementById("viewDownloadsSidebar").getAttribute('label');
+    if(AiOS_HELPER.mostRecentWindow.document.getElementById("viewDownloadsSidebar")) origTitle = AiOS_HELPER.mostRecentWindow.document.getElementById("viewDownloadsSidebar").getAttribute('label');
 
     if(document.getElementById("viewGroup")) {
         if(document.getElementById("viewGroup").selectedItem) {
@@ -193,24 +191,24 @@ function aios_countItems() {
     if(top.document.getElementById('sidebar-title')) top.document.getElementById('sidebar-title').setAttribute("value", newTitle);
 
     // Sidebartitel im Broadcaster speichern, damit er beim Schliessen/oeffnen der Sidebar wiederhergestellt werden kann
-    if(aios_inSidebar) aios_WIN.document.getElementById("viewDownloadsSidebar").setAttribute('sidebartitle', newTitle);
+    if(aios_inSidebar) AiOS_HELPER.mostRecentWindow.document.getElementById("viewDownloadsSidebar").setAttribute('sidebartitle', newTitle);
 
     return true;
 }
 
 
 /*
-	Original-Code by Caio Chassot
-		Slim_Extension_List_0.1
-		http://v2studio.com/k/moz/
+    Original-Code by Caio Chassot
+        Slim_Extension_List_0.1
+        http://v2studio.com/k/moz/
 
-		=> Aufruf durch aios_init()
+        => Aufruf durch aios_init()
 
 function aios_filterItems(l,f) {
-	var r = [];
-	if (!f) f = function(v){return v};
-	for (var i=0; i<l.length; i++) if (f(l[i])) r.push(l[i]);
-	return r;
+    var r = [];
+    if (!f) f = function(v){return v};
+    for (var i=0; i<l.length; i++) if (f(l[i])) r.push(l[i]);
+    return r;
 }*/
 function aios_filterItems() {
     var r = [];
@@ -229,16 +227,16 @@ function aios_filterItems() {
 
 
 /*
-	legt den Sidebartitel fest (nur bei Add-ons)
-		=> Aufruf durch aios_init() und onclick-Handler auf den Radio-Buttons
+    legt den Sidebartitel fest (nur bei Add-ons)
+        => Aufruf durch aios_init() und onclick-Handler auf den Radio-Buttons
 */
 function aios_setTitle(aObj) {
     if(typeof Local_Install == "object") return false;
 
-    if(!aios_WIN.document) return false;
+    if(!AiOS_HELPER.mostRecentWindow.document) return false;
 
     var newTitle;
-    var origTitle = aios_WIN.document.getElementById("viewDownloadsSidebar").getAttribute('label');
+    var origTitle = AiOS_HELPER.mostRecentWindow.document.getElementById("viewDownloadsSidebar").getAttribute('label');
 
     var viewTitle;
 
@@ -256,7 +254,7 @@ function aios_setTitle(aObj) {
     top.document.getElementById('sidebar-title').setAttribute("value", newTitle);
 
     // Sidebartitel im Broadcaster speichern, damit er beim Schliessen/oeffnen der Sidebar wiederhergestellt werden kann
-    if(aios_inSidebar) aios_WIN.document.getElementById("viewDownloadsSidebar").setAttribute('sidebartitle', newTitle);
+    if(aios_inSidebar) AiOS_HELPER.mostRecentWindow.document.getElementById("viewDownloadsSidebar").setAttribute('sidebartitle', newTitle);
 
     return true;
 }
\ No newline at end of file
diff --git a/content/downloads.xul b/content/downloads.xul
old mode 100755
new mode 100644
index 5b71444..6aa68f1
--- a/content/downloads.xul
+++ b/content/downloads.xul
@@ -2,7 +2,7 @@
 
 <overlay id="aios_DownloadsOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
+    <script type="application/x-javascript" src="chrome://aios/content/_helper.js" />
     <script type="application/x-javascript" src="chrome://aios/content/downloads.js" />
 
     <window id="downloadManager">
diff --git a/content/downloads_alert.xul b/content/downloads_alert.xul
old mode 100755
new mode 100644
index 570bc50..31d61b0
--- a/content/downloads_alert.xul
+++ b/content/downloads_alert.xul
@@ -2,24 +2,24 @@
 
 <overlay id="aios_installOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- scripts -->
-    <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
+    <!-- scripts -->
+    <script type="application/x-javascript" src="chrome://aios/content/_helper.js" />
 
     <script><![CDATA[
 
-		function onAlertClick() {
+        function onAlertClick() {
 
-			if(window.arguments[0].indexOf("downloadIcon.png") > 0) {
-				var aiosInSidebar = aios_gPrefBranch.getBoolPref("dm.sidebar");
-				if(aiosInSidebar) aios_WIN.toggleSidebar('viewDownloadsSidebar', true);
+            if(window.arguments[0].indexOf("downloadIcon.png") > 0) {
+                var aiosInSidebar = AiOS_HELPER.prefBranchAiOS.getBoolPref("dm.sidebar");
+                if(aiosInSidebar) AiOS_HELPER.mostRecentWindow.toggleSidebar('viewDownloadsSidebar', true);
 
-				return;
-			}
+                return;
+            }
 
-			if (gAlertListener && gAlertTextClickable) gAlertListener.observe(null, "alertclickcallback", gAlertCookie);
-		}
+            if (gAlertListener && gAlertTextClickable) gAlertListener.observe(null, "alertclickcallback", gAlertCookie);
+        }
 
-	]]>
+    ]]>
     </script>
 
 </overlay>
\ No newline at end of file
diff --git a/content/multipanel.js b/content/multipanel.js
old mode 100755
new mode 100644
index e4d00b3..2a9adeb
--- a/content/multipanel.js
+++ b/content/multipanel.js
@@ -6,8 +6,8 @@ if(document.getElementById('web-panels-browser')) webPanel = document.getElement
 
 
 /*
-	Initialisierung
-		=> Aufruf durch onload in console.xul
+    Initialisierung
+        => Aufruf durch onload in console.xul
 */
 function aios_init() {
     // Sidebar-/Fenster-Titel setzen
@@ -21,12 +21,12 @@ function aios_init() {
     }, 50);
 
     // fuer CSS-Zwecke speichern
-    aios_appInfo(document.getElementById('webpanels-window'));
+    AiOS_HELPER.rememberAppInfo( document.getElementById('webpanels-window') );
 }
 
 
 /*
-	modifizierte Original-Ueberwachungsfunktion aus web-panels.js
+    modifizierte Original-Ueberwachungsfunktion aus web-panels.js
 */
 var panelProgressListener = {
     onProgressChange: function(aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress,
@@ -86,13 +86,12 @@ var panelProgressListener = {
 
 
 /*
-	Oeffnet im MultiPanel die im Browser angezeigte Webseite
-		=> Aufruf durch Buttons, aios_panelTab()
+    Oeffnet im MultiPanel die im Browser angezeigte Webseite
+        => Aufruf durch Buttons, aios_panelTab()
 */
 function aios_setMultiPanel(aMode) {
     var label, panelLoc;
-    //var aios_CONTENT = aios_APPCONTENT.childNodes[0];
-    var aios_CONTENT = aios_WIN.document.getElementById('content');
+    var aios_CONTENT = AiOS_HELPER.mostRecentWindow.document.getElementById('content');
 
     // about:-Eintraege
     if(aMode.indexOf("about:") == 0 && aMode != "about:blank") {
@@ -107,8 +106,8 @@ function aios_setMultiPanel(aMode) {
         } catch(e) { }
 
         // ich bin das MultiPanel im Tab
-        if(top.toString() == "[object Window]" && aios_WIN.aiosLastSelTab) {
-            panelLoc = aios_WIN.aiosLastSelTab.document.location.href;
+        if(top.toString() == "[object Window]" && AiOS_HELPER.mostRecentWindow.aiosLastSelTab) {
+            panelLoc = AiOS_HELPER.mostRecentWindow.aiosLastSelTab.document.location.href;
         }
     }
 
@@ -120,14 +119,14 @@ function aios_setMultiPanel(aMode) {
     var newLabel = "";
 
     // MultiPanel oeffnen bzw. Inhalt laden
-    if(top.document.getElementById('sidebar') && top.toString() != "[object Window]")	top.openWebPanel(newLabel, panelLoc);
+    if(top.document.getElementById('sidebar') && top.toString() != "[object Window]")   top.openWebPanel(newLabel, panelLoc);
     else webPanel.contentDocument.location.href = panelLoc;
 }
 
 
 /*
-	aktiviert/deaktiviert die Toolbarbuttons und Radio-Menuitems (about)
-		=> Aufruf durch onLocationChange() wenn sich MultiPanel-URL aendert (panelProgressListener)
+    aktiviert/deaktiviert die Toolbarbuttons und Radio-Menuitems (about)
+        => Aufruf durch onLocationChange() wenn sich MultiPanel-URL aendert (panelProgressListener)
 */
 function aios_setOptions() {
 
@@ -170,13 +169,13 @@ function aios_setOptions() {
 
 
 /*
-	Sidebar-Label einstellen
-		=> Aufruf durch onload-Event und onStateChange() wenn sich MultiPanel-URL aendert (panelProgressListener)
+    Sidebar-Label einstellen
+        => Aufruf durch onload-Event und onStateChange() wenn sich MultiPanel-URL aendert (panelProgressListener)
 */
 function aios_setSBLabel() {
     var newLabel = "";
 
-    var mpLabel = aios_WIN.document.getElementById('viewWebPanelsSidebar').getAttribute('label');
+    var mpLabel = AiOS_HELPER.mostRecentWindow.document.getElementById('viewWebPanelsSidebar').getAttribute('label');
 
     if(webPanel && webPanel.contentDocument) {
         var loc = webPanel.contentDocument.location.href;
@@ -195,9 +194,9 @@ function aios_setSBLabel() {
 
 
 /*
-	Small Screen Rendering ein/aus
-		=> Aufruf durch onStateChange() wenn sich MultiPanel-URL aendert (panelProgressListener)
-		Original-Code in Teilen von: Daniel Glazman <glazman at netscape.com>
+    Small Screen Rendering ein/aus
+        => Aufruf durch onStateChange() wenn sich MultiPanel-URL aendert (panelProgressListener)
+        Original-Code in Teilen von: Daniel Glazman <glazman at netscape.com>
 */
 function aios_setSSR() {
     //if(!aios_getBoolean("ssr-mitem", "checked")) return false;
@@ -206,7 +205,7 @@ function aios_setSSR() {
 
     try {
         var doc = webPanel.contentDocument;
-    //var docRoot = doc.documentElement;	// Abfrage verursacht bei einigen Seiten einen groesser skalierten Text ???
+    //var docRoot = doc.documentElement;    // Abfrage verursacht bei einigen Seiten einen groesser skalierten Text ???
     //var docRootName = docRoot.nodeName.toLowerCase();
     } catch(e) { }
 
@@ -251,7 +250,7 @@ function aios_setSSR() {
 
 
 /*
-	MultiPanel-Unload
+    MultiPanel-Unload
 */
 function aios_unloadMultiPanel() {
     if(webPanel && !aios_getBoolean("aios-remMultiPanel", "checked")) {
diff --git a/content/multipanel.xul b/content/multipanel.xul
old mode 100755
new mode 100644
index 60e5646..c86baf9
--- a/content/multipanel.xul
+++ b/content/multipanel.xul
@@ -3,24 +3,24 @@
 <!-- locale -->
 <!DOCTYPE overlay [
         <!ENTITY % aiosDTD SYSTEM "chrome://aios/locale/aios.dtd"> %aiosDTD;
-	<!ENTITY % multipanelDTD SYSTEM "chrome://aios/locale/multipanel.dtd"> %multipanelDTD;
-	<!ENTITY % libDTD SYSTEM "chrome://aios/locale/lib.dtd"> %libDTD;
+    <!ENTITY % multipanelDTD SYSTEM "chrome://aios/locale/multipanel.dtd"> %multipanelDTD;
+    <!ENTITY % libDTD SYSTEM "chrome://aios/locale/lib.dtd"> %libDTD;
 ]>
 
 <overlay id="aios_MultiPanelOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
+    <script type="application/x-javascript" src="chrome://aios/content/_helper.js" />
     <script type="application/x-javascript" src="chrome://aios/content/multipanel.js" />
 
     <script><![CDATA[
-		// Listener fuer automatische Aktualisierung hinzufuegen u. entfernen
-		window.addEventListener("load", aios_init, false);
-
-		window.addEventListener("unload",function(e) {
-			if(top.gBrowser && top.gBrowser.removeProgressListener) top.gBrowser.removeProgressListener(aiosProgListener);
-			aios_unloadMultiPanel();
-		}, false);
-	]]>
+        // Listener fuer automatische Aktualisierung hinzufuegen u. entfernen
+        window.addEventListener("load", aios_init, false);
+
+        window.addEventListener("unload",function(e) {
+            if(top.gBrowser && top.gBrowser.removeProgressListener) top.gBrowser.removeProgressListener(aiosProgListener);
+            aios_unloadMultiPanel();
+        }, false);
+    ]]>
     </script>
 
     <page id="webpanels-window" persist="width height screenX screenY" title="&button.multipanel.label;" windowtype="aiosGlobal:MultiPanel">
@@ -28,70 +28,70 @@
         <hbox id="commandBar" position="1">
 
             <toolbarbutton id="page-button" class="toolbarbutton-1 aios-tbutton" type="menu-button" checked="false"
-				label="&page.label;" tooltiptext="&page.tooltip;" oncommand="aios_setMultiPanel('page');">
+                label="&page.label;" tooltiptext="&page.tooltip;" oncommand="aios_setMultiPanel('page');">
 
                 <menupopup onpopupshowing="aios_getPageOptions();">
 
                     <menuitem id="ssr-mitem" type="checkbox" checked="false" autocheck="false" persist="checked"
-	    			label="&page.ssr.label;" tooltiptext="&page.ssr.label;"
-    				oncommand="aios_toggleElement(this); aios_setSSR(); event.stopPropagation();" />
+                    label="&page.ssr.label;" tooltiptext="&page.ssr.label;"
+                    oncommand="aios_toggleElement(this); aios_setSSR(); event.stopPropagation();" />
 
                     <menuitem id="ssrSidebar-mitem" type="checkbox" checked="false" autocheck="false" persist="checked"
-	    			label="&page.ssr100.label;" tooltiptext="&page.ssr100.label;"
-    				oncommand="aios_toggleElement(this); aios_setSSR(); event.stopPropagation();" />
+                    label="&page.ssr100.label;" tooltiptext="&page.ssr100.label;"
+                    oncommand="aios_toggleElement(this); aios_setSSR(); event.stopPropagation();" />
 
                 </menupopup>
             </toolbarbutton>
 
             <toolbarbutton id="about-button" class="toolbarbutton-1 aios-tbutton" type="menu-button" checked="false"
-				label="&about.label;" tooltiptext="&about.tooltip;" oncommand="aios_setMultiPanel('about:config');">
+                label="&about.label;" tooltiptext="&about.tooltip;" oncommand="aios_setMultiPanel('about:config');">
 
                 <menupopup id="aboutGroup">
                     <menuitem type="radio" label="about:config" tooltiptext="&about.config.tooltip;" checked="false"
-						oncommand="aios_setMultiPanel('about:config'); event.stopPropagation();" />
+                        oncommand="aios_setMultiPanel('about:config'); event.stopPropagation();" />
 
                     <menuseparator />
 
                     <menuitem type="radio" label="about:plugins" tooltiptext="&about.plugins.tooltip;" checked="false"
-						oncommand="aios_setMultiPanel('about:plugins'); event.stopPropagation();" />
+                        oncommand="aios_setMultiPanel('about:plugins'); event.stopPropagation();" />
 
                     <menuitem type="radio" label="about:support" tooltiptext="&about.support.tooltip;" checked="false"
-						oncommand="aios_setMultiPanel('about:support'); event.stopPropagation();" />
+                        oncommand="aios_setMultiPanel('about:support'); event.stopPropagation();" />
 
                     <menuitem type="radio" label="about:cache" tooltiptext="&about.cache.tooltip;" checked="false"
-						oncommand="aios_setMultiPanel('about:cache'); event.stopPropagation();" />
+                        oncommand="aios_setMultiPanel('about:cache'); event.stopPropagation();" />
 
                     <menuitem type="radio" label="about:cache?device=disk" tooltiptext="&about.cache.disk.tooltip;" checked="false"
-						oncommand="aios_setMultiPanel('about:cache?device=disk'); event.stopPropagation();" />
+                        oncommand="aios_setMultiPanel('about:cache?device=disk'); event.stopPropagation();" />
 
                     <menuitem type="radio" label="about:cache?device=memory" tooltiptext="&about.cache.memory.tooltip;" checked="false"
-						oncommand="aios_setMultiPanel('about:cache?device=memory'); event.stopPropagation();" />
+                        oncommand="aios_setMultiPanel('about:cache?device=memory'); event.stopPropagation();" />
 
                     <menuitem type="radio" label="about:cache?device=offline" tooltiptext="&about.cache.offline.tooltip;" checked="false"
-						oncommand="aios_setMultiPanel('about:cache?device=offline'); event.stopPropagation();" />
+                        oncommand="aios_setMultiPanel('about:cache?device=offline'); event.stopPropagation();" />
 
                     <menuitem type="radio" label="about:crashes" tooltiptext="&about.crashes.tooltip;" checked="false"
-						oncommand="aios_setMultiPanel('about:crashes'); event.stopPropagation();" />
+                        oncommand="aios_setMultiPanel('about:crashes'); event.stopPropagation();" />
 
                     <menuitem type="radio" label="about:buildconfig" tooltiptext="&about.buildconfig.tooltip;" checked="false"
-						oncommand="aios_setMultiPanel('about:buildconfig'); event.stopPropagation();" />
+                        oncommand="aios_setMultiPanel('about:buildconfig'); event.stopPropagation();" />
 
                     <menuseparator />
 
                     <menuitem type="radio" label="about:" tooltiptext="&about.about.tooltip;" checked="false"
-						oncommand="aios_setMultiPanel('about:'); event.stopPropagation();" />
+                        oncommand="aios_setMultiPanel('about:'); event.stopPropagation();" />
 
                     <menuitem type="radio" label="about:robots" tooltiptext="&about.robots.tooltip;" checked="false"
-						oncommand="aios_setMultiPanel('about:robots'); event.stopPropagation();" />
+                        oncommand="aios_setMultiPanel('about:robots'); event.stopPropagation();" />
 
                     <menuitem type="radio" label="about:credits" tooltiptext="&about.credits.tooltip;" checked="false"
-						oncommand="aios_setMultiPanel('about:credits'); event.stopPropagation();" />
+                        oncommand="aios_setMultiPanel('about:credits'); event.stopPropagation();" />
 
                     <menuitem type="radio" label="about:license" tooltiptext="&about.license.tooltip;" checked="false"
-						oncommand="aios_setMultiPanel('about:license'); event.stopPropagation();" />
+                        oncommand="aios_setMultiPanel('about:license'); event.stopPropagation();" />
 
                     <menuitem type="radio" label="about:mozilla" tooltiptext="&about.mozilla.tooltip;" checked="false"
-						oncommand="aios_setMultiPanel('about:mozilla'); event.stopPropagation();" />
+                        oncommand="aios_setMultiPanel('about:mozilla'); event.stopPropagation();" />
                 </menupopup>
 
             </toolbarbutton>
@@ -102,8 +102,8 @@
                 <menupopup id="toolsPopUp">
 
                     <menuitem id="aios-remMultiPanel" type="checkbox" checked="true" persist="checked" autocheck="false"
-						label="&tools.remlast.label;" tooltiptext="&tools.remlast.label;"
-						oncommand="aios_toggleElement(this); event.stopPropagation();" />
+                        label="&tools.remlast.label;" tooltiptext="&tools.remlast.label;"
+                        oncommand="aios_toggleElement(this); event.stopPropagation();" />
 
                 </menupopup>
             </toolbarbutton>
diff --git a/content/multipanel_config.xul b/content/multipanel_config.xul
old mode 100755
new mode 100644
index 1726c55..49137cb
--- a/content/multipanel_config.xul
+++ b/content/multipanel_config.xul
@@ -2,14 +2,14 @@
 
 <overlay id="aios_configOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
+    <script type="application/x-javascript" src="chrome://aios/content/_helper.js" />
 
     <script><![CDATA[
 
-		// fuer CSS-Zwecke speichern
-		aios_appInfo( document.getElementById("config") );
+        // fuer CSS-Zwecke speichern
+        AiOS_HELPER.rememberAppInfo( document.getElementById("config") );
 
-	]]>
+    ]]>
     </script>
 
 </overlay>
\ No newline at end of file
diff --git a/content/pageinfo.js b/content/pageinfo.js
old mode 100755
new mode 100644
index 4d02009..658db12
--- a/content/pageinfo.js
+++ b/content/pageinfo.js
@@ -1,6 +1,6 @@
 
 var aios_inSidebar = (top.document.getElementById('sidebar-box')) ? true : false;
-var aios_inTab = (aios_WIN.aiosLastSelTab) ? true : false;
+var aios_inTab = (AiOS_HELPER.mostRecentWindow.aiosLastSelTab) ? true : false;
 
 // Listener fuer automatische Aktualisierung hinzufuegen u. entfernen
 if(aios_inSidebar) {
@@ -20,11 +20,11 @@ function aios_init() {
     aios_hideMacMenubar();
 
     // fuer CSS-Zwecke speichern
-    aios_appInfo(document.getElementById('main-window'));
+    AiOS_HELPER.rememberAppInfo( document.getElementById('main-window') );
 
     try {
-        var enable_layout = aios_gPrefBranch.getBoolPref("pi.layout");
-        var enable_layoutall = aios_gPrefBranch.getBoolPref("pi.layoutall");
+        var enable_layout = AiOS_HELPER.prefBranchAiOS.getBoolPref("pi.layout");
+        var enable_layoutall = AiOS_HELPER.prefBranchAiOS.getBoolPref("pi.layoutall");
         if((enable_layout && aios_inSidebar) || enable_layoutall) aios_sidebarLayout();
     }
     catch(e) { }
@@ -100,7 +100,7 @@ function aios_sidebarLayout() {
 }
 
 
-// automatische Aktualisierung => Aufruf durch aiosProgListener (_common.js)
+// automatische Aktualisierung => Aufruf durch aiosProgListener (_helper.js)
 function aios_onLocationChange() {
     if(aios_inSidebar) {
         aios_persistSelTab();
@@ -150,13 +150,13 @@ function onLoadPageInfo() {
         var aios_sidebar = top.document.getElementById('sidebar-box');
         var aios_window = document.getElementById('main-window');
 
-        gDocument = aios_WIN.content.document;
-        gWindow = aios_WIN.content.window;
+        gDocument = AiOS_HELPER.mostRecentWindow.content.document;
+        gWindow = AiOS_HELPER.mostRecentWindow.content.window;
     }
     else if(aios_inTab) {
 
-        gDocument = aios_WIN.aiosLastSelTab.document;
-        gWindow = aios_WIN.content.window;
+        gDocument = AiOS_HELPER.mostRecentWindow.aiosLastSelTab.document;
+        gWindow = AiOS_HELPER.mostRecentWindow.content.window;
     }
     // Original-FF-Teil
     else {
@@ -185,15 +185,15 @@ var security = {
         //viewCertHelper(window, cert);
 
         // mod by eXXile
-        if(aios_inSidebar) viewCertHelper(aios_WIN.content.window, cert);
-        else if(aios_inTab) viewCertHelper(aios_WIN.aiosLastSelTab.window, cert);
+        if(aios_inSidebar) viewCertHelper(AiOS_HELPER.mostRecentWindow.content.window, cert);
+        else if(aios_inTab) viewCertHelper(AiOS_HELPER.mostRecentWindow.aiosLastSelTab.window, cert);
         else viewCertHelper(window, cert);
     // endmod by eXXile
     },
 
     _getSecurityInfo : function() {
         const nsIX509Cert = Components.interfaces.nsIX509Cert;
-        const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
+        //mod by exxile const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
         const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
         const nsISSLStatusProvider = Components.interfaces.nsISSLStatusProvider;
         const nsISSLStatus = Components.interfaces.nsISSLStatus;
@@ -269,7 +269,7 @@ var security = {
             return null;
         }
         else if(aios_inTab) {
-            return aios_WIN.aiosLastSelTab.securityUI;
+            return AiOS_HELPER.mostRecentWindow.aiosLastSelTab.securityUI;
         }
         // Original-FF-Teil
         else {
diff --git a/content/pageinfo.xul b/content/pageinfo.xul
old mode 100755
new mode 100644
index 00840ba..8823b62
--- a/content/pageinfo.xul
+++ b/content/pageinfo.xul
@@ -3,7 +3,7 @@
 <overlay id="pageInfoOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <!-- scripts -->
-    <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
+    <script type="application/x-javascript" src="chrome://aios/content/_helper.js" />
     <script type="application/x-javascript" src="chrome://aios/content/pageinfo.js" />
 
     <script><![CDATA[
diff --git a/content/places.js b/content/places.js
old mode 100755
new mode 100644
index 96eb9b2..c14fbf6
--- a/content/places.js
+++ b/content/places.js
@@ -75,9 +75,9 @@ var AiOS_Places = {};
             // zuletzt geoeffneten Ordner markieren
             if(aios_getBoolean("aios-rememberFolder", "checked")) {
 
-                if(aios_gPrefBranch.prefHasUserValue(lastFolderPref)) {
+                if(AiOS_HELPER.prefBranchAiOS.prefHasUserValue(lastFolderPref)) {
 
-                    lastRowToSelect = aios_gPrefBranch.getIntPref(lastFolderPref);
+                    lastRowToSelect = AiOS_HELPER.prefBranchAiOS.getIntPref(lastFolderPref);
 
                     window.setTimeout(function() {
                         AiOS_Places.selectFolder(lastRowToSelect);
@@ -106,7 +106,7 @@ var AiOS_Places = {};
         var self = AiOS_Places;
 
         // fuer CSS-Zwecke speichern
-        aios_appInfo(self.managerWindow);
+        AiOS_HELPER.rememberAppInfo( self.managerWindow );
 
         // CSS aktivieren
         self.managerWindow.setAttribute('aios-inSidebar', 'true');
@@ -208,7 +208,7 @@ var AiOS_Places = {};
 
         var sidebarType = AiOS_Places.mode;
 
-        var dotoggle = (e.button === 0);	//wenn es kein links-klick war, dann fuehre nur die standardaktion aus
+        var dotoggle = (e.button === 0);    //wenn es kein links-klick war, dann fuehre nur die standardaktion aus
         var tree = AiOS_Places.managerTree;
         var tbo = tree.treeBoxObject;
 
@@ -239,7 +239,7 @@ var AiOS_Places = {};
                 parents.push(row);
                 row = tboView.getParentIndex(row);
             }
-            parents.reverse();	//dreht reihenfolge im array um
+            parents.reverse();  //dreht reihenfolge im array um
 
             for (var i = tboView.rowCount-1; i >= 0; i--)    //geht einfach jede zeile durch und testet ...
             {
@@ -269,11 +269,11 @@ var AiOS_Places = {};
                 switch(sidebarType)
                 {
                     case "bookmarks":
-                        aios_gPrefBranch.setIntPref("lastBookmarkFolder", tree.currentIndex);
+                        AiOS_HELPER.prefBranchAiOS.setIntPref("lastBookmarkFolder", tree.currentIndex);
                         break;
 
                     case "history":
-                        aios_gPrefBranch.setIntPref("lastHistoryFolder", tree.currentIndex);
+                        AiOS_HELPER.prefBranchAiOS.setIntPref("lastHistoryFolder", tree.currentIndex);
                         break;
                 }
             }
@@ -295,8 +295,8 @@ var AiOS_Places = {};
 
         // zuletzt geoeffneten Ordner "vergessen"
         try {
-            if(document.getElementById('bookmarksPanel')) aios_gPrefBranch.clearUserPref("lastBookmarkFolder");
-            else if(document.getElementById('history-panel')) aios_gPrefBranch.clearUserPref("lastHistoryFolder");
+            if(document.getElementById('bookmarksPanel')) AiOS_HELPER.prefBranchAiOS.clearUserPref("lastBookmarkFolder");
+            else if(document.getElementById('history-panel')) AiOS_HELPER.prefBranchAiOS.clearUserPref("lastHistoryFolder");
         }
         catch(e) {  }
 
diff --git a/content/places.xul b/content/places.xul
old mode 100755
new mode 100644
index 5c76e12..379d534
--- a/content/places.xul
+++ b/content/places.xul
@@ -9,7 +9,7 @@
 
 <overlay id="bmHiOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
+    <script type="application/x-javascript" src="chrome://aios/content/_helper.js" />
     <script type="application/x-javascript" src="chrome://aios/content/places.js" />
 
     <page id="bookmarksPanel" persist="width height screenX screenY" title="&bookmarksButton.label;" windowtype="aiosGlobal:Bookmarks" />
@@ -24,7 +24,7 @@
         </stringbundleset>
 
         <button id="closeFolder" insertbefore="viewButton" oncommand="AiOS_Places.closeAllFolders();" hidden="true" persist="hidden"
-			label="&closeFolder.label;" tooltiptext="&closeFolder.label;" />
+            label="&closeFolder.label;" tooltiptext="&closeFolder.label;" />
 
         <button id="viewButton" type="menu" label="&menu.tools.label;">
 
@@ -42,7 +42,7 @@
                 <menuseparator id="close-separator" />
 
                 <menuitem id="aios-viewClose" type="checkbox" checked="false" persist="checked" label="&show.closeFolder.label;"
-					oncommand="AiOS_Places.toggleButton(this);" data-dependent="closeFolder" />
+                    oncommand="AiOS_Places.toggleButton(this);" data-dependent="closeFolder" />
 
             </menupopup>
 
diff --git a/content/prefs/_keyconfig.js b/content/prefs/_keyconfig.js
old mode 100755
new mode 100644
index b9ae37b..c6272b9
--- a/content/prefs/_keyconfig.js
+++ b/content/prefs/_keyconfig.js
@@ -1,5 +1,5 @@
 //mod by exxile
-var target = aios_WIN;
+var target = AiOS_HELPER.mostRecentWindow;
 if(target) {
     var gPrefService = target.aiosKeyconfig.prefService;
     var gProfile = target.aiosKeyconfig.profile;
diff --git a/content/prefs/_overlay.js b/content/prefs/_overlay.js
old mode 100755
new mode 100644
diff --git a/content/prefs/general.js b/content/prefs/general.js
old mode 100755
new mode 100644
index 9ef6983..608feb1
--- a/content/prefs/general.js
+++ b/content/prefs/general.js
@@ -1,7 +1,7 @@
 
 /*
-	Liste der zur Verfuegung stehenden Sidebars erstellen
-		=> Aufruf durch aios_initPane()
+    Liste der zur Verfuegung stehenden Sidebars erstellen
+        => Aufruf durch aios_initPane()
 */
 function aios_genSidebarList() {
 
@@ -12,15 +12,15 @@ function aios_genSidebarList() {
 
     var sidebarInit = document.getElementById('sidebarInitPopup');
     var panelInit = document.getElementById('panelInitPopup');
-    var allSidebars = aios_WIN.document.getElementsByAttribute('group', 'sidebar');
+    var allSidebars = AiOS_HELPER.mostRecentWindow.document.getElementsByAttribute('group', 'sidebar');
 
     var cnt = 0;
     var initID = null;
     var sidebarPrefInit = "";
     var panelPrefInit = "";
     try {
-        sidebarPrefInit = aios_gPrefBranch.getCharPref("gen.init");
-        panelPrefInit = aios_gPrefBranch.getCharPref("gen.open.init");
+        sidebarPrefInit = AiOS_HELPER.prefBranchAiOS.getCharPref("gen.init");
+        panelPrefInit = AiOS_HELPER.prefBranchAiOS.getCharPref("gen.open.init");
     } catch(e) { }
 
     for(var i = 0; i < allSidebars.length; i++) {
@@ -58,8 +58,8 @@ function aios_genSidebarList() {
 
 
 /*
-	Werte der aktuellen Sidebarbreite einsetzen
-		=> Aufruf durch oncommand() der drei <toolbarbutton>
+    Werte der aktuellen Sidebarbreite einsetzen
+        => Aufruf durch oncommand() der drei <toolbarbutton>
 */
 function aios_setWidthVal(mode) {
     var browserWidth = aios_getBrowserWidth();
@@ -82,8 +82,8 @@ function aios_setWidthVal(mode) {
 
 
 /*
-	Breitenangaben bei Aenderung der Masseinheit umrechnen und ausgeben
-		=> Aufruf durch ValueChange-Listener, initiert in aios_initPrefs()
+    Breitenangaben bei Aenderung der Masseinheit umrechnen und ausgeben
+        => Aufruf durch ValueChange-Listener, initiert in aios_initPrefs()
 */
 function aios_changeWidthUnit(mode) {
     var elem = document.getElementById('obj-' + mode + 'WidthVal');
@@ -105,8 +105,8 @@ function aios_changeWidthUnit(mode) {
 
 
 /*
-	Angaben zur Sidebarbreite pruefen
-		=> Aufruf durch onBlur() der drei Textfelder, aios_changeWidthUnit(), aios_setConfSidebarWidth()
+    Angaben zur Sidebarbreite pruefen
+        => Aufruf durch onBlur() der drei Textfelder, aios_changeWidthUnit(), aios_setConfSidebarWidth()
 */
 function aios_checkWidthVal(mode) {
     var elem = document.getElementById('obj-' + mode + 'WidthVal');
@@ -123,8 +123,8 @@ function aios_checkWidthVal(mode) {
 
 
 /*
-	stellt die Groesse der Sidebar ein
-		=> Aufruf durch aios_savePrefs() in prefs.js und aios_initSidebar() in aios.js
+    stellt die Groesse der Sidebar ein
+        => Aufruf durch aios_savePrefs() in prefs.js und aios_initSidebar() in aios.js
 */
 function aios_setConfSidebarWidth() {
     var elem, theUnit, theValue;
@@ -147,9 +147,9 @@ function aios_setConfSidebarWidth() {
         }
         // Aufruf durch aios_initSidebar() => die abgespeicherten Werte verwenden
         else {
-            elem = aios_gPrefBranch.getIntPref("gen.width." + modes[i] + "Val");
+            elem = AiOS_HELPER.prefBranchAiOS.getIntPref("gen.width." + modes[i] + "Val");
             theValue = elem;
-            theUnit = aios_gPrefBranch.getCharPref("gen.width." + modes[i] + "Unit");
+            theUnit = AiOS_HELPER.prefBranchAiOS.getCharPref("gen.width." + modes[i] + "Unit");
         }
 
         // Prozente in Px umrechnen (Angaben in % funktionieren hier nicht??)
@@ -168,6 +168,6 @@ function aios_setConfSidebarWidth() {
         }
     }
 
-    aios_WIN.document.getElementById('sidebar').setAttribute('style', widthStyle);
-    aios_WIN.document.persist('sidebar', 'style');
+    AiOS_HELPER.mostRecentWindow.document.getElementById('sidebar').setAttribute('style', widthStyle);
+    AiOS_HELPER.mostRecentWindow.document.persist('sidebar', 'style');
 }
\ No newline at end of file
diff --git a/content/prefs/keys.xul b/content/prefs/keys.xul
old mode 100755
new mode 100644
index 430c046..de2a219
--- a/content/prefs/keys.xul
+++ b/content/prefs/keys.xul
@@ -9,7 +9,7 @@
 
     <prefpane id="aiosKeys" onpaneload="aios_initKeys();">
 
-        <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
+        <script type="application/x-javascript" src="chrome://aios/content/_helper.js" />
         <script type="application/x-javascript" src="chrome://aios/content/prefs/_keyconfig.js"/>
 
         <script>
diff --git a/content/prefs/overlay_main.xul b/content/prefs/overlay_main.xul
old mode 100755
new mode 100644
index ab9bb3a..64f7807
--- a/content/prefs/overlay_main.xul
+++ b/content/prefs/overlay_main.xul
@@ -5,8 +5,8 @@
 
 <!-- locale -->
 <!DOCTYPE prefwindow [
-	<!ENTITY % commonDTD SYSTEM "chrome://aios/locale/aios.dtd"> %commonDTD;
-	<!ENTITY % prefsDTD SYSTEM "chrome://aios/locale/prefs.dtd"> %prefsDTD;
+    <!ENTITY % commonDTD SYSTEM "chrome://aios/locale/aios.dtd"> %commonDTD;
+    <!ENTITY % prefsDTD SYSTEM "chrome://aios/locale/prefs.dtd"> %prefsDTD;
 ]>
 
 <overlay id="aios_mainPrefsOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/content/prefs/prefs.js b/content/prefs/prefs.js
old mode 100755
new mode 100644
index 3581bd9..ca50f7d
--- a/content/prefs/prefs.js
+++ b/content/prefs/prefs.js
@@ -1,7 +1,7 @@
 
 /*
-	Initialisierung
-		=> Aufruf durch onload im <prefwindow>
+    Initialisierung
+        => Aufruf durch onload im <prefwindow>
 */
 function aios_initPrefs() {
     // speziellen Tab oeffnen, wenn einer als Argument uebergeben wurde (aus den Standard-Optionen heraus)
@@ -60,7 +60,7 @@ function aios_initPrefs() {
 
 
 function aios_initPane(mode) {
-    aios_appInfo(document.getElementById("aiosPreferences"));
+    AiOS_HELPER.rememberAppInfo( document.getElementById("aiosPreferences") );
 
     // zuletzt gewaehlten Tab wieder selektieren
     var tabbox = null;
@@ -86,8 +86,8 @@ function aios_initPane(mode) {
 
 
 /*
-	Standardeinstellungen zuruecksetzen
-		=> Aufruf durch <menuitem> in prefs.xul
+    Standardeinstellungen zuruecksetzen
+        => Aufruf durch <menuitem> in prefs.xul
 */
 function aios_defaultSettings() {
     var strings = document.getElementById("aiosStrings");
@@ -96,11 +96,11 @@ function aios_defaultSettings() {
     var count = {
         value : 0
     };
-    var childList = aios_gPrefBranch.getChildList("", count);
+    var childList = AiOS_HELPER.prefBranchAiOS.getChildList("", count);
 
     for(var i = 0; i < count.value; i++) {
-        if(aios_gPrefBranch.prefHasUserValue(childList[i]) && childList[i] != "changelog") {
-            aios_gPrefBranch.clearUserPref(childList[i]);
+        if(AiOS_HELPER.prefBranchAiOS.prefHasUserValue(childList[i]) && childList[i] != "changelog") {
+            AiOS_HELPER.prefBranchAiOS.clearUserPref(childList[i]);
         }
     }
 
@@ -115,8 +115,8 @@ function aios_defaultSettings() {
 
 
 /*
-	Einstellungen in die Zwischenablage kopieren oder als Textdatei speichern
-		=> Aufruf durch <menuitem> in prefs.xul
+    Einstellungen in die Zwischenablage kopieren oder als Textdatei speichern
+        => Aufruf durch <menuitem> in prefs.xul
 */
 function aios_exportSettings(aMode) {
     var strings = document.getElementById("aiosStrings");
@@ -131,27 +131,27 @@ function aios_exportSettings(aMode) {
     aiosExport[0]+= "                     All-in-One Sidebar - Settings\n";
     aiosExport[0]+= "-----------------------------------------------------------------------\n";
     aiosExport[0]+= "          " + sDate + ", " + sTtime + " (" + sGMT + ")\n";
-    aiosExport[0]+= "          AiOS " + aios_gPrefBranch.getCharPref('changelog') + ", " + aios_appVendor + " " + aios_appVersion + ", " + aios_appOS + ", " + aios_gPrefBranchN.getCharPref('general.skins.selectedSkin') + "\n";
+    aiosExport[0]+= "          AiOS " + AiOS_HELPER.prefBranchAiOS.getCharPref('changelog') + ", " + AiOS_HELPER.appInfo.vendor + " " + AiOS_HELPER.appInfo.version + ", " + AiOS_HELPER.os + ", " + AiOS_HELPER.prefBranch.getCharPref('general.skins.selectedSkin') + "\n";
     aiosExport[0]+= "-----------------------------------------------------------------------";
 
     var count = {
         value : 0
     };
-    var childList = aios_gPrefBranch.getChildList("", count);
+    var childList = AiOS_HELPER.prefBranchAiOS.getChildList("", count);
 
     for(var i = 0; i < count.value; i++) {
         try {
-            switch(aios_gPrefBranch.getPrefType(childList[i])) {
-                case 	aios_pBranch.PREF_BOOL:
-                    aiosExport[i+1] = childList[i] + '=' + aios_gPrefBranch.getBoolPref(childList[i]);
+            switch(AiOS_HELPER.prefBranchAiOS.getPrefType(childList[i])) {
+                case    AiOS_HELPER.prefInterface.PREF_BOOL:
+                    aiosExport[i+1] = childList[i] + '=' + AiOS_HELPER.prefBranchAiOS.getBoolPref(childList[i]);
                     break;
 
-                case 	aios_pBranch.PREF_INT:
-                    aiosExport[i+1] = childList[i] + '=' + aios_gPrefBranch.getIntPref(childList[i]);
+                case    AiOS_HELPER.prefInterface.PREF_INT:
+                    aiosExport[i+1] = childList[i] + '=' + AiOS_HELPER.prefBranchAiOS.getIntPref(childList[i]);
                     break;
 
-                case 	aios_pBranch.PREF_STRING:
-                    aiosExport[i+1] = childList[i] + '=' + aios_gPrefBranch.getCharPref(childList[i]);
+                case    AiOS_HELPER.prefInterface.PREF_STRING:
+                    aiosExport[i+1] = childList[i] + '=' + AiOS_HELPER.prefBranchAiOS.getCharPref(childList[i]);
                     break;
             }
         }
@@ -198,8 +198,8 @@ function aios_exportSettings(aMode) {
 
 
 /*
-	Einstellungen aus Textdatei importieren
-		=> Aufruf durch <menuitem> in prefs.xul
+    Einstellungen aus Textdatei importieren
+        => Aufruf durch <menuitem> in prefs.xul
 */
 function aios_importSettings() {
     var strings = document.getElementById("aiosStrings");
@@ -232,20 +232,20 @@ function aios_importSettings() {
     if(pattern[1].indexOf("All-in-One Sidebar - Settings") >= 0 || pattern[1].indexOf("All-In-One Sidebar - Settings") >= 0) {
         for(i = 6; i < aiosImport.length; i++) {
             try {
-                switch(aios_gPrefBranch.getPrefType(aiosImport[i][0])) {
-                    case 	aios_pBranch.PREF_BOOL:
-                        aios_gPrefBranch.setBoolPref(aiosImport[i][0],/true/i.test(aiosImport[i][1]));
+                switch(AiOS_HELPER.prefBranchAiOS.getPrefType(aiosImport[i][0])) {
+                    case    AiOS_HELPER.prefInterface.PREF_BOOL:
+                        AiOS_HELPER.prefBranchAiOS.setBoolPref(aiosImport[i][0],/true/i.test(aiosImport[i][1]));
                         break;
 
-                    case 	aios_pBranch.PREF_INT:
-                        aios_gPrefBranch.setIntPref(aiosImport[i][0], aiosImport[i][1]);
+                    case    AiOS_HELPER.prefInterface.PREF_INT:
+                        AiOS_HELPER.prefBranchAiOS.setIntPref(aiosImport[i][0], aiosImport[i][1]);
                         break;
 
-                    case 	aios_pBranch.PREF_STRING:
+                    case    AiOS_HELPER.prefInterface.PREF_STRING:
                         var pref = aiosImport[i][1];
                         if(pref.indexOf('"') == 0) // in prev version we use " " for string
                             pref = pref.substring(1,pref.length - 1);
-                        aios_gPrefBranch.setCharPref(aiosImport[i][0], pref);
+                        AiOS_HELPER.prefBranchAiOS.setCharPref(aiosImport[i][0], pref);
                         break;
                 }
             }
@@ -267,8 +267,8 @@ function aios_importSettings() {
 
 
 /*
-	Textdatei in ein Array einlesen (thanks to adblock & Tab Mix Plus :-))
-		=> Aufruf durch aios_importSettings()
+    Textdatei in ein Array einlesen (thanks to adblock & Tab Mix Plus :-))
+        => Aufruf durch aios_importSettings()
 */
 function aios_loadFromFile() {
     var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(Components.interfaces.nsIFilePicker);
@@ -299,8 +299,8 @@ function aios_loadFromFile() {
 
 
 /*
-	auf abhaengige Elemente pruefen
-		=> Aufruf durch aios_initPrefs(), aios_defaultPrefs() und aios_importSettings()
+    auf abhaengige Elemente pruefen
+        => Aufruf durch aios_initPrefs(), aios_defaultPrefs() und aios_importSettings()
 */
 function aios_checkDependent() {
     var childObserver = document.getElementsByAttribute('oncommand', 'aios_checkboxObserver(this);');
@@ -312,8 +312,8 @@ function aios_checkDependent() {
 
 
 /*
-	abhaengige Checkboxen aktivieren oder deaktivieren
-		Aufruf durch die Eltern-Checkbox und aios_checkDependent()
+    abhaengige Checkboxen aktivieren oder deaktivieren
+        Aufruf durch die Eltern-Checkbox und aios_checkDependent()
 */
 function aios_checkboxObserver(which) {
     var observe = which.getAttribute('aiosChilds');
@@ -336,14 +336,14 @@ function aios_checkboxObserver(which) {
 
 
 /*
-	Advanced-Mode aktivieren/deaktivieren und Elemente und ein-/ausblenden
-		=> Aufruf durch aios_initPrefs() und das <menuitem> des Setting buttons
+    Advanced-Mode aktivieren/deaktivieren und Elemente und ein-/ausblenden
+        => Aufruf durch aios_initPrefs() und das <menuitem> des Setting buttons
 */
 function aios_advancedMode(trigger) {
 
     /*if(trigger) {
-		var heightBefore = aios_getSizeBoxHeight();
-	}*/
+        var heightBefore = aios_getSizeBoxHeight();
+    }*/
 
     var advanced = aios_getBoolean('aios-advanced', 'checked');
 
@@ -397,23 +397,23 @@ function aios_advancedMode(trigger) {
     }
 
     /*// Fenster vergroessern/verkleinern bei Mode-Umschaltung
-	if(trigger) {
-		var heightAfter = aios_getSizeBoxHeight();
+    if(trigger) {
+        var heightAfter = aios_getSizeBoxHeight();
 
-		//alert("heightBefore: " + heightBefore + " heightAfter: " + heightAfter);
+        //alert("heightBefore: " + heightBefore + " heightAfter: " + heightAfter);
 
-		var diff = heightBefore - heightAfter;
-		if(heightAfter > heightBefore) diff = diff - 10;
-		window.resizeTo(window.outerWidth, window.outerHeight - diff);
-	}*/
+        var diff = heightBefore - heightAfter;
+        if(heightAfter > heightBefore) diff = diff - 10;
+        window.resizeTo(window.outerWidth, window.outerHeight - diff);
+    }*/
 
     window.sizeToContent();
 }
 
 
 /*
-	Hoehe der Boxen zum Aktivieren/Deaktivieren des Advanced-Modes ermitteln
-		=> Aufruf durch aios_advancedMode()
+    Hoehe der Boxen zum Aktivieren/Deaktivieren des Advanced-Modes ermitteln
+        => Aufruf durch aios_advancedMode()
 */
 function aios_getSizeBoxHeight() {
     var theHeight = 0;
@@ -432,8 +432,8 @@ function aios_getSizeBoxHeight() {
 
 
 /*
-	Zahlen mit fuehrender Null zurueckgeben
-		=> Aufruf durch aios_exportSettings()
+    Zahlen mit fuehrender Null zurueckgeben
+        => Aufruf durch aios_exportSettings()
 */
 function aios_extendInt(aInput) {
     if(aInput < 10) return "0" + aInput.toString();
@@ -442,8 +442,8 @@ function aios_extendInt(aInput) {
 
 
 /*
-	synchronisiert jeweils die beiden Tab-Container, die abwechselnd angezeigt werden (normal und advanced)
-		=> Aufruf durch die beiden Tab-Container (General und Misc)
+    synchronisiert jeweils die beiden Tab-Container, die abwechselnd angezeigt werden (normal und advanced)
+        => Aufruf durch die beiden Tab-Container (General und Misc)
 */
 function aios_synchTabs(which) {
     var tabs0 = which.parentNode.childNodes[0];
@@ -458,8 +458,8 @@ function aios_synchTabs(which) {
 
 
 /*
-	GUI-Elemente zuruecksetzen
-		=> Aufruf durch aios_defaultSettings() und aios_importSettings()
+    GUI-Elemente zuruecksetzen
+        => Aufruf durch aios_defaultSettings() und aios_importSettings()
 */
 function aios_synchElements() {
     var val;
@@ -475,13 +475,13 @@ function aios_synchElements() {
 
         switch(prefType) {
             case "int":
-                val = aios_gPrefBranch.getIntPref(prefName);
+                val = AiOS_HELPER.prefBranchAiOS.getIntPref(prefName);
                 break;
             case "string":
-                val = aios_gPrefBranch.getCharPref(prefName);
+                val = AiOS_HELPER.prefBranchAiOS.getCharPref(prefName);
                 break;
             case "bool":
-                val = aios_gPrefBranch.getBoolPref(prefName);
+                val = AiOS_HELPER.prefBranchAiOS.getBoolPref(prefName);
                 break;
         }
 
@@ -503,25 +503,25 @@ function aios_synchElements() {
 
 
 /*
-	Einstellungen einiger Optionen direkt uebernehmen
-		=> Aufruf durch button "accept" und aios_applyPrefs()
+    Einstellungen einiger Optionen direkt uebernehmen
+        => Aufruf durch button "accept" und aios_applyPrefs()
 */
 
 function aios_savePrefs() {
     aios_setConfSidebarWidth();
 
     // Tooltip fuer PanelTab-Button festlegen
-    if(aios_WIN.document.getElementById('paneltab-button')) {
-        var ptReverse = aios_gPrefBranch.getBoolPref("paneltab.reverse");
+    if(AiOS_HELPER.mostRecentWindow.document.getElementById('paneltab-button')) {
+        var ptReverse = AiOS_HELPER.prefBranchAiOS.getBoolPref("paneltab.reverse");
         var ptTooltip = (ptReverse) ? 'paneltab-tooltip-reverse' : 'paneltab-tooltip';
-        aios_WIN.document.getElementById('paneltab-button').setAttribute('tooltip', ptTooltip);
+        AiOS_HELPER.mostRecentWindow.document.getElementById('paneltab-button').setAttribute('tooltip', ptTooltip);
     }
 
-    if(aios_WIN.aios_setTargets) aios_WIN.aios_setTargets();
+    if(AiOS_HELPER.mostRecentWindow.aios_setTargets) AiOS_HELPER.mostRecentWindow.aios_setTargets();
 
-    aios_WIN.aios_checkThinSwitch();
-    if(aios_WIN.aios_setSidebarOrient) aios_WIN.aios_setSidebarOrient();
-    if(aios_WIN.aios_initAutohide) aios_WIN.aios_initAutohide();
+    AiOS_HELPER.mostRecentWindow.aios_checkThinSwitch();
+    if(AiOS_HELPER.mostRecentWindow.aios_setSidebarOrient) AiOS_HELPER.mostRecentWindow.aios_setSidebarOrient();
+    if(AiOS_HELPER.mostRecentWindow.aios_initAutohide) AiOS_HELPER.mostRecentWindow.aios_initAutohide();
 
     // Bugfix...
     // sonst wird das Kontextmenue der Erweiterung angezeigt,
@@ -532,8 +532,8 @@ function aios_savePrefs() {
 
 
 /*
-	Einstellungen uebernehmen ohne den Dialog zu schliessen
-		=> Aufruf durch button "extra1"
+    Einstellungen uebernehmen ohne den Dialog zu schliessen
+        => Aufruf durch button "extra1"
 */
 function aios_applyPrefs() {
     var pID, pType, pName, pValue;
@@ -548,13 +548,13 @@ function aios_applyPrefs() {
 
         switch(pType) {
             case "string":
-                aios_gPref.setCharPref(pName, pValue);
+                AiOS_HELPER.prefService.setCharPref(pName, pValue);
                 break;
             case "bool":
-                aios_gPref.setBoolPref(pName, pValue);
+                AiOS_HELPER.prefService.setBoolPref(pName, pValue);
                 break;
             case "int":
-                aios_gPref.setIntPref(pName, pValue);
+                AiOS_HELPER.prefService.setIntPref(pName, pValue);
                 break;
         }
     }
@@ -569,13 +569,13 @@ function aios_applyPrefs() {
     aios_rememberOldPrefs();
 
     // Prefs direkt in Datei speichern
-    aios_gPref.savePrefFile(null);
+    AiOS_HELPER.prefService.savePrefFile(null);
 }
 
 
 /*
-	Apply-Button aktivieren/deaktivieren
-		=> Aufruf durch aios_initPrefs(), aios_applyPrefs() und aios_checkApply()
+    Apply-Button aktivieren/deaktivieren
+        => Aufruf durch aios_initPrefs(), aios_applyPrefs() und aios_checkApply()
 */
 function aios_disableApplyButton(aDis) {
 
@@ -588,8 +588,8 @@ function aios_disableApplyButton(aDis) {
 
 
 /*
-	Prefs merken, bevor sie veraendert werden => wird fuer den Apply-Button benoetigt
-		=> Aufruf durch aios_initPrefs() und aios_applyPrefs()
+    Prefs merken, bevor sie veraendert werden => wird fuer den Apply-Button benoetigt
+        => Aufruf durch aios_initPrefs() und aios_applyPrefs()
 */
 function aios_rememberOldPrefs() {
     var allPrefs = document.getElementsByTagName('preference');
@@ -611,8 +611,8 @@ function aios_rememberOldPrefs() {
 
 
 /*
-	Ueberpruefung auf zu speichernde Optionen => Apply-Button deaktivieren/aktivieren
-		Aufruf durch alle Checkboxen, Selcts, Textboxen usw durch onchange-Handler - gesetzt durch aios_rememberOldPrefs()
+    Ueberpruefung auf zu speichernde Optionen => Apply-Button deaktivieren/aktivieren
+        Aufruf durch alle Checkboxen, Selcts, Textboxen usw durch onchange-Handler - gesetzt durch aios_rememberOldPrefs()
 */
 var couldApply = "";
 function aios_checkApply(aPref) {
@@ -645,14 +645,14 @@ function aios_checkApply(aPref) {
             // enspr. String loeschen
             if(couldApply.indexOf(pID) >= 0) {
                 var t1 = couldApply.substr(0, couldApply.indexOf(pID));
-                if(t1.indexOf(",") == 0) t1 = t1.substr(1, t1.length);					// Komma am Anfang loeschen
-                if(t1.lastIndexOf(",") == t1.length - 1) t1 = t1.substr(0, t1.length - 1);		// Komma am Ende loeschen
+                if(t1.indexOf(",") == 0) t1 = t1.substr(1, t1.length);                  // Komma am Anfang loeschen
+                if(t1.lastIndexOf(",") == t1.length - 1) t1 = t1.substr(0, t1.length - 1);      // Komma am Ende loeschen
 
                 var t2 = couldApply.substr(couldApply.indexOf(pID) + pID.length, couldApply.length);
-                if(t2.indexOf(",") == 0) t2 = t2.substr(1, t2.length);					// Komma am Anfang loeschen
-                if(t2.lastIndexOf(",") == t2.length - 1) t2 = t2.substr(0, t2.length - 1);		// Komma am Ende loeschen
+                if(t2.indexOf(",") == 0) t2 = t2.substr(1, t2.length);                  // Komma am Anfang loeschen
+                if(t2.lastIndexOf(",") == t2.length - 1) t2 = t2.substr(0, t2.length - 1);      // Komma am Ende loeschen
 
-                if(t2.length > 0) t1+= ",";														// mit Komma verbinden
+                if(t2.length > 0) t1+= ",";                                                     // mit Komma verbinden
                 couldApply = t1 + t2;
             }
         //alert("keine Aenderung: " + couldApply);
@@ -660,7 +660,7 @@ function aios_checkApply(aPref) {
         // wenn die Aenderung _nicht_ der alten Einstellung entspricht,...
         else {
             // enspr. String erweitern
-            if(couldApply.length > 0) couldApply+= ",";											// mit Komma verbinden
+            if(couldApply.length > 0) couldApply+= ",";                                         // mit Komma verbinden
             couldApply+= pID;
         //alert("Aenderung: " + couldApply);
         }
@@ -673,8 +673,8 @@ function aios_checkApply(aPref) {
 
 
 /*
-	Optionen aus aelteren Versionen loeschen
-		=> Aufruf durch aios_initPrefs()
+    Optionen aus aelteren Versionen loeschen
+        => Aufruf durch aios_initPrefs()
 */
 function aios_deleteOldPrefs() {
 
@@ -682,7 +682,7 @@ function aios_deleteOldPrefs() {
 
     for(var i = 0; i < oldPrefs.length; i++) {
         try {
-            aios_gPrefBranch.clearUserPref(oldPrefs[i]);
+            AiOS_HELPER.prefBranchAiOS.clearUserPref(oldPrefs[i]);
         }
         catch(e) { }
     }
diff --git a/content/prefs/prefs.xul b/content/prefs/prefs.xul
old mode 100755
new mode 100644
index bba833f..2b59e16
--- a/content/prefs/prefs.xul
+++ b/content/prefs/prefs.xul
@@ -30,7 +30,7 @@
 
     <box>
 
-        <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
+        <script type="application/x-javascript" src="chrome://aios/content/_helper.js" />
         <script type="application/x-javascript" src="chrome://aios/content/prefs/prefs.js" />
 
         <stringbundleset>
@@ -63,41 +63,41 @@
         <preferences>
             <preference id="sidebarOrient"  type="int"          name="extensions.aios.gen.orient" />
 
-            <preference id="minWidthVal" 	type="int"          name="extensions.aios.gen.width.minVal" />
-            <preference id="minWidthUnit" 	type="string"       name="extensions.aios.gen.width.minUnit" />
+            <preference id="minWidthVal"    type="int"          name="extensions.aios.gen.width.minVal" />
+            <preference id="minWidthUnit"   type="string"       name="extensions.aios.gen.width.minUnit" />
 
-            <preference id="defWidthVal" 	type="int"          name="extensions.aios.gen.width.defVal" />
-            <preference id="defWidthUnit" 	type="string"       name="extensions.aios.gen.width.defUnit" />
+            <preference id="defWidthVal"    type="int"          name="extensions.aios.gen.width.defVal" />
+            <preference id="defWidthUnit"   type="string"       name="extensions.aios.gen.width.defUnit" />
 
-            <preference id="maxWidthVal" 	type="int"          name="extensions.aios.gen.width.maxVal" />
-            <preference id="maxWidthUnit" 	type="string"       name="extensions.aios.gen.width.maxUnit" />
+            <preference id="maxWidthVal"    type="int"          name="extensions.aios.gen.width.maxVal" />
+            <preference id="maxWidthUnit"   type="string"       name="extensions.aios.gen.width.maxUnit" />
 
-            <preference id="sidebarInit" 	type="string"       name="extensions.aios.gen.init" />
-            <preference id="toolbarInit" 	type="int"          name="extensions.aios.gen.toolbar.init" />
-            <preference id="switchInit" 	type="int"          name="extensions.aios.gen.switch.init" />
+            <preference id="sidebarInit"    type="string"       name="extensions.aios.gen.init" />
+            <preference id="toolbarInit"    type="int"          name="extensions.aios.gen.toolbar.init" />
+            <preference id="switchInit"     type="int"          name="extensions.aios.gen.switch.init" />
 
-            <preference id="openInit" 		type="string"       name="extensions.aios.gen.open.init" />
+            <preference id="openInit"       type="string"       name="extensions.aios.gen.open.init" />
 
-            <preference id="FSSidebar" 		type="bool"         name="extensions.aios.fs.sidebar" />
-            <preference id="FSToolbar" 		type="bool"         name="extensions.aios.fs.toolbar" />
-            <preference id="FSSwitch" 		type="bool"         name="extensions.aios.fs.switch" />
-            <preference id="FSRestore" 		type="bool"         name="extensions.aios.fs.restore" />
+            <preference id="FSSidebar"      type="bool"         name="extensions.aios.fs.sidebar" />
+            <preference id="FSToolbar"      type="bool"         name="extensions.aios.fs.toolbar" />
+            <preference id="FSSwitch"       type="bool"         name="extensions.aios.fs.switch" />
+            <preference id="FSRestore"      type="bool"         name="extensions.aios.fs.restore" />
 
-            <preference id="SSAutoshow" 	type="bool"         name="extensions.aios.gen.switch.autoshow" />
-            <preference id="SSOnlymax" 		type="bool"         name="extensions.aios.gen.switch.onlymax" />
-            <preference id="SSDelay" 		type="int"          name="extensions.aios.gen.switch.delay" />
-            <preference id="SSHidemethod" 	type="int"          name="extensions.aios.gen.switch.hidemethod" />
-            <preference id="SSWidth" 		type="int"          name="extensions.aios.gen.switch.width" />
-            <preference id="SSThinWidth" 	type="int"          name="extensions.aios.gen.switch.twidth" />
-            <preference id="SSThin" 		type="bool"         name="extensions.aios.gen.switch.thin" />
-            <preference id="SSThinMax" 		type="bool"         name="extensions.aios.gen.switch.thinmax" />
+            <preference id="SSAutoshow"     type="bool"         name="extensions.aios.gen.switch.autoshow" />
+            <preference id="SSOnlymax"      type="bool"         name="extensions.aios.gen.switch.onlymax" />
+            <preference id="SSDelay"        type="int"          name="extensions.aios.gen.switch.delay" />
+            <preference id="SSHidemethod"   type="int"          name="extensions.aios.gen.switch.hidemethod" />
+            <preference id="SSWidth"        type="int"          name="extensions.aios.gen.switch.width" />
+            <preference id="SSThinWidth"    type="int"          name="extensions.aios.gen.switch.twidth" />
+            <preference id="SSThin"         type="bool"         name="extensions.aios.gen.switch.thin" />
+            <preference id="SSThinMax"      type="bool"         name="extensions.aios.gen.switch.thinmax" />
 
-            <preference id="cmodeKey" 		type="int"          name="extensions.aios.cmode.key" />
-            <preference id="cmodeSwitch" 	type="int"          name="extensions.aios.cmode.switch" />
-            <preference id="cmodeTbb" 		type="int"          name="extensions.aios.cmode.tbb" />
-            <preference id="cmodeClose" 	type="int"          name="extensions.aios.cmode.close" />
+            <preference id="cmodeKey"       type="int"          name="extensions.aios.cmode.key" />
+            <preference id="cmodeSwitch"    type="int"          name="extensions.aios.cmode.switch" />
+            <preference id="cmodeTbb"       type="int"          name="extensions.aios.cmode.tbb" />
+            <preference id="cmodeClose"     type="int"          name="extensions.aios.cmode.close" />
 
-            <preference id="SBCollapsing" 	type="bool"         name="extensions.aios.collapse" />
+            <preference id="SBCollapsing"   type="bool"         name="extensions.aios.collapse" />
         </preferences>
 
         <tooltip id="minWidthHint" class="labelTipElem">
@@ -437,7 +437,7 @@
 
                         </groupbox>
 
-			<!-- Fix fuer die Hoehe des Shortcut-Panels => sonst wird die letzte Textzeile "Tipp: ...keyconfig..." abgeschnitten -->
+            <!-- Fix fuer die Hoehe des Shortcut-Panels => sonst wird die letzte Textzeile "Tipp: ...keyconfig..." abgeschnitten -->
                         <description style="visibility:hidden;">.</description>
 
                     </vbox>
@@ -562,26 +562,26 @@
 
     <prefpane id="aiosPanels" label="&tab.panels;" flex="1" seltab="0" persist="seltab" onpaneload="aios_initPane('panels');">
         <preferences>
-            <preference id="DMOpen" 		type="bool" 	name="extensions.aios.dm.sidebar" />
-            <preference id="DMLayout" 		type="bool" 	name="extensions.aios.dm.layout" />
-            <preference id="DMAutoOpen" 	type="bool" 	name="extensions.aios.dm.autoopen" />
-            <preference id="DMAutoClose" 	type="bool" 	name="extensions.aios.dm.autoclose" />
-            <preference id="DMCount" 		type="bool" 	name="extensions.aios.dm.count" />
-
-            <preference id="EMOpen" 		type="bool" 	name="extensions.aios.em.sidebar" />
-            <preference id="EMCount" 		type="bool" 	name="extensions.aios.em.count" />
-
-            <preference id="BMOpen" 		type="bool" 	name="extensions.aios.bm.sidebar" />
-            <preference id="HIOpen" 		type="bool" 	name="extensions.aios.hi.sidebar" />
-            <preference id="PIOpen" 		type="bool" 	name="extensions.aios.pi.sidebar" />
-            <preference id="PILayout" 		type="bool" 	name="extensions.aios.pi.layout" />
-
-            <preference id="MPOpen" 		type="bool" 	name="extensions.aios.mp.sidebar" />
-            <preference id="COOpen" 		type="bool" 	name="extensions.aios.co.sidebar" />
-            <preference id="COLayout" 		type="bool" 	name="extensions.aios.co.layout" />
-
-            <preference id="PanelTabReverse" 	type="bool" 	name="extensions.aios.paneltab.reverse" />
-            <preference id="PanelTabBMM" 	type="bool" 	name="extensions.aios.paneltab.bm" />
+            <preference id="DMOpen"         type="bool"     name="extensions.aios.dm.sidebar" />
+            <preference id="DMLayout"       type="bool"     name="extensions.aios.dm.layout" />
+            <preference id="DMAutoOpen"     type="bool"     name="extensions.aios.dm.autoopen" />
+            <preference id="DMAutoClose"    type="bool"     name="extensions.aios.dm.autoclose" />
+            <preference id="DMCount"        type="bool"     name="extensions.aios.dm.count" />
+
+            <preference id="EMOpen"         type="bool"     name="extensions.aios.em.sidebar" />
+            <preference id="EMCount"        type="bool"     name="extensions.aios.em.count" />
+
+            <preference id="BMOpen"         type="bool"     name="extensions.aios.bm.sidebar" />
+            <preference id="HIOpen"         type="bool"     name="extensions.aios.hi.sidebar" />
+            <preference id="PIOpen"         type="bool"     name="extensions.aios.pi.sidebar" />
+            <preference id="PILayout"       type="bool"     name="extensions.aios.pi.layout" />
+
+            <preference id="MPOpen"         type="bool"     name="extensions.aios.mp.sidebar" />
+            <preference id="COOpen"         type="bool"     name="extensions.aios.co.sidebar" />
+            <preference id="COLayout"       type="bool"     name="extensions.aios.co.layout" />
+
+            <preference id="PanelTabReverse"    type="bool"     name="extensions.aios.paneltab.reverse" />
+            <preference id="PanelTabBMM"    type="bool"     name="extensions.aios.paneltab.bm" />
         </preferences>
 
         <tabbox flex="1" id="aiosTabboxPanels">
@@ -769,13 +769,13 @@
 
     <prefpane id="aiosMenus" label="&tab.menus;" flex="1" seltab="0" persist="seltab" onpaneload="aios_initPane('menus');">
         <preferences>
-            <preference id="SBEntryDeac" 	type="bool" 	name="extensions.aios.menus.sidebar.entrydeac" />
-            <preference id="SBEntries" 		type="bool" 	name="extensions.aios.menus.sidebar.entries" />
-            <preference id="SBIcons" 		type="bool" 	name="extensions.aios.menus.sidebar.icons" />
-            <preference id="SBPanelTab1" 	type="bool" 	name="extensions.aios.menus.sidebar.paneltab1" />
-            <preference id="SBPanelTab2" 	type="bool" 	name="extensions.aios.menus.sidebar.paneltab2" />
-            <preference id="SBShowHide" 	type="bool" 	name="extensions.aios.menus.sidebar.showhide" />
-            <preference id="SBOptions" 		type="bool" 	name="extensions.aios.menus.sidebar.prefs" />
+            <preference id="SBEntryDeac"    type="bool"     name="extensions.aios.menus.sidebar.entrydeac" />
+            <preference id="SBEntries"      type="bool"     name="extensions.aios.menus.sidebar.entries" />
+            <preference id="SBIcons"        type="bool"     name="extensions.aios.menus.sidebar.icons" />
+            <preference id="SBPanelTab1"    type="bool"     name="extensions.aios.menus.sidebar.paneltab1" />
+            <preference id="SBPanelTab2"    type="bool"     name="extensions.aios.menus.sidebar.paneltab2" />
+            <preference id="SBShowHide"     type="bool"     name="extensions.aios.menus.sidebar.showhide" />
+            <preference id="SBOptions"      type="bool"     name="extensions.aios.menus.sidebar.prefs" />
         </preferences>
 
         <tabbox flex="1" id="aiosTabboxMenus">
diff --git a/defaults/preferences/aios.js b/defaults/preferences/aios.js
old mode 100755
new mode 100644
diff --git a/icon.png b/icon.png
old mode 100755
new mode 100644
diff --git a/install.rdf b/install.rdf
old mode 100755
new mode 100644
index f17b644..a6e93eb
--- a/install.rdf
+++ b/install.rdf
@@ -3,7 +3,7 @@
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
     <Description about="urn:mozilla:install-manifest">
         <em:name>All-in-One Sidebar</em:name>
-        <em:version>0.7.21</em:version>
+        <em:version>0.7.22</em:version>
         <em:description>Sidebar control with award-winning user experience!</em:description>
         <em:creator>Ingo Wennemaring</em:creator>
 
@@ -20,8 +20,8 @@
             <!-- Firefox -->
             <Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-                <em:minVersion>26.0</em:minVersion>
-                <em:maxVersion>26.*</em:maxVersion>
+                <em:minVersion>29.0</em:minVersion>
+                <em:maxVersion>29.*</em:maxVersion>
             </Description>
 
         </em:targetApplication>
diff --git a/license.txt b/license.txt
old mode 100755
new mode 100644
index 82fa1da..8a86b69
--- a/license.txt
+++ b/license.txt
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+        GNU GENERAL PUBLIC LICENSE
+           Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+          Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+        GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+          NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+         END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+      How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
diff --git a/locale/ar-SA/about.dtd b/locale/ar-SA/about.dtd
old mode 100755
new mode 100644
index 84fcff4..a14a020
--- a/locale/ar-SA/about.dtd
+++ b/locale/ar-SA/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "حول All-in-One Sidebar">
-<!ENTITY version "إصدار">
 <!ENTITY settings "إعدادات…">
 <!ENTITY close "إغلاق">
 <!ENTITY tab.about "حول">
diff --git a/locale/ar-SA/aios.dtd b/locale/ar-SA/aios.dtd
old mode 100755
new mode 100644
index 6279e36..9ae6f1f
--- a/locale/ar-SA/aios.dtd
+++ b/locale/ar-SA/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "تحويل الشريط الجانبي">
 <!ENTITY menu.grippy.label "Sidebar Grippy">
 <!ENTITY toolbar.name "All-in-One Sidebar شريط أدوات">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Sidebarheader شريط أدوات">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "تفعيل العناصر التي يتحكم بها All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "تفعيل الشريط الجانبي وشريط الأدوات">
diff --git a/locale/ar-SA/lib.dtd b/locale/ar-SA/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/ar-SA/lib.properties b/locale/ar-SA/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/ar-SA/multipanel.dtd b/locale/ar-SA/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/ar-SA/prefs.dtd b/locale/ar-SA/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/be-BY/about.dtd b/locale/be-BY/about.dtd
old mode 100755
new mode 100644
index 037e828..ece1363
--- a/locale/be-BY/about.dtd
+++ b/locale/be-BY/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Аб All-in-One Sidebar">
-<!ENTITY version "версія">
 <!ENTITY settings "Налады…">
 <!ENTITY close "Зачыніць">
 <!ENTITY tab.about "Інфармацыя аб пашырэнні">
diff --git a/locale/be-BY/aios.dtd b/locale/be-BY/aios.dtd
old mode 100755
new mode 100644
index 6897139..6403660
--- a/locale/be-BY/aios.dtd
+++ b/locale/be-BY/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Перамыкач бакавой панэлі">
 <!ENTITY menu.grippy.label "Кнопка “Згарнуць/Разгарнуць”">
 <!ENTITY toolbar.name "Бакавая панэль прылад">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Sidebarheader Toolbar">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "Выклік бакавой панэлі">
 <!ENTITY button.toggle.tooltip "Адкрыць/Зачыніць бакавую панэль">
 <!ENTITY button.switch.tooltip1 "Адчыніць Sidebar і Toolbar">
diff --git a/locale/be-BY/lib.dtd b/locale/be-BY/lib.dtd
old mode 100755
new mode 100644
index 32eabd8..6975a2c
--- a/locale/be-BY/lib.dtd
+++ b/locale/be-BY/lib.dtd
@@ -7,7 +7,7 @@
 <!ENTITY key.shift "Shift">
 <!ENTITY menu.tools.label "Прылады">
 <!ENTITY closeFolder.label "Зачыніць усе тэчкі">
-<!ENTITY show.closeFolder.label "\'Close All Folders\' Button">
+<!ENTITY show.closeFolder.label "'Close All Folders' Button">
 <!ENTITY enable.autoClose.label "Аўтаматычна зачыняць іншыя тэчкі">
 <!ENTITY enable.scrollToFolder.label "Аўтаматычна пераходзіць да вылучанай тэчкі">
 <!ENTITY enable.rememberFolder.label "Запамінаць і пераходзіць да апошняй вылучанай тэчкі">
diff --git a/locale/be-BY/lib.properties b/locale/be-BY/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/be-BY/multipanel.dtd b/locale/be-BY/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/be-BY/prefs.dtd b/locale/be-BY/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/cs-CZ/about.dtd b/locale/cs-CZ/about.dtd
old mode 100755
new mode 100644
index 6104710..2f64a41
--- a/locale/cs-CZ/about.dtd
+++ b/locale/cs-CZ/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "O rozšíření „All-in-One Sidebar“">
-<!ENTITY version "verze">
 <!ENTITY settings "Možnosti…">
 <!ENTITY close "Zavřít">
 <!ENTITY tab.about "Obecně">
diff --git a/locale/cs-CZ/aios.dtd b/locale/cs-CZ/aios.dtd
old mode 100755
new mode 100644
index 9d28803..0425075
--- a/locale/cs-CZ/aios.dtd
+++ b/locale/cs-CZ/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Přepínač zobrazení postranních lišt">
 <!ENTITY menu.grippy.label "Táhlo postranních lišt">
 <!ENTITY toolbar.name "Lišta rozšíření „All-in-One Sidebar“">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Sidebarheader Toolbar">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Toggle elements controlled by All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "Přepínač zobrazení postranního panelu a nástrojové lišty">
diff --git a/locale/cs-CZ/lib.dtd b/locale/cs-CZ/lib.dtd
old mode 100755
new mode 100644
index e44496c..8b2262e
--- a/locale/cs-CZ/lib.dtd
+++ b/locale/cs-CZ/lib.dtd
@@ -7,7 +7,7 @@
 <!ENTITY key.shift "Klávesa Shift">
 <!ENTITY menu.tools.label "Nástroje">
 <!ENTITY closeFolder.label "Zavřít všechny složky">
-<!ENTITY show.closeFolder.label "\'Close All Folders\' Button">
+<!ENTITY show.closeFolder.label "'Close All Folders' Button">
 <!ENTITY enable.autoClose.label "Automaticky zavřít ostatní složky">
 <!ENTITY enable.scrollToFolder.label "Automaticky přejít ke zvolené složce">
 <!ENTITY enable.rememberFolder.label "Pamatovat si a vždy přejít k naposled vybrané složce">
diff --git a/locale/cs-CZ/lib.properties b/locale/cs-CZ/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/cs-CZ/multipanel.dtd b/locale/cs-CZ/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/cs-CZ/prefs.dtd b/locale/cs-CZ/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/da/about.dtd b/locale/da/about.dtd
old mode 100755
new mode 100644
index cbc5bb2..25a475a
--- a/locale/da/about.dtd
+++ b/locale/da/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Om Alt-I-En Sidebjælke">
-<!ENTITY version "version">
 <!ENTITY settings "Indstillinger…">
 <!ENTITY close "Luk">
 <!ENTITY tab.about "Om">
diff --git a/locale/da/aios.dtd b/locale/da/aios.dtd
old mode 100755
new mode 100644
index ac529db..655f1bf
--- a/locale/da/aios.dtd
+++ b/locale/da/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Sidebjælke-kontakt">
 <!ENTITY menu.grippy.label "Sidebjælke Grippy">
 <!ENTITY toolbar.name "Alt-I-En Sidebjælke værktøjslinje">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Sidebjælkeheader værktøjslinje">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Slå elementer kontrolleret af AiOS til/fra">
 <!ENTITY button.switch.tooltip1 "Slå sidebjælke og værktøjslinje til/fra">
diff --git a/locale/da/lib.dtd b/locale/da/lib.dtd
old mode 100755
new mode 100644
index 0946ffa..7f3b134
--- a/locale/da/lib.dtd
+++ b/locale/da/lib.dtd
@@ -7,7 +7,7 @@
 <!ENTITY key.shift "Skift">
 <!ENTITY menu.tools.label "Værktøjer">
 <!ENTITY closeFolder.label "Luk Alle Mapper">
-<!ENTITY show.closeFolder.label "\'Close All Folders\' Button">
+<!ENTITY show.closeFolder.label "'Close All Folders' Button">
 <!ENTITY enable.autoClose.label "Luk automatisk andre mapper">
 <!ENTITY enable.scrollToFolder.label "Rul automatisk til valgte mappe">
 <!ENTITY enable.rememberFolder.label "Husk og fokuser på senest valgte mappe">
diff --git a/locale/da/lib.properties b/locale/da/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/da/multipanel.dtd b/locale/da/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/da/prefs.dtd b/locale/da/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/de/about.dtd b/locale/de/about.dtd
old mode 100755
new mode 100644
diff --git a/locale/de/aios.dtd b/locale/de/aios.dtd
old mode 100755
new mode 100644
index 55f8756..4214f27
--- a/locale/de/aios.dtd
+++ b/locale/de/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Sidebar-Umschalter">
 <!ENTITY menu.grippy.label "Sidebar-Griff">
 <!ENTITY toolbar.name "All-in-One-Sidebar-Symbolleiste">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Sidebartitel-Symbolleiste">
+<!ENTITY sbhtoolbar.label "Sidebartitel">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Elemente der All-in-One Sidebar anzeigen/verbergen">
 <!ENTITY button.switch.tooltip1 "Sidebar und Symbolleiste öffnen/schließen">
diff --git a/locale/de/lib.dtd b/locale/de/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/de/lib.properties b/locale/de/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/de/multipanel.dtd b/locale/de/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/de/prefs.dtd b/locale/de/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/el/about.dtd b/locale/el/about.dtd
old mode 100755
new mode 100644
index 4bfc513..56916c7
--- a/locale/el/about.dtd
+++ b/locale/el/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Περί All-in-One Sidebar">
-<!ENTITY version "έκδοση">
 <!ENTITY settings "Ρυθμίσεις…">
 <!ENTITY close "Κλείσιμο">
 <!ENTITY tab.about "Περί">
diff --git a/locale/el/aios.dtd b/locale/el/aios.dtd
old mode 100755
new mode 100644
index 7bd40fb..9d7d24d
--- a/locale/el/aios.dtd
+++ b/locale/el/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Διακόπτης πλευρικής στήλης">
 <!ENTITY menu.grippy.label "Λαβή πλευρικής στήλης">
 <!ENTITY toolbar.name "Εργαλειοθήκη All-in-One Sidebar">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Εργαλειοθήκη κεφαλίδας πλευρικής στήλης">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AIOS">
 <!ENTITY button.toggle.tooltip "Εναλλαγή κατάστασης των στοιχείων που διαμορφώνει το All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "Εναλλαγή πλευρικής στήλης και εργαλειοθήκης">
diff --git a/locale/el/lib.dtd b/locale/el/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/el/lib.properties b/locale/el/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/el/multipanel.dtd b/locale/el/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/el/prefs.dtd b/locale/el/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/en-GB/about.dtd b/locale/en-GB/about.dtd
old mode 100755
new mode 100644
index e1155d2..8fbb8a4
--- a/locale/en-GB/about.dtd
+++ b/locale/en-GB/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "About All-in-One Sidebar">
-<!ENTITY version "version">
 <!ENTITY settings "Settings…">
 <!ENTITY close "Close">
 <!ENTITY tab.about "About">
diff --git a/locale/en-GB/aios.dtd b/locale/en-GB/aios.dtd
old mode 100755
new mode 100644
index 0aa8ee0..f4e911b
--- a/locale/en-GB/aios.dtd
+++ b/locale/en-GB/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Sidebar Switch">
 <!ENTITY menu.grippy.label "Sidebar Grippy">
 <!ENTITY toolbar.name "All-in-One Sidebar Toolbar">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Sidebarheader Toolbar">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Toggle elements controlled by All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "Toggle Sidebar and Toolbar">
diff --git a/locale/en-GB/lib.dtd b/locale/en-GB/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/en-GB/lib.properties b/locale/en-GB/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/en-GB/multipanel.dtd b/locale/en-GB/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/en-GB/prefs.dtd b/locale/en-GB/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/en-US/about.dtd b/locale/en-US/about.dtd
old mode 100755
new mode 100644
diff --git a/locale/en-US/aios.dtd b/locale/en-US/aios.dtd
old mode 100755
new mode 100644
index 0aa8ee0..f4e911b
--- a/locale/en-US/aios.dtd
+++ b/locale/en-US/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Sidebar Switch">
 <!ENTITY menu.grippy.label "Sidebar Grippy">
 <!ENTITY toolbar.name "All-in-One Sidebar Toolbar">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Sidebarheader Toolbar">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Toggle elements controlled by All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "Toggle Sidebar and Toolbar">
diff --git a/locale/en-US/lib.dtd b/locale/en-US/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/en-US/lib.properties b/locale/en-US/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/en-US/multipanel.dtd b/locale/en-US/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/en-US/prefs.dtd b/locale/en-US/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/es-AR/about.dtd b/locale/es-AR/about.dtd
old mode 100755
new mode 100644
index 4bab103..8e3bd3f
--- a/locale/es-AR/about.dtd
+++ b/locale/es-AR/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Acerca de All-in-One Sidebar">
-<!ENTITY version "versión">
 <!ENTITY settings "Configuración…">
 <!ENTITY close "Cerrar">
 <!ENTITY tab.about "Acerca de">
diff --git a/locale/es-AR/aios.dtd b/locale/es-AR/aios.dtd
old mode 100755
new mode 100644
index cb42b08..e97de15
--- a/locale/es-AR/aios.dtd
+++ b/locale/es-AR/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Selector de Barra Lateral">
 <!ENTITY menu.grippy.label "Panel Lateral Grippy">
 <!ENTITY toolbar.name "Barra de Herramientas de All-in-One Sidebar">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Encabezado de la Barra Lateral de Herramientas">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Intercambia los elementos controlados por All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "Alternar entre Barra Lateral y Barra de Herramientas">
diff --git a/locale/es-AR/lib.dtd b/locale/es-AR/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/es-AR/lib.properties b/locale/es-AR/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/es-AR/multipanel.dtd b/locale/es-AR/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/es-AR/prefs.dtd b/locale/es-AR/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/es-ES/about.dtd b/locale/es-ES/about.dtd
old mode 100755
new mode 100644
index 28a4423..53c7cc9
--- a/locale/es-ES/about.dtd
+++ b/locale/es-ES/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Acerca de All-in-One Sidebar">
-<!ENTITY version "Versión">
 <!ENTITY settings "Opciones">
 <!ENTITY close "Cerrar">
 <!ENTITY tab.about "Acerca de">
diff --git a/locale/es-ES/aios.dtd b/locale/es-ES/aios.dtd
old mode 100755
new mode 100644
index c64e58e..0f7eaf3
--- a/locale/es-ES/aios.dtd
+++ b/locale/es-ES/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Botón panel lateral">
 <!ENTITY menu.grippy.label "Grippy del panel lateral">
 <!ENTITY toolbar.name "Barra de herramientas de All-in-One Sidebar">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Barra de herramientas del panel lateral">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "Activar panel lateral">
 <!ENTITY button.toggle.tooltip "Abrir/Cerrar panel lateral">
 <!ENTITY button.switch.tooltip1 "Activar panel lateral y barra de herramientas">
diff --git a/locale/es-ES/lib.dtd b/locale/es-ES/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/es-ES/lib.properties b/locale/es-ES/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/es-ES/multipanel.dtd b/locale/es-ES/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/es-ES/prefs.dtd b/locale/es-ES/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/et-EE/about.dtd b/locale/et-EE/about.dtd
old mode 100755
new mode 100644
index cc274b7..459820d
--- a/locale/et-EE/about.dtd
+++ b/locale/et-EE/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Teave All-in-One-Sidebar\'i kohta">
-<!ENTITY version "versioon">
 <!ENTITY settings "Seaded…">
 <!ENTITY close "Sule">
 <!ENTITY tab.about "Teave">
diff --git a/locale/et-EE/aios.dtd b/locale/et-EE/aios.dtd
old mode 100755
new mode 100644
index 7556131..06cc3d0
--- a/locale/et-EE/aios.dtd
+++ b/locale/et-EE/aios.dtd
@@ -1,9 +1,11 @@
 <!ENTITY loading.label "laadin paneeli…">
-<!ENTITY menu.prefs.label "All-in-One Sidebar'i seaded">
+<!ENTITY menu.prefs.label "All-in-One Sidebar'i seaded">
 <!ENTITY menu.togglebar.label "Külgpaani lülitus">
 <!ENTITY menu.grippy.label "Külgpaani haare">
 <!ENTITY toolbar.name "All-in-One Sidebar tööriistariba">
+<!ENTITY toolbar.label "All-in-One Sidebar">
 <!ENTITY sbhtoolbar.name "Külgpaani päise tööriistariba">
+<!ENTITY sbhtoolbar.label "Sidebar päis">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Lülita sisse-välja All-in-One Sidebar poolt kontrollitavad elemendid">
 <!ENTITY button.switch.tooltip1 "Lülita külgpaan ja tööriistariba sisse-välja">
diff --git a/locale/et-EE/lib.dtd b/locale/et-EE/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/et-EE/lib.properties b/locale/et-EE/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/et-EE/multipanel.dtd b/locale/et-EE/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/et-EE/prefs.dtd b/locale/et-EE/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/fi/about.dtd b/locale/fi/about.dtd
old mode 100755
new mode 100644
index 9454745..cc37db7
--- a/locale/fi/about.dtd
+++ b/locale/fi/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Tietoa All-in-One Sidebar lisäosasta">
-<!ENTITY version "versio">
 <!ENTITY settings "Asetukset…">
 <!ENTITY close "Sulje">
 <!ENTITY tab.about "Tietoa">
diff --git a/locale/fi/aios.dtd b/locale/fi/aios.dtd
old mode 100755
new mode 100644
index 3bdc079..74bb95d
--- a/locale/fi/aios.dtd
+++ b/locale/fi/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Sivupaneelin vaihto">
 <!ENTITY menu.grippy.label "Sivupaneelin kahva">
 <!ENTITY toolbar.name "All-in-One Sidebar työkalupalkki">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Sivupaneelin otsikkopalkki">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Kytke All-in-One Sidebarin hallitsemat elementit">
 <!ENTITY button.switch.tooltip1 "Kytke sivupaneeli ja työkalupalkki">
diff --git a/locale/fi/lib.dtd b/locale/fi/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/fi/lib.properties b/locale/fi/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/fi/multipanel.dtd b/locale/fi/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/fi/prefs.dtd b/locale/fi/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/fr/about.dtd b/locale/fr/about.dtd
old mode 100755
new mode 100644
index 42e4588..9c761d6
--- a/locale/fr/about.dtd
+++ b/locale/fr/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "À propos d'All-in-One Sidebar">
-<!ENTITY version "Version">
 <!ENTITY settings "Paramètres…">
 <!ENTITY close "Fermer">
 <!ENTITY tab.about "À propos">
diff --git a/locale/fr/aios.dtd b/locale/fr/aios.dtd
old mode 100755
new mode 100644
index 794b7d7..7ac48ea
--- a/locale/fr/aios.dtd
+++ b/locale/fr/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Activer/désactiver le panneau latéral">
 <!ENTITY menu.grippy.label "'Poignées' pour le panneau latéral">
 <!ENTITY toolbar.name "Barre d'outils d'All-in-One Sidebar">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "En-tête de la barre d'outils All-in-One Sidebar">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Activer/désactiver les éléments contrôlés par All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "Permuter panneau latéral et barre d'outils">
diff --git a/locale/fr/lib.dtd b/locale/fr/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/fr/lib.properties b/locale/fr/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/fr/multipanel.dtd b/locale/fr/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/fr/prefs.dtd b/locale/fr/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/he/about.dtd b/locale/he/about.dtd
old mode 100755
new mode 100644
index 0ecb806..2ac76ad
--- a/locale/he/about.dtd
+++ b/locale/he/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "אודות All-in-One Sidebar">
-<!ENTITY version "גרסה">
 <!ENTITY settings "אפשרויות…">
 <!ENTITY close "סגירה">
 <!ENTITY tab.about "אודות">
diff --git a/locale/he/aios.dtd b/locale/he/aios.dtd
old mode 100755
new mode 100644
index 8677c29..9d667e5
--- a/locale/he/aios.dtd
+++ b/locale/he/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "מתג סרגל-הצד">
 <!ENTITY menu.grippy.label "מזעור סרגל-הצד">
 <!ENTITY toolbar.name "סרגל הכלים של All-in-One Sidebar">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "סרגל הכלים של כותרת סרגל-הצד">
+<!ENTITY sbhtoolbar.label "כותרת סרגל-הצד">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "הצגת/הסתרת מרכיבים שנשלטים על ידי All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "הצגת/הסתרת סרגל-הצד וסרגל הכלים">
diff --git a/locale/he/lib.dtd b/locale/he/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/he/lib.properties b/locale/he/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/he/multipanel.dtd b/locale/he/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/he/prefs.dtd b/locale/he/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/hr-HR/about.dtd b/locale/hr-HR/about.dtd
old mode 100755
new mode 100644
index 03ce127..85b8c0b
--- a/locale/hr-HR/about.dtd
+++ b/locale/hr-HR/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "About All-in-One Sidebar">
-<!ENTITY version "inačica">
 <!ENTITY settings "Postavke…">
 <!ENTITY close "Zatvori">
 <!ENTITY tab.about "O">
diff --git a/locale/hr-HR/aios.dtd b/locale/hr-HR/aios.dtd
old mode 100755
new mode 100644
index bf8fe14..35c5787
--- a/locale/hr-HR/aios.dtd
+++ b/locale/hr-HR/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Prebacivanje rubnog stupca">
 <!ENTITY menu.grippy.label "Sidebar Grippy">
 <!ENTITY toolbar.name "All-in-One Sidebar alatna traka">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Sidebarheader Toolbar">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Promijeni elemente koje kontrolira All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "Promjena rubnog stupca i alatne trake">
diff --git a/locale/hr-HR/lib.dtd b/locale/hr-HR/lib.dtd
old mode 100755
new mode 100644
index 3433967..618ba95
--- a/locale/hr-HR/lib.dtd
+++ b/locale/hr-HR/lib.dtd
@@ -7,7 +7,7 @@
 <!ENTITY key.shift "Shift">
 <!ENTITY menu.tools.label "Alati">
 <!ENTITY closeFolder.label "Zatvori sve mape">
-<!ENTITY show.closeFolder.label "\'Close All Folders\' Button">
+<!ENTITY show.closeFolder.label "'Close All Folders' Button">
 <!ENTITY enable.autoClose.label "Automatski zatvori ostale mape">
 <!ENTITY enable.scrollToFolder.label "Automatski pomakni na odabranu mapu">
 <!ENTITY enable.rememberFolder.label "Zapamti i fokusiraj zadnje odabranu mapu">
diff --git a/locale/hr-HR/lib.properties b/locale/hr-HR/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/hr-HR/multipanel.dtd b/locale/hr-HR/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/hr-HR/prefs.dtd b/locale/hr-HR/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/hu-HU/about.dtd b/locale/hu-HU/about.dtd
old mode 100755
new mode 100644
index 81bda17..dacbcc3
--- a/locale/hu-HU/about.dtd
+++ b/locale/hu-HU/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Az All-in-One Sidebar névjegye">
-<!ENTITY version "verzió">
 <!ENTITY settings "Beállítások…">
 <!ENTITY close "Bezárás">
 <!ENTITY tab.about "Névjegy">
diff --git a/locale/hu-HU/aios.dtd b/locale/hu-HU/aios.dtd
old mode 100755
new mode 100644
index 8a26e8c..92370f9
--- a/locale/hu-HU/aios.dtd
+++ b/locale/hu-HU/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Oldalsáv-kapcsoló">
 <!ENTITY menu.grippy.label "Mozgatható oldalsáv">
 <!ENTITY toolbar.name "All-in-One Sidebar Eszköztár">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Oldalsáv eszköztár">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Az All-in-One Sidebar által vezérelt elemek váltása">
 <!ENTITY button.switch.tooltip1 "Oldalsáv és Eszköztár megnyitása/bezárása">
diff --git a/locale/hu-HU/lib.dtd b/locale/hu-HU/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/hu-HU/lib.properties b/locale/hu-HU/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/hu-HU/multipanel.dtd b/locale/hu-HU/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/hu-HU/prefs.dtd b/locale/hu-HU/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/hy-AM/about.dtd b/locale/hy-AM/about.dtd
old mode 100755
new mode 100644
index f6efa3f..6dc73f1
--- a/locale/hy-AM/about.dtd
+++ b/locale/hy-AM/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "All-in-One Sidebar-ի մասին">
-<!ENTITY version "տարբերակ">
 <!ENTITY settings "Նախընտրանքներ…">
 <!ENTITY close "Փակել">
 <!ENTITY tab.about "Մասին">
diff --git a/locale/hy-AM/aios.dtd b/locale/hy-AM/aios.dtd
old mode 100755
new mode 100644
index 5ca6568..9e01d1f
--- a/locale/hy-AM/aios.dtd
+++ b/locale/hy-AM/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Կողավահանակի Փոխանջատիչ">
 <!ENTITY menu.grippy.label "Կողավահանակի բռնակ">
 <!ENTITY toolbar.name "All-in-One Sidebar Գործիքաշար">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Կողավահանակի վերնագրի Գործիքաշար">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Փոխանջատել">
 <!ENTITY button.switch.tooltip1 "Կողավահանակը և Գործիքաշարը">
diff --git a/locale/hy-AM/lib.dtd b/locale/hy-AM/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/hy-AM/lib.properties b/locale/hy-AM/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/hy-AM/multipanel.dtd b/locale/hy-AM/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/hy-AM/prefs.dtd b/locale/hy-AM/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/it/about.dtd b/locale/it/about.dtd
old mode 100755
new mode 100644
index 03e26d7..3f0c5f5
--- a/locale/it/about.dtd
+++ b/locale/it/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Informazioni su All-in-One Sidebar">
-<!ENTITY version "versione">
 <!ENTITY settings "Impostazioni…">
 <!ENTITY close "Chiudi">
 <!ENTITY tab.about "Informazioni">
diff --git a/locale/it/aios.dtd b/locale/it/aios.dtd
old mode 100755
new mode 100644
index e3f1b4d..73b8a77
--- a/locale/it/aios.dtd
+++ b/locale/it/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Bordo cliccabile (Mostra/Nasconde AiOS)">
 <!ENTITY menu.grippy.label "Barra laterale Grippy">
 <!ENTITY toolbar.name "Barra degli strumenti di All-in-One Sidebar">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Barra laterale">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Attiva/Disattiva gli elementi controllati da All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "Attiva/Disattiva barra laterale e degli strumenti">
diff --git a/locale/it/lib.dtd b/locale/it/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/it/lib.properties b/locale/it/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/it/multipanel.dtd b/locale/it/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/it/prefs.dtd b/locale/it/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/ja-JP/about.dtd b/locale/ja-JP/about.dtd
old mode 100755
new mode 100644
index da5fcf6..f8e23aa
--- a/locale/ja-JP/about.dtd
+++ b/locale/ja-JP/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "All-in-One Sidebar について">
-<!ENTITY version "バージョン">
 <!ENTITY settings "設定">
 <!ENTITY close "閉じる">
 <!ENTITY tab.about "About">
diff --git a/locale/ja-JP/aios.dtd b/locale/ja-JP/aios.dtd
old mode 100755
new mode 100644
index ec75286..88b7919
--- a/locale/ja-JP/aios.dtd
+++ b/locale/ja-JP/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "サイドバースイッチ">
 <!ENTITY menu.grippy.label "サイドバーグリップ">
 <!ENTITY toolbar.name "All-in-One Sidebar ツールバー">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "サイドバーヘッダー ツールバー">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "All-in-One Sidebar のトグル機能">
 <!ENTITY button.switch.tooltip1 "サイドバーとツールバーの開閉">
diff --git a/locale/ja-JP/lib.dtd b/locale/ja-JP/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/ja-JP/lib.properties b/locale/ja-JP/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/ja-JP/multipanel.dtd b/locale/ja-JP/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/ja-JP/prefs.dtd b/locale/ja-JP/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/ko-KR/about.dtd b/locale/ko-KR/about.dtd
old mode 100755
new mode 100644
index 7aaccba..13289c6
--- a/locale/ko-KR/about.dtd
+++ b/locale/ko-KR/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "All-In-One Sidebar 정보">
-<!ENTITY version "버전">
 <!ENTITY settings "설정…">
 <!ENTITY close "닫기">
 <!ENTITY tab.about "AIOS는">
diff --git a/locale/ko-KR/aios.dtd b/locale/ko-KR/aios.dtd
old mode 100755
new mode 100644
index 5a33c31..c6ae835
--- a/locale/ko-KR/aios.dtd
+++ b/locale/ko-KR/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "탐색 창 스위치">
 <!ENTITY menu.grippy.label "탐색 창 손잡이">
 <!ENTITY toolbar.name "All-In-One Sidebar 도구 모음">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "탐색 창 헤더 도구 모음">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "All-in-One Sidebar가 통제하는 요소들을 보이거나 숨깁니다.">
 <!ENTITY button.switch.tooltip1 "탐색 창과 도구 모음을 보이거나 숨깁니다.">
diff --git a/locale/ko-KR/lib.dtd b/locale/ko-KR/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/ko-KR/lib.properties b/locale/ko-KR/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/ko-KR/multipanel.dtd b/locale/ko-KR/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/ko-KR/prefs.dtd b/locale/ko-KR/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/lt-LT/about.dtd b/locale/lt-LT/about.dtd
old mode 100755
new mode 100644
index 8dace55..d533f68
--- a/locale/lt-LT/about.dtd
+++ b/locale/lt-LT/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Apie „All-in-One Sidebar“">
-<!ENTITY version "versija">
 <!ENTITY settings "Nustatymai…">
 <!ENTITY close "Užverti">
 <!ENTITY tab.about "Apie">
diff --git a/locale/lt-LT/aios.dtd b/locale/lt-LT/aios.dtd
old mode 100755
new mode 100644
index da7e512..ff7948b
--- a/locale/lt-LT/aios.dtd
+++ b/locale/lt-LT/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Parankinės jungiklis">
 <!ENTITY menu.grippy.label "Parankinės juostelė">
 <!ENTITY toolbar.name "„All-in-One Sidebar“ priemonių juosta">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Sidebarheader Toolbar">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Įjungti/išjungti „All-in-One Sidebar“ valdomus elementus">
 <!ENTITY button.switch.tooltip1 "Įjungti/išjungti parankinę ir priemonių juostą">
diff --git a/locale/lt-LT/lib.dtd b/locale/lt-LT/lib.dtd
old mode 100755
new mode 100644
index bf7e7bb..233ee4c
--- a/locale/lt-LT/lib.dtd
+++ b/locale/lt-LT/lib.dtd
@@ -7,7 +7,7 @@
 <!ENTITY key.shift "Shift">
 <!ENTITY menu.tools.label "Priemonės">
 <!ENTITY closeFolder.label "Užverti visus aplankus">
-<!ENTITY show.closeFolder.label "\'Close All Folders\' Button">
+<!ENTITY show.closeFolder.label "'Close All Folders' Button">
 <!ENTITY enable.autoClose.label "Automatiškai užverti kitus aplankus">
 <!ENTITY enable.scrollToFolder.label "Automatiškai pereiti prie pasirinkto aplanko">
 <!ENTITY enable.rememberFolder.label "Įsiminti ir fokusuoti paskutinį pasirinktą aplanką">
diff --git a/locale/lt-LT/lib.properties b/locale/lt-LT/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/lt-LT/multipanel.dtd b/locale/lt-LT/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/lt-LT/prefs.dtd b/locale/lt-LT/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/nb-NO/about.dtd b/locale/nb-NO/about.dtd
old mode 100755
new mode 100644
index df689ff..3e93818
--- a/locale/nb-NO/about.dtd
+++ b/locale/nb-NO/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Om All-in-One Sidebar">
-<!ENTITY version "versjon">
 <!ENTITY settings "Innstillinger…">
 <!ENTITY close "Lukk">
 <!ENTITY tab.about "Om">
diff --git a/locale/nb-NO/aios.dtd b/locale/nb-NO/aios.dtd
old mode 100755
new mode 100644
index 88727ff..460de44
--- a/locale/nb-NO/aios.dtd
+++ b/locale/nb-NO/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Sidestolpe bryter">
 <!ENTITY menu.grippy.label "Sidestolpe klebrig">
 <!ENTITY toolbar.name "All-in-One sidestolpe verktøylinje">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Sidebarheader Toolbar">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Håndter elementer som kontrolleres av All-in-One sidestolpe">
 <!ENTITY button.switch.tooltip1 "Håndter sidestolpe og verktøylinje">
diff --git a/locale/nb-NO/lib.dtd b/locale/nb-NO/lib.dtd
old mode 100755
new mode 100644
index 6d1a503..c4c5aff
--- a/locale/nb-NO/lib.dtd
+++ b/locale/nb-NO/lib.dtd
@@ -7,7 +7,7 @@
 <!ENTITY key.shift "Skift">
 <!ENTITY menu.tools.label "Verktøy">
 <!ENTITY closeFolder.label "Lukk alle mappene">
-<!ENTITY show.closeFolder.label "\'Close All Folders\' Button">
+<!ENTITY show.closeFolder.label "'Close All Folders' Button">
 <!ENTITY enable.autoClose.label "Lukk andre mapper automatisk">
 <!ENTITY enable.scrollToFolder.label "Rull automatisk til valgte mappe">
 <!ENTITY enable.rememberFolder.label "Husk og fokuser på sist valgte mappe">
diff --git a/locale/nb-NO/lib.properties b/locale/nb-NO/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/nb-NO/multipanel.dtd b/locale/nb-NO/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/nb-NO/prefs.dtd b/locale/nb-NO/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/nl/about.dtd b/locale/nl/about.dtd
old mode 100755
new mode 100644
index 2dda17e..2566b0d
--- a/locale/nl/about.dtd
+++ b/locale/nl/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Over All-in-One Sidebar">
-<!ENTITY version "versie">
 <!ENTITY settings "Instellingen…">
 <!ENTITY close "Sluiten">
 <!ENTITY tab.about "Over">
@@ -8,7 +7,7 @@
 <!ENTITY tab.trans "Vertalers">
 <!ENTITY about.desc "De All-in-One zijbalk laat u verschillende vensters in de zijbalk openen en u gemakkelijk hiertussen wisselen, zoals bladwijzers, geschiedenis, downloads en add-ons. Maak een einde aan de vensterchaos!">
 <!ENTITY create.desc "gemaakt door Ingo Wennemaring, Hamburg [Duitsland]">
-<!ENTITY help.desc "You will find many information about this addon on the website:">
+<!ENTITY help.desc "Informatie over deze add-on is op deze website te vinden:">
 <!ENTITY about1.name "Homepage - veel informatie op 1 plaats">
 <!ENTITY about2.name "Functies - alle functies van All-in-One Sidebar">
 <!ENTITY about3.name "FAQ - veel gestelde vragen en antwoorden">
diff --git a/locale/nl/aios.dtd b/locale/nl/aios.dtd
old mode 100755
new mode 100644
index fed4406..c7f03de
--- a/locale/nl/aios.dtd
+++ b/locale/nl/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Zijbalkwisselaar">
 <!ENTITY menu.grippy.label "Zijbalkhandvat">
 <!ENTITY toolbar.name "All-in-One Sidebar werkbalk">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Zijbalkkop werkbalk">
+<!ENTITY sbhtoolbar.label "Zijbalkkop">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Elementen openen/sluiten gecontroleerd door All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "Werk- en zijbalk openen/sluiten">
diff --git a/locale/nl/lib.dtd b/locale/nl/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/nl/lib.properties b/locale/nl/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/nl/multipanel.dtd b/locale/nl/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/nl/prefs.dtd b/locale/nl/prefs.dtd
old mode 100755
new mode 100644
index e6d0319..8393bbf
--- a/locale/nl/prefs.dtd
+++ b/locale/nl/prefs.dtd
@@ -21,7 +21,7 @@
 <!ENTITY tab.menus "Menu’s">
 <!ENTITY tab.menus.sidebar "Zijbalk">
 <!ENTITY tab.keys "Sneltoetsen">
-<!ENTITY tab.about "About/Help">
+<!ENTITY tab.about "Over/Help">
 <!ENTITY gen.orient.caption "Oriëntatie">
 <!ENTITY gen.orient.label "Zijbalk tonen aan">
 <!ENTITY gen.orient.left "linkerkant">
diff --git a/locale/pl/about.dtd b/locale/pl/about.dtd
old mode 100755
new mode 100644
index 48b21ed..9cca4ff
--- a/locale/pl/about.dtd
+++ b/locale/pl/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "O All-in-One Sidebar">
-<!ENTITY version "wersja">
 <!ENTITY settings "Ustawienia">
 <!ENTITY close "Zamknij">
 <!ENTITY tab.about "O AIOS">
diff --git a/locale/pl/aios.dtd b/locale/pl/aios.dtd
old mode 100755
new mode 100644
index 694f2f5..b4797f9
--- a/locale/pl/aios.dtd
+++ b/locale/pl/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Przełącznik panelu bocznego">
 <!ENTITY menu.grippy.label "Panel boczny Grippy">
 <!ENTITY toolbar.name "Pasek narzędzi All-in-One Sidebar">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Pasek narzędzi nagłówka panelu bocznego">
+<!ENTITY sbhtoolbar.label "Nagłówek panelu bocznego">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Wyświetla/ukrywa elementy kontrolowane przez All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "Wyświetla/ukrywa panel boczny i pasek narzędzi">
diff --git a/locale/pl/lib.dtd b/locale/pl/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/pl/lib.properties b/locale/pl/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/pl/multipanel.dtd b/locale/pl/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/pl/prefs.dtd b/locale/pl/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/pt-BR/about.dtd b/locale/pt-BR/about.dtd
old mode 100755
new mode 100644
index 4cf77cc..e00fd28
--- a/locale/pt-BR/about.dtd
+++ b/locale/pt-BR/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Sobre o All-in-One Sidebar">
-<!ENTITY version "versão">
 <!ENTITY settings "Configurações…">
 <!ENTITY close "Fechar">
 <!ENTITY tab.about "Sobre">
diff --git a/locale/pt-BR/aios.dtd b/locale/pt-BR/aios.dtd
old mode 100755
new mode 100644
index 58fa4c7..13143d9
--- a/locale/pt-BR/aios.dtd
+++ b/locale/pt-BR/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Alternador do painel">
 <!ENTITY menu.grippy.label "Pegador do painel">
 <!ENTITY toolbar.name "All-in-One Sidebar">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Barra de ferramentas de cabeçalho de painel">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Ativa/desativa elementos controlados pelo All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "Ativa/desativa a barra lateral e de ferramentas">
diff --git a/locale/pt-BR/lib.dtd b/locale/pt-BR/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/pt-BR/lib.properties b/locale/pt-BR/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/pt-BR/multipanel.dtd b/locale/pt-BR/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/pt-BR/prefs.dtd b/locale/pt-BR/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/pt-PT/about.dtd b/locale/pt-PT/about.dtd
old mode 100755
new mode 100644
index 9f2d85e..c7839a6
--- a/locale/pt-PT/about.dtd
+++ b/locale/pt-PT/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Sobre o All-in-One Sidebar">
-<!ENTITY version "versão">
 <!ENTITY settings "Definições…">
 <!ENTITY close "Fechar">
 <!ENTITY tab.about "Sobre">
diff --git a/locale/pt-PT/aios.dtd b/locale/pt-PT/aios.dtd
old mode 100755
new mode 100644
index 40af54b..61e1c88
--- a/locale/pt-PT/aios.dtd
+++ b/locale/pt-PT/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Pega da Barra Lateral">
 <!ENTITY menu.grippy.label "Pega da barra lateral">
 <!ENTITY toolbar.name "Barra de ferramentas do All-in-One Sidebar">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Cabeçalho da barra de ferramenta lateral">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Toggle elementos controlados pelo All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "Toggle barra lateral e barra de Ferramentas">
diff --git a/locale/pt-PT/lib.dtd b/locale/pt-PT/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/pt-PT/lib.properties b/locale/pt-PT/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/pt-PT/multipanel.dtd b/locale/pt-PT/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/pt-PT/prefs.dtd b/locale/pt-PT/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/ro/about.dtd b/locale/ro/about.dtd
old mode 100755
new mode 100644
index 2f63c69..1228ae0
--- a/locale/ro/about.dtd
+++ b/locale/ro/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Despre All-in-One Sidebar">
-<!ENTITY version "versiunea">
 <!ENTITY settings "Opțiuni…">
 <!ENTITY close "Închide">
 <!ENTITY tab.about "Despre AiOS">
diff --git a/locale/ro/aios.dtd b/locale/ro/aios.dtd
old mode 100755
new mode 100644
index 6c2da12..cc98fb6
--- a/locale/ro/aios.dtd
+++ b/locale/ro/aios.dtd
@@ -1,9 +1,11 @@
-<!ENTITY loading.label "încărcare panou...">
-<!ENTITY menu.prefs.label "Opțiuni AiOS...">
+<!ENTITY loading.label "se încărcă panoul…">
+<!ENTITY menu.prefs.label "Opţiuni AiOS…">
 <!ENTITY menu.togglebar.label "Comutator panou lateral">
 <!ENTITY menu.grippy.label "Glisor panou lateral">
 <!ENTITY toolbar.name "Bară de unelte AiOS">
-<!ENTITY sbhtoolbar.name "Bară antet AiOS">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
+<!ENTITY sbhtoolbar.name "Bară de unelte panou lateral">
+<!ENTITY sbhtoolbar.label "Antet panou lateral">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Afișează/ascunde panoul lateral și selectează elementele controlate de AiOS">
 <!ENTITY button.switch.tooltip1 "Afișează/ascunde panoul lateral și bara de unelte">
diff --git a/locale/ro/lib.dtd b/locale/ro/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/ro/lib.properties b/locale/ro/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/ro/multipanel.dtd b/locale/ro/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/ro/prefs.dtd b/locale/ro/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/ru/about.dtd b/locale/ru/about.dtd
old mode 100755
new mode 100644
index 879b96d..018a23c
--- a/locale/ru/about.dtd
+++ b/locale/ru/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "О All-in-One Sidebar">
-<!ENTITY version "версия">
 <!ENTITY settings "Настройки…">
 <!ENTITY close "Закрыть">
 <!ENTITY tab.about "Информация о расширении">
diff --git a/locale/ru/aios.dtd b/locale/ru/aios.dtd
old mode 100755
new mode 100644
index 32fdf86..73b528c
--- a/locale/ru/aios.dtd
+++ b/locale/ru/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Переключатель боковой панели">
 <!ENTITY menu.grippy.label "Кнопка “Свернуть/Развернуть”">
 <!ENTITY toolbar.name "Боковая панель инструментов">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Панель инструментов заголовка окна боковой панели">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Переключить боковые панели с помощью All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "Переключить панель инструментов и боковую панель">
diff --git a/locale/ru/lib.dtd b/locale/ru/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/ru/lib.properties b/locale/ru/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/ru/multipanel.dtd b/locale/ru/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/ru/prefs.dtd b/locale/ru/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/sk-SK/about.dtd b/locale/sk-SK/about.dtd
old mode 100755
new mode 100644
index f5b7637..b5db19c
--- a/locale/sk-SK/about.dtd
+++ b/locale/sk-SK/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "O rozšírení All-in-One Sidebar">
-<!ENTITY version "verzia">
 <!ENTITY settings "Možnosti…">
 <!ENTITY close "Zatvoriť">
 <!ENTITY tab.about "O rozšírení">
diff --git a/locale/sk-SK/aios.dtd b/locale/sk-SK/aios.dtd
old mode 100755
new mode 100644
index bafb7c7..dba5d2f
--- a/locale/sk-SK/aios.dtd
+++ b/locale/sk-SK/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Prepínač zobrazenia bočného panela">
 <!ENTITY menu.grippy.label "Zobraziť tlačidlá na skrývanie bočného panela">
 <!ENTITY toolbar.name "Lišta All-in-One Sidebar">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Sidebarheader Toolbar">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Zobraziť/Skryť elementy kontrolované All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "Skryť bočný panel a panel s nástrojmi">
diff --git a/locale/sk-SK/lib.dtd b/locale/sk-SK/lib.dtd
old mode 100755
new mode 100644
index b841900..8fd5930
--- a/locale/sk-SK/lib.dtd
+++ b/locale/sk-SK/lib.dtd
@@ -7,7 +7,7 @@
 <!ENTITY key.shift "Shift">
 <!ENTITY menu.tools.label "Nástroje">
 <!ENTITY closeFolder.label "Zatvoriť všetky priečinky">
-<!ENTITY show.closeFolder.label "\'Close All Folders\' Button">
+<!ENTITY show.closeFolder.label "'Close All Folders' Button">
 <!ENTITY enable.autoClose.label "Zatvoriť automaticky ostatné priečinky">
 <!ENTITY enable.scrollToFolder.label "Posunúť sa automaticky na označený priečinok">
 <!ENTITY enable.rememberFolder.label "Zapamätať a označiť posledný zvolený priečinok">
diff --git a/locale/sk-SK/lib.properties b/locale/sk-SK/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/sk-SK/multipanel.dtd b/locale/sk-SK/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/sk-SK/prefs.dtd b/locale/sk-SK/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/sq-AL/about.dtd b/locale/sq-AL/about.dtd
old mode 100755
new mode 100644
index d2643b9..b2ee277
--- a/locale/sq-AL/about.dtd
+++ b/locale/sq-AL/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Rreth All-in-One Sidebar">
-<!ENTITY version "versioni">
 <!ENTITY settings "Parapëlqimet...">
 <!ENTITY close "Mbylle">
 <!ENTITY tab.about "Rreth">
diff --git a/locale/sq-AL/aios.dtd b/locale/sq-AL/aios.dtd
old mode 100755
new mode 100644
index eeca8fb..f552e52
--- a/locale/sq-AL/aios.dtd
+++ b/locale/sq-AL/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Kthimi i Shiritit Anësor">
 <!ENTITY menu.grippy.label "Kapja e Shiritit Anësor">
 <!ENTITY toolbar.name "Shiriti i Mjeteve të "All-in-One Shiritit Anësorë"">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Shiriti i Mjeteve të shiritit anësorë në kokë">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Elementet në bërryl të kontrolluara nga "All-in-One Shiritit Anësor"">
 <!ENTITY button.switch.tooltip1 "Shirit Mjetesh dhe Shirit Anësor në Bërryl">
diff --git a/locale/sq-AL/lib.dtd b/locale/sq-AL/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/sq-AL/lib.properties b/locale/sq-AL/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/sq-AL/multipanel.dtd b/locale/sq-AL/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/sq-AL/prefs.dtd b/locale/sq-AL/prefs.dtd
old mode 100755
new mode 100644
index 9af9ec8..4730e03
--- a/locale/sq-AL/prefs.dtd
+++ b/locale/sq-AL/prefs.dtd
@@ -72,7 +72,7 @@
 <!ENTITY keyconfig.warn "Changes affect only new windows">
 <!ENTITY keyconfig.onreset "Kërkohet rinisje e shfletuesit">
 <!ENTITY keyconfig.unrecognized "I/E pa njohur ($1)">
-<!ENTITY keyconfig.used "This key is already used by: \\n\\n\\t$1\\n\\nIt might still work, though.">
+<!ENTITY keyconfig.used "This key is already used by: \n\n\t$1\n\nIt might still work, though.">
 <!ENTITY menus.sidebar.desc "Customize the entries in the menu “View > Sidebar” and in the dropdown menus of the sidebar buttons.">
 <!ENTITY menus.icons.label "Trego Ikonat">
 <!ENTITY menus.entries.label "Trego Hyrjet">
diff --git a/locale/sr/about.dtd b/locale/sr/about.dtd
old mode 100755
new mode 100644
index cab7277..9b1e5eb
--- a/locale/sr/about.dtd
+++ b/locale/sr/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "О АиОС-у">
-<!ENTITY version "издање">
 <!ENTITY settings "Подешавања…">
 <!ENTITY close "Затвори">
 <!ENTITY tab.about "О додатку">
diff --git a/locale/sr/aios.dtd b/locale/sr/aios.dtd
old mode 100755
new mode 100644
index 7d8ef81..e67f1fe
--- a/locale/sr/aios.dtd
+++ b/locale/sr/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Пребацивање бочне траке">
 <!ENTITY menu.grippy.label "Збијена бочна трака">
 <!ENTITY toolbar.name "АиОС трака задатака">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Sidebarheader трака са задацима">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "АиОС">
 <!ENTITY button.toggle.tooltip "Промени елементе контролисане од АиОС-а">
 <!ENTITY button.switch.tooltip1 "Промени траку задатака и алатну траку">
diff --git a/locale/sr/lib.dtd b/locale/sr/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/sr/lib.properties b/locale/sr/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/sr/multipanel.dtd b/locale/sr/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/sr/prefs.dtd b/locale/sr/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/sv-SE/about.dtd b/locale/sv-SE/about.dtd
old mode 100755
new mode 100644
index 80bd202..658a981
--- a/locale/sv-SE/about.dtd
+++ b/locale/sv-SE/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Om All-in-One Sidebar">
-<!ENTITY version "version">
 <!ENTITY settings "Inställningar…">
 <!ENTITY close "Stäng">
 <!ENTITY tab.about "Om">
diff --git a/locale/sv-SE/aios.dtd b/locale/sv-SE/aios.dtd
old mode 100755
new mode 100644
index de37426..cbd719f
--- a/locale/sv-SE/aios.dtd
+++ b/locale/sv-SE/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Sidopanelsomkopplare">
 <!ENTITY menu.grippy.label "Sidopanelsgrepp">
 <!ENTITY toolbar.name "All-in-One Sidebars verktygsfält">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Sidebar verktygsfält">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Aktivera/Avaktivera objekt styrt av All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "Visa/dölj sidopanel och verktygsfält">
diff --git a/locale/sv-SE/lib.dtd b/locale/sv-SE/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/sv-SE/lib.properties b/locale/sv-SE/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/sv-SE/multipanel.dtd b/locale/sv-SE/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/sv-SE/prefs.dtd b/locale/sv-SE/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/tr/about.dtd b/locale/tr/about.dtd
old mode 100755
new mode 100644
index c5439b7..6ccfc72
--- a/locale/tr/about.dtd
+++ b/locale/tr/about.dtd
@@ -1,39 +1,38 @@
 <!ENTITY title "All-in-One Sidebar">
-<!ENTITY version "sürüm">
-<!ENTITY settings "Ayarlar...">
+<!ENTITY settings "Ayarlar">
 <!ENTITY close "Kapat">
 <!ENTITY tab.about "Hakkında">
 <!ENTITY tab.help "Yardım">
 <!ENTITY tab.contrib "Destekleyenler">
 <!ENTITY tab.trans "Çevirmenler">
 <!ENTITY about.desc "All-in-One Sidebar çeşitli pencelerleri kenar çubuğu panellerinde açmanızı ve birbirleri arasında gezinmenizi sağlar. Böylece pencere karmaşasına bir nokta koyar. Yer imleri ve geçmiş yanında indirilenler, eklentiler ve diğer pencereleri de kenar çubuğunda açar.">
-<!ENTITY create.desc "yapımcısı Ingo Wennemaring, Hamburg [Almanya]">
+<!ENTITY create.desc "Ingo Wennemaring, Hamburg [Almanya] tarafından yapılmıstır.">
 <!ENTITY help.desc "Bu eklentiyle ilgili birçok bilgiyi şu ağ sayfasında bulabilirsiniz:">
-<!ENTITY about1.name "Ağ sayfası - bir çok bilgi tek sayfada">
-<!ENTITY about2.name "Özellikler - All-in-One Sidebar eklentisinin tüm özellikleri">
-<!ENTITY about3.name "SSS - Sık sorulan sorular ve yanıtları">
-<!ENTITY about4.name "Bilinen hatalar - tanımlamalar ve sorun giderme">
-<!ENTITY about5.name "Forum - tartışma, hata raporları, tema düzeltmeleri ve diğer konular">
-<!ENTITY about6.name "Değişiklikler - geçmiş ve değişiklikler">
-<!ENTITY about7.name "Yapılacaklar - düşünüler özellikler ve geliştirmeler">
-<!ENTITY contrib.desc "Aşağıdaki geliştiricilere önerileri ve yazılım eklentileri için teşekkür ederim [ad sıralı]:">
-<!ENTITY contrib.thanks "Son olarak, geliştirme kurulumlarını test ederek, hataları forumlardan raporlayarak, düşünce ve önerilerini paylaşarak ya da yalnızca güzel bir yorum yazarak yardım eden tüm kullanıcılara teşekkür ederim. :-) Çok çok teşekkürler!">
-<!ENTITY trans.desc "All-in-One Sidebar çevirmenleri [dil kodu sıralı]:">
+<!ENTITY about1.name "Web sayfası - Detaylı bilgiler">
+<!ENTITY about2.name "Özellikler- All-in-One Sidebar eklentisinin bütün özellikler">
+<!ENTITY about3.name "SSS - Sık sorulan sorular ve cevaplar">
+<!ENTITY about4.name "Bilinen hatalar - Bilinen hatalar hakkında açıklamalar">
+<!ENTITY about5.name "Forum - Hata raporları, düzeltmeler diğer konular">
+<!ENTITY about6.name "Değişiklikler - Sürümlerde yapılan değişiklikler">
+<!ENTITY about7.name "Yapılacaklar - Yapılması düşünülen yenilikler">
+<!ENTITY contrib.desc "Kod desteği ve yaptıkları öneriler ile aşağıdaki ismi geçen herkese teşekkür ederim:">
+<!ENTITY contrib.thanks "Tüm kullanıcılara,gelitirmede yardım etmiş ve test etmiş herkese teşekkürler.Hataları forumda bildirin,fikirlerinizi ve görmek istediklerinizi paylaşın.Kimler güzel yorumlar yazdıysa :-) Çok çok teşekkürler!">
+<!ENTITY trans.desc "All-in-One Sidebar çeviricileri (Dil kodlarıyla alfabedik sırada)">
 <!ENTITY trans.ar-SA.lang "Arapça">
 <!ENTITY trans.be-BY.lang "Belarusça">
 <!ENTITY trans.cs-CZ.lang "Çekce">
-<!ENTITY trans.da-DK.lang "Danca">
+<!ENTITY trans.da-DK.lang "Danimarkaca">
 <!ENTITY trans.de-DE.lang "Almanca">
 <!ENTITY trans.el-GR.lang "Yunanca">
 <!ENTITY trans.en-GB.lang "İngilizce (İngiliz)">
 <!ENTITY trans.en-US.lang "İngilizce (Amerikan)">
 <!ENTITY trans.es-AR.lang "İspanyolca (Arjantin)">
 <!ENTITY trans.es-ES.lang "İspanyolca (İspanya)">
-<!ENTITY trans.et-EE.lang "Estçe">
-<!ENTITY trans.fi-FI.lang "Fince">
+<!ENTITY trans.et-EE.lang "Estonya">
+<!ENTITY trans.fi-FI.lang "Finlandiyaca">
 <!ENTITY trans.fr-FR.lang "Fransızca">
 <!ENTITY trans.he-IL.lang "İbranice">
-<!ENTITY trans.hr-HR.lang "Hırvatça">
+<!ENTITY trans.hr-HR.lang "Hırvatca">
 <!ENTITY trans.hu-HU.lang "Macarca">
 <!ENTITY trans.hy-AM.lang "Ermenice (Ermenistan)">
 <!ENTITY trans.it-IT.lang "İtalyanca">
@@ -41,19 +40,19 @@
 <!ENTITY trans.ko-KR.lang "Korece">
 <!ENTITY trans.lt-LT.lang "Litvanyaca">
 <!ENTITY trans.nb-NO.lang "Norveççe">
-<!ENTITY trans.nl-NL.lang "Felemenkçe">
-<!ENTITY trans.pl-PL.lang "Lehçe">
-<!ENTITY trans.pt-BR.lang "Portekizce (Brazilya)">
-<!ENTITY trans.pt-PT.lang "Portekizce (Portekiz)">
+<!ENTITY trans.nl-NL.lang "Felemenkce">
+<!ENTITY trans.pl-PL.lang "Polonyaca">
+<!ENTITY trans.pt-BR.lang "Portekizce (Brazilya">
+<!ENTITY trans.pt-PT.lang "Portekizce (Portekiz">
 <!ENTITY trans.ro-RO.lang "Romence">
 <!ENTITY trans.ru-RU.lang "Rusça">
-<!ENTITY trans.sk-SK.lang "Slovakça">
+<!ENTITY trans.sk-SK.lang "Slovakca">
 <!ENTITY trans.sq-AL.lang "Arnavutça">
 <!ENTITY trans.sr-RS.lang "Sırpça (Kril)">
-<!ENTITY trans.sv-SE.lang "İsveççe">
+<!ENTITY trans.sv-SE.lang "İsveçce">
 <!ENTITY trans.tr-TR.lang "Türkçe">
 <!ENTITY trans.uk-UA.lang "Ukraynaca">
 <!ENTITY trans.vi-VN.lang "Vietnamca (Vietnam)">
 <!ENTITY trans.zh-CN.lang "Çince (Yalın)">
-<!ENTITY trans.zh-TW.lang "Çince (Geleneksel)">
-<!ENTITY trans.thanks "Büyük çalışmalarından dolayı da kesinlikle BabelZilla.org takımına teşekkürler.">
+<!ENTITY trans.zh-TW.lang "Çince  (Geleneksel)">
+<!ENTITY trans.thanks "Büyük çalışmalarından dolayı BabelZilla.org Takımına teşekkürler.">
diff --git a/locale/tr/aios.dtd b/locale/tr/aios.dtd
old mode 100755
new mode 100644
index f4ebddc..de0cfad
--- a/locale/tr/aios.dtd
+++ b/locale/tr/aios.dtd
@@ -1,41 +1,43 @@
-<!ENTITY loading.label "panel yükleniyor...">
-<!ENTITY menu.prefs.label "All-in-One Kenar Çubuğu Seçenekleri...">
-<!ENTITY menu.togglebar.label "Kenar Çubuğu Düğmesi">
+<!ENTITY loading.label "Panel yükleniyor…">
+<!ENTITY menu.prefs.label "All-in-One kenar çubuğu ayarları…">
+<!ENTITY menu.togglebar.label "Kenar çubuğu düğmesi">
 <!ENTITY menu.grippy.label "Grippy kenar çubuğu">
-<!ENTITY toolbar.name "All-in-One Kenar Çubuğu Araç Çubuğu">
+<!ENTITY toolbar.name "All-in-One Kenar Araç Çubuğu">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Kenar Çubuğu başlık Araç Çubuğu">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
-<!ENTITY button.toggle.tooltip "All-in-One Kenar Çubuğu ile denetlenen değiştirme elemanları">
-<!ENTITY button.switch.tooltip1 "Kenar Çubuğunu ve Araç Çubuğunu Değiştir">
-<!ENTITY button.switch.tooltip2 "Araç Çubuğunu Değiştir">
-<!ENTITY button.switch.tooltip3 "Kenar Çubugu Değiştir">
-<!ENTITY sidebar.open.label "Kenar çubuğunu Aç">
-<!ENTITY sidebar.close.label "Kenar çubuğunu Kapat">
+<!ENTITY button.toggle.tooltip "All-in-One Sidebar ile Düğme öğeleri düzenlendi">
+<!ENTITY button.switch.tooltip1 "Araç ve Kenar Çubuğu Düğmesi">
+<!ENTITY button.switch.tooltip2 "Araç Çubuğu Düğmesi">
+<!ENTITY button.switch.tooltip3 "Kenar Çubugu Düğmesi">
+<!ENTITY sidebar.open.label "Kenar çubuğunu aç">
+<!ENTITY sidebar.close.label "Kenar çubuğunu kapat">
 <!ENTITY sidebar.width.min "En az genişlik">
 <!ENTITY sidebar.width.def "Normal genişlik">
 <!ENTITY sidebar.width.max "En fazla genişlik">
-<!ENTITY button.menu.label "Kenar Çubuğu Panelleri">
+<!ENTITY button.menu.label "Kenar Çubuğu Paneli">
 <!ENTITY button.menu.tooltip "Kullanılabilir tüm Kenar Çubuğu Panelleri">
 <!ENTITY button.toolbar.label "AiOS-Araç Çubuğu">
-<!ENTITY button.toolbar.tooltip "AiOS-Araç Çubugunu Değiştir">
-<!ENTITY button.paneltab.label "Panel Sekmesi">
-<!ENTITY button.paneltab.tooltip1 "Sekme İçeriğini Kenar Çubuğunda Aç">
-<!ENTITY button.paneltab.tooltip2 "Kenar Çubuğu İçeriğini Yeni Sekmede Aç">
-<!ENTITY button.paneltab.tooltip3 "Kenar Çubuğu İçeriğini Yeni Pencerede Aç">
-<!ENTITY button.paneltab.menu1.label "Sekmeyi Kenar Çubuğunda Aç">
-<!ENTITY button.paneltab.menu2.label "Kenar Çubuğunu Sekmede Aç">
-<!ENTITY button.autohide.label "Otomatik Kenar Çubuğu">
-<!ENTITY button.autohide.tooltip "Kenar Çubuğunu Otomatik Değiştir">
-<!ENTITY button.tooltip.sidebar "Kenar Çubuğunda Aç">
-<!ENTITY button.tooltip.window "Pencerede Aç">
-<!ENTITY button.tooltip.tab "Yeni Sekmede Aç">
-<!ENTITY button.addons.label "Eklentiler">
-<!ENTITY button.addons.tooltip "Yüklenmiş eklentileri ve temaları göster">
+<!ENTITY button.toolbar.tooltip "AiOS-Araç Çubugu Düğmesi">
+<!ENTITY button.paneltab.label "Panel sekmesi">
+<!ENTITY button.paneltab.tooltip1 "Tabdaki içeri kenar çubuğunda aç">
+<!ENTITY button.paneltab.tooltip2 "Kenar çubuğundaki içeriği yeni tabda aç">
+<!ENTITY button.paneltab.tooltip3 "Kenar çubuğundaki içeriği pencerede aç">
+<!ENTITY button.paneltab.menu1.label "Kenar çubuğunda tab aç">
+<!ENTITY button.paneltab.menu2.label "Tab da kenar çubuğu aç">
+<!ENTITY button.autohide.label "Kenar çubuğu otomatik">
+<!ENTITY button.autohide.tooltip "Kenar çubuğunu otomatik gizle/göster">
+<!ENTITY button.tooltip.sidebar "Kenar çubugunda aç">
+<!ENTITY button.tooltip.window "Pencerede aç">
+<!ENTITY button.tooltip.tab "Yeni tab da aç">
+<!ENTITY button.addons.label "Add-ons">
+<!ENTITY button.addons.tooltip "Yüklenmiş eklentiler ve temaları gösterir">
 <!ENTITY button.multipanel.label "Çoklu Panel">
-<!ENTITY button.multipanel.tooltip "Ağ sayfaları ve tarayıcı bilgisini göster">
-<!ENTITY button.pageinfo.tooltip "Ağ sayfasıyla ilgili geniş bilgileri gösterir">
-<!ENTITY button.console.label "Hata Penceresi">
-<!ENTITY button.console.tooltip "Kaynak kodundeki sorunları izleyen Hata Penceresini Aç">
+<!ENTITY button.multipanel.tooltip "Display e.g. a website, source code and browser information">
+<!ENTITY button.pageinfo.tooltip "Sayfa bilgilerini açar">
+<!ENTITY button.console.label "Consol hatası">
+<!ENTITY button.console.tooltip "Hata konsolunu aç,kaynak koduyla kangi parçalar hatalı">
 <!ENTITY keys.modifiers "accel shift">
 <!ENTITY keys.sidebar "VK_F4">
 <!ENTITY keys.options "VK_F4">
@@ -44,9 +46,9 @@
 <!ENTITY keys.addons "A">
 <!ENTITY keys.multipanel "M">
 <!ENTITY keys.pageinfo "P">
-<!ENTITY toolbar.pos.sidebarleft.label "Kenar Çubuğunun Yanında Solda">
-<!ENTITY toolbar.pos.sidebarright.label "Kenar Çubuğunun Yanında Sağda">
-<!ENTITY toolbar.pos.sidebartop.label "Kenar Çubuğunun Üstünde">
-<!ENTITY toolbar.pos.headerbottom.label "Kenar Çubuğu Başlığının Altında">
-<!ENTITY toolbar.pos.sidebarbottom.label "Kenar Çubuğunun Altında">
-<!ENTITY toolbar.mode.flexbuttons.label "Esnek Düğmeler">
+<!ENTITY toolbar.pos.sidebarleft.label "Kenar çubuğu solunda">
+<!ENTITY toolbar.pos.sidebarright.label "Kenar çubuğu sağında">
+<!ENTITY toolbar.pos.sidebartop.label "Kenar çubuğu yukarıda">
+<!ENTITY toolbar.pos.headerbottom.label "Kenar Cubugu gizleyici aşağıda">
+<!ENTITY toolbar.pos.sidebarbottom.label "Kenar çubuğu aşağıda">
+<!ENTITY toolbar.mode.flexbuttons.label "Esnek Butonlar">
diff --git a/locale/tr/lib.dtd b/locale/tr/lib.dtd
old mode 100755
new mode 100644
index 15daab2..df5a987
--- a/locale/tr/lib.dtd
+++ b/locale/tr/lib.dtd
@@ -1,13 +1,13 @@
-<!ENTITY leftclick "Sol tık">
-<!ENTITY rightclick "Sağ tık">
+<!ENTITY leftclick "Sol tıklama">
+<!ENTITY rightclick "Sağ tıklama">
 <!ENTITY doubleclick "Çift tıklama">
 <!ENTITY middleclick "Orta tıklama">
 <!ENTITY key.ctrl "Ctrl">
 <!ENTITY key.alt "Alt">
 <!ENTITY key.shift "Shift">
 <!ENTITY menu.tools.label "Araçlar">
-<!ENTITY closeFolder.label "Tüm Klasörleri Kapat">
+<!ENTITY closeFolder.label "Bütün dizinleri kapat">
 <!ENTITY show.closeFolder.label "\'Tüm Klasörleri Kapat\' Tuşu">
-<!ENTITY enable.autoClose.label "Diğer Klasörleri Otomatik Kapat">
-<!ENTITY enable.scrollToFolder.label "Seçili Klasöre Otomatik Geç">
-<!ENTITY enable.rememberFolder.label "Son Seçilen Klasörü Hatırla ve Seç">
+<!ENTITY enable.autoClose.label "Diğer dizinkeri otomatik olarak kapat">
+<!ENTITY enable.scrollToFolder.label "Seçili dizini otomatik olarak kaydır">
+<!ENTITY enable.rememberFolder.label "Son seçili dizini hatırla">
diff --git a/locale/tr/lib.properties b/locale/tr/lib.properties
old mode 100755
new mode 100644
index 345b2ad..a593224
--- a/locale/tr/lib.properties
+++ b/locale/tr/lib.properties
@@ -1,10 +1,10 @@
 extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description=Ödüllü kullanıcı deneyimiyle kenar çubuğu denetimi
 bm_hi.search.blur=Ara…
-prefs.confirm=All-in-One kenar çubuğu ayarlarını öntanımlı ayarlara getirmek istediğinizden emin misiniz?
-prefs.import=All in One kenar çubuğu tercihlerini içe aktarmak istediğinizden emin misiniz?
-prefs.save=Ayarları dışa aktar
-prefs.open=Ayarları içe aktar
+prefs.confirm=All in One kenar çubuğu ayarlarının öntanımlı ayarlama getirmek istediğinizden emin misiniz?
+prefs.import=All in One kenar çubuğu tercihlerini içe aktarmak istediğinizden emin misiniz?\\n\\n
+prefs.save=Tercihleri dışa aktar
+prefs.open=Tercihleri içe aktar
 prefs.copy=Ayarlar panoya kopyalandı.
-prefs.invalid=Ayarlar içe aktarılamıyor çünkü dosya geçersiz.
-prefs.failed=Ayarların içe aktarımı başarısız.
+prefs.invalid=İçe aktarılan tercihler dosyası geçersiz bir dosya.
+prefs.failed=Tercihleri içe aktarma başarısız..
 prefs.openpanel=Aç
diff --git a/locale/tr/multipanel.dtd b/locale/tr/multipanel.dtd
old mode 100755
new mode 100644
index 1731424..034c62e
--- a/locale/tr/multipanel.dtd
+++ b/locale/tr/multipanel.dtd
@@ -1,21 +1,21 @@
 <!ENTITY page.label "Sayfa">
-<!ENTITY page.tooltip "Ağ sayfasını bu panelde aç">
-<!ENTITY page.ssr.label "Küçük Ekran Gösterimi">
-<!ENTITY page.ssr100.label "Kenar Çubuğu Genişliğine Uyarla">
-<!ENTITY about.label "Hakkında:">
-<!ENTITY about.tooltip "Tarayıcı hakkında farklı bilgileri gösterir">
-<!ENTITY about.config.tooltip "Geniş çeşitlilikteki yapılandırma değişkenlerinin gösterimi ve ayarlanması için bir arayüz gösterir">
-<!ENTITY about.plugins.tooltip "Tüm yüklenmiş eklentilerle ilgili bilgi gösterir">
+<!ENTITY page.tooltip "Web sayfasını bu panelde aç">
+<!ENTITY page.ssr.label "Küçük ekrana getiriyor">
+<!ENTITY page.ssr100.label "Kenar çubuğu genişliğini uyarla">
+<!ENTITY about.label "Hakkında">
+<!ENTITY about.tooltip "Tarayıcı hakkında farklı bilgileri göster">
+<!ENTITY about.config.tooltip "Bir arayüz göster izlerken ve ayarlaken geniş bir biçimin çeşitliliğin değişkenlerinde">
+<!ENTITY about.plugins.tooltip "Tüm yüklenmiş plug-in ler hakkında bilgi göster">
 <!ENTITY about.support.tooltip "Uygulamaların temelleri, eklentiler ve değiştirilen tercihleri gösterir">
-<!ENTITY about.cache.tooltip "Hem bellek hem de disk önbelleği için Önbellek Servisi hakkında bilgi gösterir">
-<!ENTITY about.cache.disk.tooltip "Diskteki önbellek girdilerini listeler">
-<!ENTITY about.cache.memory.tooltip "Bellekteki önbellek girdilerini listeler">
+<!ENTITY about.cache.tooltip "Her iki hafıza ve disk cache için bilgi göster">
+<!ENTITY about.cache.disk.tooltip "Diskteki kişisel girişleri göster">
+<!ENTITY about.cache.memory.tooltip "Hafızadaki kişisel girişleri göster">
 <!ENTITY about.cache.offline.tooltip "Çevrimdışı önbellek girdilerini listeler">
 <!ENTITY about.crashes.tooltip "Gönderilen hata raporlarını gösterir">
-<!ENTITY about.buildconfig.tooltip "Kullanımdaki kurulumun derlenmesindeki öğeleri ve seçenekleri gösterir">
-<!ENTITY about.about.tooltip "Sürüm ve telif hakkı bilgilerini gösterir">
+<!ENTITY about.buildconfig.tooltip "Shows the arguments and options used to compile the build in use">
+<!ENTITY about.about.tooltip "Versiyon ve telif hakkı bilgilerini göster">
 <!ENTITY about.robots.tooltip "Gort! Klaatu barada nikto!">
-<!ENTITY about.credits.tooltip "Mozilla'ya katkıda bulunan herkesin listesini gösterir">
-<!ENTITY about.license.tooltip "Mozilla Kamu Lisansını gösterir">
-<!ENTITY about.mozilla.tooltip "Hikayesel Mozilla Kitabından bir sayfa gösterir">
-<!ENTITY tools.remlast.label "Son Gösterilen İçeriği Hatırla">
+<!ENTITY about.credits.tooltip "Liste halinde Mozilla'ya katkıda bulunanları göster">
+<!ENTITY about.license.tooltip "Göster Mozilla Public lisans bilgilerini">
+<!ENTITY about.mozilla.tooltip "Shows a page from the fictional Book of Mozilla">
+<!ENTITY tools.remlast.label "Son gösterilmiş içeriği hatırla">
diff --git a/locale/tr/prefs.dtd b/locale/tr/prefs.dtd
old mode 100755
new mode 100644
index b0cf527..b538106
--- a/locale/tr/prefs.dtd
+++ b/locale/tr/prefs.dtd
@@ -1,93 +1,93 @@
-<!ENTITY title "All-in-One Sidebar - Seçenekler">
-<!ENTITY restart "Değişiklikler tarayıcınızı yeniden başlatmanızı gerektirir">
-<!ENTITY settings "Ayarlar">
-<!ENTITY settings.default "Öntanımlara geri dön...">
-<!ENTITY settings.advanced "Gelişmiş Kip">
-<!ENTITY settings.import "Ayarları içe aktar...">
-<!ENTITY settings.export "Ayarları dışa aktar...">
+<!ENTITY title "All-in-One Kenar Çubuğu Tercihleri">
+<!ENTITY restart "Tarayıcınızı yeniden başlatmanız gerekmektedir">
+<!ENTITY settings "Tercihler">
+<!ENTITY settings.default "Öntanımlı ayarla dön…">
+<!ENTITY settings.advanced "Gelişmiş modus">
+<!ENTITY settings.import "Tercihleri içe aktar…">
+<!ENTITY settings.export "Tercihleri dışa aktar…">
 <!ENTITY settings.copy "Ayarları Panoya Kopyala">
 <!ENTITY apply "Uygula">
 <!ENTITY gen.column1 "110">
 <!ENTITY tab.gen "Genel">
 <!ENTITY tab.gen.appearance "Görünüm">
 <!ENTITY tab.gen.behavior "Davranış">
-<!ENTITY tab.gen.fullscreen "Tam Ekran Kipi">
+<!ENTITY tab.gen.fullscreen "Tam ekran modusu">
 <!ENTITY tab.gen.special "Özel">
 <!ENTITY tab.panels "Paneller">
 <!ENTITY tab.panels.places "Yer İmleri/Geçmiş">
 <!ENTITY tab.panels.other1 "Diğer 1">
 <!ENTITY tab.panels.other2 "Diğer 2">
-<!ENTITY tab.panels.paneltab "Panel Sekmesi">
+<!ENTITY tab.panels.paneltab "Panel tab">
 <!ENTITY tab.menus "Menüler">
 <!ENTITY tab.menus.sidebar "Kenar çubuğu">
 <!ENTITY tab.keys "Kısayollar">
 <!ENTITY tab.about "Hakkında/Yardım">
-<!ENTITY gen.orient.caption "Konum">
-<!ENTITY gen.orient.label "Kenar çubuğunun yeri">
+<!ENTITY gen.orient.caption "Yönelim">
+<!ENTITY gen.orient.label "Kenar çubuğunun üstünde göster">
 <!ENTITY gen.orient.left "sol kenarda">
 <!ENTITY gen.orient.right "sağ kenarda">
 <!ENTITY gen.width.caption "Boyut">
 <!ENTITY gen.width.px "Piksel">
 <!ENTITY gen.width.perc "Yüzde">
-<!ENTITY gen.width.current "güncel genişliğe ayarla">
-<!ENTITY gen.width.current.tip "Kenar çubuğunun güncel genişliğini uygular">
+<!ENTITY gen.width.current "Güncel genişlik">
+<!ENTITY gen.width.current.tip "Kenar çubuğunun güncel olan genişlik değerini alır">
 <!ENTITY gen.width.min.hint "Kenar çubuğu başlığında [Shift+çift tıkla]">
 <!ENTITY gen.width.def.hint "Kenar çubuğu başlığında [çift tıkla]">
 <!ENTITY gen.width.max.hint "Kenar çubuğu başlığında [Ctrl+çift tıkla] veya [Alt+çift tıkla]">
 <!ENTITY gen.init.caption "Tarayıcı Başlangıcı">
 <!ENTITY gen.init.label "Kenar çubuğu">
 <!ENTITY gen.init.toolbar.label "Araç çubuğu">
-<!ENTITY gen.init.toolbar.show.label "Araç Çubuğunu Göster">
-<!ENTITY gen.init.toolbar.hide.label "Araç Çubuğunu Gizle">
-<!ENTITY gen.init.switch.show.label "Kenar Çubuğu Değiştirmeyi Göster">
-<!ENTITY gen.init.switch.hide.label "Kenar Çubuğu Değiştirmeyi Gizle">
-<!ENTITY gen.init.mode1 "Hatırlanan Durumları Geri Getir">
-<!ENTITY gen.init.sidebar "Kenar Çubuğunu Aç (Kenar Çubuğu Değiştirici, Değiştirme Tuşu, Kısa Yol)">
-<!ENTITY gen.init.sidebar.restore "Hatırlanan Panelleri Geri Getir">
-<!ENTITY gen.switch.autoshow "Kenar Çubuğunu Otomatik Göster/Gizle (fare tıklama yerine fare dokundurma)">
-<!ENTITY gen.switch.onlymax "Yalnızca Tarayıcı En büyük ya da Tam Ekran Kipindeyse">
-<!ENTITY gen.switch.delay "Geciktirme">
+<!ENTITY gen.init.toolbar.show.label "Araç çubuğunu göster">
+<!ENTITY gen.init.toolbar.hide.label "Araç çubuğunu gizle">
+<!ENTITY gen.init.switch.show.label "Kenar çubuğunu değiştir">
+<!ENTITY gen.init.switch.hide.label "Gizle kenar çubuğu seçimini">
+<!ENTITY gen.init.mode1 "Hatırlanan durumları tekrar oluştur">
+<!ENTITY gen.init.sidebar "Kenar çubuğunu aç (Kenar çubupu seçici ,buton, Kısa yollar)">
+<!ENTITY gen.init.sidebar.restore "Hatırlanan panelleri tekrar oluştur">
+<!ENTITY gen.switch.autoshow "Kenar çubugunu otomatik gizle/göster">
+<!ENTITY gen.switch.onlymax "Sadece firefox en yüksek seviyede yada tam ekran modundayken">
+<!ENTITY gen.switch.delay "Geciktirmek">
 <!ENTITY gen.switch.delayUnit "milisaniye">
-<!ENTITY gen.switch.hide "Kenar Çubuğunu Gizle...">
-<!ENTITY gen.switch.hideBar "fare imleci ağ sayfasına geri giderse">
-<!ENTITY gen.switch.hidePage "fare imleci Kenar Çubuğu Değiştirme Tuşunda tutulursa">
-<!ENTITY gen.switch.thin "İnce Kenar Çubuğu Değiştirme Tuşunu Etkinleştir">
-<!ENTITY gen.switch.width "Kenar Çubuğu Değiştirme Tuşu Genişliği">
-<!ENTITY gen.switch.twidth "İnce Kenar Çubuğu Değiştirme Tuşu Genişliği">
-<!ENTITY cmode.caption "Kenar Çubuğu Değiştirmesi">
-<!ENTITY cmode.desc "Kenar Çubuğunun farklı yöntemlerle açılması ya da kapanmasından hangi öğelerin etkileneceğini özelleştirir.">
+<!ENTITY gen.switch.hide "Kenar Çubuğunu gizle fare imlecinde">
+<!ENTITY gen.switch.hideBar "web sayfası geriye hareket ettiğinde">
+<!ENTITY gen.switch.hidePage "is held on the Sidebar Switch">
+<!ENTITY gen.switch.thin "İnce kenar çubuğu aktif">
+<!ENTITY gen.switch.width "kenar çubuğu genişliği">
+<!ENTITY gen.switch.twidth "İnce kenar çubuğu genişliği">
+<!ENTITY cmode.caption "Kenar Çubuğu Düğmesi">
+<!ENTITY cmode.desc "Kenar çubuğunun farklı yöntemler ile açılıp kapanmasında hangi elementlerin etkileneceğini belirle.">
 <!ENTITY cmode.key.label "Kısayol (F4)">
 <!ENTITY cmode.tbb.label "AiOS Düğmesi">
-<!ENTITY cmode.close.label "Kapama Düğmesi">
-<!ENTITY cmode.mode1.label "Yalnzıca Kenar Çubuğu">
-<!ENTITY cmode.mode2.label "Kenar Çubuğu ve Araç Çubuğu">
-<!ENTITY cmode.mode3.label "Kenar Çubuğu, Araç Çubuğu ve Kenar Çubuğu Tuşu">
+<!ENTITY cmode.close.label "Kapama düğmesi">
+<!ENTITY cmode.mode1.label "Sadece kenar çubuğunda">
+<!ENTITY cmode.mode2.label "Kenar çubuğu ve araç çubuğu">
+<!ENTITY cmode.mode3.label "Kenar çubuğu, araç çubuğu ve kenar çubuğu anahtarı">
 <!ENTITY cmode.mode4.label "Opera gibi davran">
-<!ENTITY gen.fs.off "Tüm Ekran Kipinden Çıkıyorsan Durumu Geri Yükle">
-<!ENTITY keyconfig.keyid "Ad">
+<!ENTITY gen.fs.off "Tam ekran kipinden çıkarken eski kipdeki ayarları tekrar oluştur">
+<!ENTITY keyconfig.keyid "Komut">
 <!ENTITY keyconfig.id "ID">
 <!ENTITY keyconfig.apply "Uygula">
 <!ENTITY keyconfig.disable "Etkisizleştir">
 <!ENTITY keyconfig.reset "Sıfırla">
-<!ENTITY keyconfig.warn "Değişiklikler yalnızca yeni pencereleri etkiler">
-<!ENTITY keyconfig.onreset "Tarayıcının yeniden başlatılması gerekli">
-<!ENTITY keyconfig.unrecognized "Tanımlanamadı ($1)">
-<!ENTITY keyconfig.used "Bu tuşun şu karşılığı var: \\n\\n\\t$1\\n\\nYine de çalışabilir.">
-<!ENTITY menus.sidebar.desc ""Görünüm > Kenar Çubuğu" menüsündeki ve kenar çubuğu tuşlarının açılır menüsündeki öğeleri özelleştir.">
-<!ENTITY menus.icons.label "Simgeleri Göster">
-<!ENTITY menus.entries.label "Öğeleri Göster">
-<!ENTITY menus.sidebar.entrydeac "Etkin Kenar Çubuğu Öğesini Etkisizleştir">
-<!ENTITY misc.enablesidebar.label "Kenar Çubuğunda Aç">
-<!ENTITY misc.layout.label "Kenar Çubuğu için Düzeni İyileştir">
+<!ENTITY keyconfig.warn "Değişiklikler tarayıcınızı tekrar başlattığınızda etkinleşir.">
+<!ENTITY keyconfig.onreset "Tarayıcının tekrar başlatılması gerekli">
+<!ENTITY keyconfig.unrecognized "Bilinmiyor ($1)">
+<!ENTITY keyconfig.used "Bu klavye kısayolları şuanda kullanılıyor: \\n\\n\\t$1\\n\\nBuna rağmen çalışabilir.">
+<!ENTITY menus.sidebar.desc "Customize the entries in the menu “View > Sidebar” and in the dropdown menus of the sidebar buttons.">
+<!ENTITY menus.icons.label "Simgeleri göster">
+<!ENTITY menus.entries.label "Menü verilerini göster">
+<!ENTITY menus.sidebar.entrydeac "Kenar çubuğunun menü verilerini etkisizleştir">
+<!ENTITY misc.enablesidebar.label "Kenar çubuğunda göster">
+<!ENTITY misc.layout.label "Kenar çubuğu iyileştirmesi">
 <!ENTITY misc.dm.overlay "Kenar çubuğu davranışı için seçenekleri değiştir">
 <!ENTITY misc.dm.autoopen.label "Bir dosya indirirken İndirilenler kenar çubuğunu göster">
 <!ENTITY misc.dm.autoclose.label "Tüm indirilenler bitince kapat">
-<!ENTITY misc.colors.label "Güncel duruma göre renkli zeminleri etkinleştir">
-<!ENTITY misc.count.label "Öğe Sayılarını Göster">
-<!ENTITY misc.enablelink.tooltip "Daha fazla bilgi için buraya tıkla (SSS'lere bağlanır)">
-<!ENTITY misc.paneltab.reverse "Sol tık ve orta tık eylemlerini değiştir">
-<!ENTITY misc.bm.paneltab.desc ""Panel Sekmesi" düğmesi, Yer İmleri Yöneticisini, Yer İmleri Paneli yerine yeni bir sekmede açabilir.">
-<!ENTITY misc.bm.paneltab "Yer İmleri Yöneticisi Yeni Sekmede'yi Etkinleştir">
-<!ENTITY special.collapsing.caption "Kenar Çubuğu Daraltma">
-<!ENTITY special.collapsing.label "Kenar Çubuğu Daraltmayı Etkinleştir">
-<!ENTITY special.collapsing.desc "Kenar Çubuğu kapanacağına daralabilir. Üstünlüğü ise yeniden açılırken, kenar çubuğu içeriğinin yeniden yüklenmesine gerek olmaması; böylece daha hızlı tepki verir.">
+<!ENTITY misc.colors.label "Renkli alanlar güncel durumda aktif">
+<!ENTITY misc.count.label "Parça numaralarını göster">
+<!ENTITY misc.enablelink.tooltip "Daha fazla bilgi için tıkla">
+<!ENTITY misc.paneltab.reverse "Sol tıklama ve orta tıklama hareketlerini değiştir">
+<!ENTITY misc.bm.paneltab.desc ""Panel Sekmesi" düğmesini yer imleri kenar çubuğu yerine yer imleri yöneticisi olarak yeni sekmede açılabilir.">
+<!ENTITY misc.bm.paneltab "Yer imleri yöneticisini yeni sekme olarak etkinleştir">
+<!ENTITY special.collapsing.caption "Kenar çubuğu katlamaları">
+<!ENTITY special.collapsing.label "Kenar çubuğu katlamarı aktif">
+<!ENTITY special.collapsing.desc "Kenar çubuğu katlanabilir onun yerine kapanırken.Bu avantaj kenar çubuğu yeniden acılır bundan dolayı hızlı yanıt verir">
diff --git a/locale/uk/about.dtd b/locale/uk/about.dtd
old mode 100755
new mode 100644
index fe4d7f2..3115456
--- a/locale/uk/about.dtd
+++ b/locale/uk/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Про All-In-One Sidebar">
-<!ENTITY version "версія">
 <!ENTITY settings "Налаштування…">
 <!ENTITY close "Закрити">
 <!ENTITY tab.about "Про розширення">
diff --git a/locale/uk/aios.dtd b/locale/uk/aios.dtd
old mode 100755
new mode 100644
index 3fb3688..161a2c7
--- a/locale/uk/aios.dtd
+++ b/locale/uk/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Вимикач бічної панелі">
 <!ENTITY menu.grippy.label "Кнопка “Згорнути/Розгорнути”">
 <!ENTITY toolbar.name "Бічна панель інструментів">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Панель інструментів заголовка бічної панелі">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Переключити елементи, керовані All-in-One Sidebar">
 <!ENTITY button.switch.tooltip1 "Переключити бічну панель та панель інструментів">
diff --git a/locale/uk/lib.dtd b/locale/uk/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/uk/lib.properties b/locale/uk/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/uk/multipanel.dtd b/locale/uk/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/uk/prefs.dtd b/locale/uk/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/vi/about.dtd b/locale/vi/about.dtd
old mode 100755
new mode 100644
index b42a102..ac14c4a
--- a/locale/vi/about.dtd
+++ b/locale/vi/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "Giới thiệu All-in-One Sidebar">
-<!ENTITY version "phiên bản">
 <!ENTITY settings "Thiết lập…">
 <!ENTITY close "Đóng">
 <!ENTITY tab.about "Giới thiệu">
diff --git a/locale/vi/aios.dtd b/locale/vi/aios.dtd
old mode 100755
new mode 100644
index 9f7945c..6c1f7b7
--- a/locale/vi/aios.dtd
+++ b/locale/vi/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "Công tắc Thanh lề">
 <!ENTITY menu.grippy.label "Thanh lề Grippy">
 <!ENTITY toolbar.name "Thanh All-in-One Sidebar">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Thanh công cụ Đầu đề Thanh lề">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "Bật tắt các phần tử được All-in-One Sidebar điều khiển">
 <!ENTITY button.switch.tooltip1 "Bật tắt Thanh lề và Thanh công cụ">
diff --git a/locale/vi/lib.dtd b/locale/vi/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/vi/lib.properties b/locale/vi/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/vi/multipanel.dtd b/locale/vi/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/vi/prefs.dtd b/locale/vi/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/zh-CN/about.dtd b/locale/zh-CN/about.dtd
old mode 100755
new mode 100644
index 018c9db..cc91998
--- a/locale/zh-CN/about.dtd
+++ b/locale/zh-CN/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "关于 All-in-One Sidebar">
-<!ENTITY version "版本">
 <!ENTITY settings "设置…">
 <!ENTITY close "关闭">
 <!ENTITY tab.about "关于">
diff --git a/locale/zh-CN/aios.dtd b/locale/zh-CN/aios.dtd
old mode 100755
new mode 100644
index 3df734f..6404b34
--- a/locale/zh-CN/aios.dtd
+++ b/locale/zh-CN/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "侧栏切换柄">
 <!ENTITY menu.grippy.label "侧栏控制柄">
 <!ENTITY toolbar.name "All-in-One Sidebar 工具栏">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Sidebarheader 工具栏">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "开关受 All-in-One Sidebar 控制的元素">
 <!ENTITY button.switch.tooltip1 "开关侧栏和工具栏">
diff --git a/locale/zh-CN/lib.dtd b/locale/zh-CN/lib.dtd
old mode 100755
new mode 100644
diff --git a/locale/zh-CN/lib.properties b/locale/zh-CN/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/zh-CN/multipanel.dtd b/locale/zh-CN/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/zh-CN/prefs.dtd b/locale/zh-CN/prefs.dtd
old mode 100755
new mode 100644
diff --git a/locale/zh-TW/about.dtd b/locale/zh-TW/about.dtd
old mode 100755
new mode 100644
index 04a386a..e1c0761
--- a/locale/zh-TW/about.dtd
+++ b/locale/zh-TW/about.dtd
@@ -1,5 +1,4 @@
 <!ENTITY title "關於 All-in-One Sidebar">
-<!ENTITY version "版本">
 <!ENTITY settings "選項…">
 <!ENTITY close "關閉">
 <!ENTITY tab.about "關於">
diff --git a/locale/zh-TW/aios.dtd b/locale/zh-TW/aios.dtd
old mode 100755
new mode 100644
index 27e7f47..c4c70c9
--- a/locale/zh-TW/aios.dtd
+++ b/locale/zh-TW/aios.dtd
@@ -3,7 +3,9 @@
 <!ENTITY menu.togglebar.label "側邊欄彈出鈕">
 <!ENTITY menu.grippy.label "側邊欄伸縮鈕">
 <!ENTITY toolbar.name "All-in-One Sidebar 工具列">
+<!ENTITY toolbar.label "All-in-One-Sidebar">
 <!ENTITY sbhtoolbar.name "Sidebarheader Toolbar">
+<!ENTITY sbhtoolbar.label "Sidebarheader">
 <!ENTITY button.toggle.label "AiOS">
 <!ENTITY button.toggle.tooltip "由 All-in-One Sidebar 來控制開關">
 <!ENTITY button.switch.tooltip1 "開關側邊欄與工具列">
diff --git a/locale/zh-TW/lib.dtd b/locale/zh-TW/lib.dtd
old mode 100755
new mode 100644
index 27d95e3..399e92b
--- a/locale/zh-TW/lib.dtd
+++ b/locale/zh-TW/lib.dtd
@@ -7,7 +7,7 @@
 <!ENTITY key.shift "Shift">
 <!ENTITY menu.tools.label "工具">
 <!ENTITY closeFolder.label "收起所有資料夾">
-<!ENTITY show.closeFolder.label "\'Close All Folders\' Button">
+<!ENTITY show.closeFolder.label "'Close All Folders' Button">
 <!ENTITY enable.autoClose.label "自動收起其他的資料夾">
 <!ENTITY enable.scrollToFolder.label "自動捲動到選取的資料夾">
 <!ENTITY enable.rememberFolder.label "記住並自動選取上次使用的資料夾">
diff --git a/locale/zh-TW/lib.properties b/locale/zh-TW/lib.properties
old mode 100755
new mode 100644
diff --git a/locale/zh-TW/multipanel.dtd b/locale/zh-TW/multipanel.dtd
old mode 100755
new mode 100644
diff --git a/locale/zh-TW/prefs.dtd b/locale/zh-TW/prefs.dtd
old mode 100755
new mode 100644
diff --git a/skin/css/addons.css b/skin/css/addons.css
old mode 100755
new mode 100644
index 1266739..f040294
--- a/skin/css/addons.css
+++ b/skin/css/addons.css
@@ -1 +1 @@
-page[aios-inSidebar]{padding:0}page[aios-inSidebar]>hbox{-moz-box-orient:vertical}page[aios-inSidebar] #categories{margin:0;padding:1px 1px 0 1px}page[aios-inSidebar] .category,page[aios-inSidebar] .category:not([disabled]){height:auto;margin:0 1px 1px 0;padding:2px}page[aios-inSidebar] .category-icon{margin:0}page[aios-inSidebar] #category-search[disabled="true"],page[aios-inSidebar] #category-availableUpdates[disabled="true"],page[aios-inSidebar] #category-recentUpdates[disabled="true" [...]
\ No newline at end of file
+page[aios-inSidebar]{padding:0;}page[aios-inSidebar]>hbox{-moz-box-orient:vertical;}page[aios-inSidebar] #categories{margin:0;padding:1px 1px 0 1px;}page[aios-inSidebar] .category,page[aios-inSidebar] .category:not([disabled]){height:auto;margin:0 1px 1px 0;padding:2px;}page[aios-inSidebar] .category-icon{margin:0;}page[aios-inSidebar] #category-search[disabled="true"],page[aios-inSidebar] #category-availableUpdates[disabled="true"],page[aios-inSidebar] #category-recentUpdates[disabled=" [...]
\ No newline at end of file
diff --git a/skin/css/aios.css b/skin/css/aios.css
old mode 100755
new mode 100644
index 08c37e9..a7b0f07
--- a/skin/css/aios.css
+++ b/skin/css/aios.css
@@ -1 +1 @@
- at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");window[aiosOrient="left"] toolbox#aios-toggle-toolbox,window[aiosOrient="left"] toolbox#aios-toggle-toolbox>toolbar#aios-toggle-toolbar{margin:0!important;border-left:none!important}window[aiosOrient="right"] toolbox#aios-toggle-toolbox,window[aiosOrient="right"] toolbox#aios-toggle-toolbox>toolbar#aios-toggle-toolbar{margin:0!important;border-right:none!important}#aios-toggle-toolbox,#aios-toggle-toolbar{pad [...]
\ No newline at end of file
+ at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");window[aiosOrient="left"] toolbox#aios-toggle-toolbox,window[aiosOrient="left"] toolbox#aios-toggle-toolbox>toolbar#aios-toggle-toolbar{margin:0 !important;border-left:none !important;}window[aiosOrient="right"] toolbox#aios-toggle-toolbox,window[aiosOrient="right"] toolbox#aios-toggle-toolbox>toolbar#aios-toggle-toolbar{margin:0 !important;border-right:none !important;}#aios-toggle-toolbox,#aios-toggle-toolb [...]
\ No newline at end of file
diff --git a/skin/css/aios_buttons_darwin.css b/skin/css/aios_buttons_darwin.css
old mode 100755
new mode 100644
index 1f0c962..f02313a
--- a/skin/css/aios_buttons_darwin.css
+++ b/skin/css/aios_buttons_darwin.css
@@ -1 +1 @@
-#downloads-button,#downloads-button:hover,toolbarbutton.toolbarbutton-1.aios-tbutton,toolbarbutton.toolbarbutton-1.aios-tbutton:hover,toolbar[iconsize="small"] toolbarbutton.toolbarbutton-1.aios-tbutton,toolbar[iconsize="small"] toolbarbutton.toolbarbutton-1.aios-tbutton:hover{list-style-image:url(../icons/toolbar_darwin.png)}#downloads-button,#downloads-button:hover,toolbar[iconsize="small"] #downloads-button,toolbar[iconsize="small"] #downloads-button:hover{-moz-image-region:rect(0,16p [...]
\ No newline at end of file
+toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button){list-style-image:url(../icons/toolbar_darwin.png);}toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button):-moz-lwtheme-brighttext{list-style-image:url(../icons/toolbar_darwin_inverted.png);}#bookmarks-button{-moz-image-region:rect(0, 16px, 16px, 0);}#history-button{-moz-image-region:rect(0, 32px, 16px, 16px);}#addons-button{-moz-image-region:rect(0, 64px, 16px, 48px);}#multipanel-button{-moz-image-region:rect(0, [...]
\ No newline at end of file
diff --git a/skin/css/aios_buttons_generic.css b/skin/css/aios_buttons_generic.css
old mode 100755
new mode 100644
index 0d42c1d..ae4b474
--- a/skin/css/aios_buttons_generic.css
+++ b/skin/css/aios_buttons_generic.css
@@ -1 +1 @@
-window:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) #aios-toolbar[orient="vertical"] toolbarseparator{-moz-appearance:none!important;margin:3px 6px 2px 6px;border-bottom:1px solid -moz-ButtonHoverFace}window:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) #aios-toolbar[orient="vertical"][iconsize="small"] toolbarseparator{margin-left:5px;margin-right:5px}window:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) toolbarbutton.toolbarbutton-1.aios-tbutton,window:not([aios-ap [...]
\ No newline at end of file
+window:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]){}window:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button){list-style-image:url(../icons/toolbar_darwin.png);}window:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button):-moz-lwtheme-brighttext{list-style-image:url(../icons/toolbar_darwin_inverted.png);}window:not([aios-appOS="WINNT"]):not([aios-a [...]
\ No newline at end of file
diff --git a/skin/css/aios_buttons_winnt.css b/skin/css/aios_buttons_winnt.css
old mode 100755
new mode 100644
index 1f74814..7187136
--- a/skin/css/aios_buttons_winnt.css
+++ b/skin/css/aios_buttons_winnt.css
@@ -1 +1 @@
-#aios-toolbar[orient="vertical"] toolbarbutton{margin:2px 1px;padding-top:2px;padding-bottom:2px}#aios-toolbar[orient="vertical"] toolbarbutton toolbarbutton{margin:0}#aios-toolbar[orient="vertical"][iconsize="small"] .toolbarbutton-icon{margin:1px}#aios-toolbar[orient="vertical"] toolbarseparator,#aios-toolbar[orient="vertical"] toolbarpaletteitem[id^="wrapper-separator"]{margin:4px 2px 2px 2px}window[aios-appDefTheme="true"] toolbar[mode="icons"] toolbarbutton[type="menu-button"][check [...]
\ No newline at end of file
+toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button){list-style-image:url(../icons/toolbar_windows.png);}toolbarbutton.toolbarbutton-1.aios-tbutton:not(#downloads-button):-moz-lwtheme-brighttext{list-style-image:url(../icons/toolbar_windows_inverted.png);}#bookmarks-button{-moz-image-region:rect(1px, 17px, 17px, 1px);}#history-button{-moz-image-region:rect(1px, 35px, 17px, 19px);}#addons-button{-moz-image-region:rect(1px, 71px, 17px, 55px);}#multipanel-button{-moz-image-regi [...]
\ No newline at end of file
diff --git a/skin/css/aios_theme_darwin.css b/skin/css/aios_theme_darwin.css
old mode 100755
new mode 100644
index 1bc007b..02553e6
--- a/skin/css/aios_theme_darwin.css
+++ b/skin/css/aios_theme_darwin.css
@@ -1 +1 @@
-window[aios-appDefTheme="true"] #aios-toggle-toolbar,window[aios-appDefTheme="true"] #aios-toolbar{background-color:-moz-mac-chrome-active}window[aios-appDefTheme="true"] #aios-toggle-toolbar:-moz-window-inactive,window[aios-appDefTheme="true"] #aios-toolbar:-moz-window-inactive{background-color:-moz-mac-chrome-inactive}window[aios-appDefTheme="true"] #aios-toolbar[orient="horizontal"]{padding:3px 0 4px 0}window[aios-appDefTheme="true"] #aios-toggle-toolbar{border-top:1px solid #c0c0c0;b [...]
\ No newline at end of file
+window[aios-appDefTheme="true"]{}window[aios-appDefTheme="true"] #aios-toggle-toolbar,window[aios-appDefTheme="true"] #aios-toolbar{background-color:-moz-mac-chrome-active;}window[aios-appDefTheme="true"] #aios-toggle-toolbar:-moz-window-inactive,window[aios-appDefTheme="true"] #aios-toolbar:-moz-window-inactive{background-color:-moz-mac-chrome-inactive;}window[aios-appDefTheme="true"] #aios-toolbar[orient="horizontal"]{padding:3px 0 4px 0;}window[aios-appDefTheme="true"] #aios-toggle-to [...]
\ No newline at end of file
diff --git a/skin/css/aios_theme_generic.css b/skin/css/aios_theme_generic.css
old mode 100755
new mode 100644
index 65a88dc..ed01ff4
--- a/skin/css/aios_theme_generic.css
+++ b/skin/css/aios_theme_generic.css
@@ -1 +1 @@
-window[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) #aios-toggle-toolbar{border-top:0;border-right:1px solid ThreedShadow}window[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"])[aiosOrient="right"] #aios-toggle-toolbar{border-left:none;border-left:1px solid ThreedShadow}window[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) #aios-toolbox-left,window[aios-appDefTheme="true"]:not([aios-appOS="WINNT" [...]
\ No newline at end of file
+window[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]){}window[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) #aios-toggle-toolbar{border-top:none;border-right:1px solid ThreedShadow;}window[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"])[aiosOrient="right"] #aios-toggle-toolbar{border-left:none;border-left:1px solid ThreedShadow;}window[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios- [...]
\ No newline at end of file
diff --git a/skin/css/aios_theme_winnt.css b/skin/css/aios_theme_winnt.css
old mode 100755
new mode 100644
index 6884026..f7a6eac
--- a/skin/css/aios_theme_winnt.css
+++ b/skin/css/aios_theme_winnt.css
@@ -1 +1 @@
-window[aios-appDefTheme="true"] #aios-toggle-toolbar{border-top:1px solid ThreedHighlight;border-right:1px solid ThreedShadow}window[aios-appDefTheme="true"][aiosOrient="right"] #aios-toggle-toolbar{border-left:1px solid ThreedShadow;border-right:0}window[aios-appDefTheme="true"] #aios-toolbar[posMode="1"]{border-top:1px solid ThreedHighlight;border-left:1px solid ThreedHighlight;border-right:1px solid ThreedShadow}window[aios-appDefTheme="true"][aiosOpen="false"][aiosOrient="left"] #bro [...]
\ No newline at end of file
+window[aios-appDefTheme="true"]{}window[aios-appDefTheme="true"] #aios-toggle-toolbar{border-top:1px solid ThreedHighlight;border-right:1px solid ThreedShadow;}window[aios-appDefTheme="true"][aiosOrient="right"] #aios-toggle-toolbar{border-left:1px solid ThreedShadow;border-right:none;}window[aios-appDefTheme="true"] #aios-toolbar[posMode="1"]{border-top:1px solid ThreedHighlight;border-left:1px solid ThreedHighlight;border-right:1px solid ThreedShadow;}window[aios-appDefTheme="true"][ai [...]
\ No newline at end of file
diff --git a/skin/css/console.css b/skin/css/console.css
old mode 100755
new mode 100644
index 7131071..f83e2f9
--- a/skin/css/console.css
+++ b/skin/css/console.css
@@ -1 +1 @@
-window#JSConsoleWindow,#ConsoleBox{margin:0;padding:0;border:0}toolbox{border:0}#ToolbarMode{padding:0 1px 1px 1px}#ToolbarMode toolbarbutton{min-width:0;padding:1px 4px!important}#ToolbarMode[hideLabel=true] toolbarbutton:not([class="textonly"]) label{display:none}#ToolbarMode[hideLabel=true] toolbarbutton:not([class="textonly"]) image{margin:0}.console-row{padding:5px}.console-row *{margin:0;padding:0}.console-row .console-row-content>*{margin-bottom:3px}.console-row .console-row-conte [...]
\ No newline at end of file
+window#JSConsoleWindow,#ConsoleBox{margin:0;padding:0;border:none;}toolbox{border:none;}#ToolbarMode{padding:0 1px 1px 1px;}#ToolbarMode toolbarbutton{min-width:0;padding:1px 4px !important;}#ToolbarMode[hideLabel=true] toolbarbutton:not([class="textonly"]) label{display:none;}#ToolbarMode[hideLabel=true] toolbarbutton:not([class="textonly"]) image{margin:0;}.console-row{padding:5px;}.console-row *{margin:0;padding:0;}.console-row .console-row-content>*{margin-bottom:3px;}.console-row .c [...]
\ No newline at end of file
diff --git a/skin/css/downloads.css b/skin/css/downloads.css
old mode 100755
new mode 100644
index 285a3f3..159d149
--- a/skin/css/downloads.css
+++ b/skin/css/downloads.css
@@ -1 +1 @@
-#contentAreaDownloadsView{margin:0;padding:0;border:none}
\ No newline at end of file
+#contentAreaDownloadsView{margin:0;padding:0;border:none;}
\ No newline at end of file
diff --git a/skin/css/downloads.old.css b/skin/css/downloads.old.css
deleted file mode 100755
index 02fcd81..0000000
--- a/skin/css/downloads.old.css
+++ /dev/null
@@ -1 +0,0 @@
-#downloadManager,#downloadView{margin:0;padding:0;border:0}#search{direction:rtl}#search *{direction:ltr}#search #searchbox{-moz-box-flex:1000}#search #searchbox,#search #clearListButton{margin:1px}window[aios-appOS="WINNT"] #clearListButton{list-style-image:url(../icons/panels_menus.png);-moz-image-region:rect(0,48px,16px,32px)}window[aios-appOS="Darwin"] #clearListButton{list-style-image:url(../icons/panels_menus.png);-moz-image-region:rect(32px,48px,48px,32px)}richlistitem:not([select [...]
\ No newline at end of file
diff --git a/skin/css/downloads_old.css b/skin/css/downloads_old.css
new file mode 100644
index 0000000..d4895b5
--- /dev/null
+++ b/skin/css/downloads_old.css
@@ -0,0 +1 @@
+#downloadManager,#downloadView{margin:0;padding:0;border:none;}#search{direction:rtl;}#search *{direction:ltr;}#search #searchbox{-moz-box-flex:1000;}#search #searchbox,#search #clearListButton{margin:1px;}window[aios-appOS="WINNT"] #clearListButton{list-style-image:url(../icons/panels_menus.png);-moz-image-region:rect(0, 48px, 16px, 32px);}window[aios-appOS="Darwin"] #clearListButton{list-style-image:url(../icons/panels_menus.png);-moz-image-region:rect(32px, 48px, 48px, 32px);}richlist [...]
\ No newline at end of file
diff --git a/skin/css/multipanel.css b/skin/css/multipanel.css
old mode 100755
new mode 100644
index a45b031..f7675dc
--- a/skin/css/multipanel.css
+++ b/skin/css/multipanel.css
@@ -1 +1 @@
-#commandBar{padding:1px 2px 2px 2px}#ssrSidebar-mitem{margin-left:13px}#page-button .toolbarbutton-menubutton-button,#about-button .toolbarbutton-menubutton-button,#toolsButton{-moz-box-orient:horizontal;list-style-image:url(../icons/panels_menus.png)}page[aios-appOS="WINNT"] #page-button .toolbarbutton-menubutton-button{-moz-image-region:rect(0,80px,16px,64px)}page[aios-appOS="WINNT"] #about-button .toolbarbutton-menubutton-button{-moz-image-region:rect(0,96px,16px,80px)}page[aios-appOS [...]
\ No newline at end of file
+#commandBar{padding:1px 2px 2px 2px;}#ssrSidebar-mitem{margin-left:13px;}#page-button .toolbarbutton-menubutton-button,#about-button .toolbarbutton-menubutton-button,#toolsButton{-moz-box-orient:horizontal;list-style-image:url(../icons/panels_menus.png);}page[aios-appOS="WINNT"] #page-button .toolbarbutton-menubutton-button{-moz-image-region:rect(0, 80px, 16px, 64px);}page[aios-appOS="WINNT"] #about-button .toolbarbutton-menubutton-button{-moz-image-region:rect(0, 96px, 16px, 80px);}page [...]
\ No newline at end of file
diff --git a/skin/css/multipanel_config.css b/skin/css/multipanel_config.css
old mode 100755
new mode 100644
index c7dd61a..a5df24d
--- a/skin/css/multipanel_config.css
+++ b/skin/css/multipanel_config.css
@@ -1 +1 @@
-window[aios-appDefTheme="true"]{border-top:1px solid ThreedHighlight}window[aios-appDefTheme="true"] #filterRow{-moz-appearance:toolbox;margin:0;padding-right:1px;padding-bottom:1px}window[aios-appDefTheme="true"] #configTree{-moz-appearance:none;margin:0;border:0}window[aios-appDefTheme="true"] #configTree treechildren{margin-left:5px}window[aios-appDefTheme="true"][aios-appOSVersion="Windows NT 5.1"] #filterRow{border-bottom:1px solid ThreedShadow}window[aios-appDefTheme="true"]:-moz-s [...]
\ No newline at end of file
+window[aios-appDefTheme="true"]{border-top:1px solid ThreedHighlight;}window[aios-appDefTheme="true"] #filterRow{-moz-appearance:toolbox;margin:0;padding-right:1px;padding-bottom:1px;}window[aios-appDefTheme="true"] #configTree{-moz-appearance:none;margin:0;border:none;}window[aios-appDefTheme="true"] #configTree treechildren{margin-left:5px;}window[aios-appDefTheme="true"][aios-appOSVersion="Windows NT 5.1"] #filterRow{border-bottom:1px solid ThreedShadow;}window[aios-appDefTheme="true" [...]
\ No newline at end of file
diff --git a/skin/css/multipanel_ssr.css b/skin/css/multipanel_ssr.css
old mode 100755
new mode 100644
index 3e45a7c..df08b07
--- a/skin/css/multipanel_ssr.css
+++ b/skin/css/multipanel_ssr.css
@@ -1 +1 @@
-html{background-color:AppWorkspace!important}body{width:176px!important;min-width:0!important;padding:3px!important;margin:auto!important;border:1px solid ThreedDarkShadow!important;border-top:none!important;background-color:#fff!important}*{font-size:11px!important;background-image:none!important}*:not(body):not(html):not(select):not(option):not(optgroup){width:auto!important;min-width:0!important;height:auto!important;max-width:176px!important;position:static!important;top:auto!importa [...]
\ No newline at end of file
+html{background-color:AppWorkspace !important;}body{width:176px !important;min-width:0 !important;padding:3px !important;margin:auto !important;border:1px solid ThreedDarkShadow !important;border-top:none !important;background-color:#FFFFFF !important;}*{font-size:11px !important;background-image:none !important;}*:not(body):not(html):not(select):not(option):not(optgroup){width:auto !important;min-width:0 !important;height:auto !important;max-width:176px !important;position:static !impor [...]
\ No newline at end of file
diff --git a/skin/css/pageinfo.css b/skin/css/pageinfo.css
old mode 100755
new mode 100644
index 6b982b1..bb3f490
--- a/skin/css/pageinfo.css
+++ b/skin/css/pageinfo.css
@@ -1 +1 @@
-#mainDeck,#topBar,#viewGroup{margin:0;padding:0}#viewGroup{padding:0 0 1px 1px}#viewGroup[hideLabel=true] radio{min-width:0;margin:0 2px 0 0;padding:2px}#viewGroup[hideLabel=true] radio label{display:none}#generalPanel #titletext{padding:5px}#permPanel>hbox{padding-top:5px}#permPanel #permList{border:0}#permPanel #permList>vbox{padding-left:0;padding-right:0}#permPanel #permList>vbox hbox{-moz-box-orient:vertical}#security-privacy-groupbox row{margin-top:10px;padding-top:10px}#security-p [...]
\ No newline at end of file
+#mainDeck,#topBar,#viewGroup{margin:0;padding:0;}#viewGroup{padding:0 0 1px 1px;}#viewGroup[hideLabel=true] radio{min-width:0;margin:0 2px 0 0;padding:2px;}#viewGroup[hideLabel=true] radio label{display:none;}#generalPanel #titletext{padding:5px;}#permPanel>hbox{padding-top:5px;}#permPanel #permList{border:none;}#permPanel #permList>vbox{padding-left:0;padding-right:0;}#permPanel #permList>vbox hbox{-moz-box-orient:vertical;}#security-privacy-groupbox row{margin-top:10px;padding-top:10px [...]
\ No newline at end of file
diff --git a/skin/css/places.css b/skin/css/places.css
old mode 100755
new mode 100644
index da98ecf..c33a637
--- a/skin/css/places.css
+++ b/skin/css/places.css
@@ -1 +1 @@
-page[aios-inSidebar] #bookmarksPanel,page[aios-inSidebar] #bookmarks-view,page[aios-inSidebar] tree#bookmarks-view,page[aios-inSidebar] #history-panel,page[aios-inSidebar] #historyTree{margin:0;padding:0;border:0}page[aios-inSidebar] tree{-moz-appearance:none}page[aios-inSidebar] label[control="search-box"]{display:none}page[aios-inSidebar] #closeFolder,page[aios-inSidebar] #viewButton{list-style-image:url(../icons/panels_menus.png)}page[aios-inSidebar] #closeFolder{-moz-image-region:rec [...]
\ No newline at end of file
+page[aios-inSidebar]{}page[aios-inSidebar] #bookmarksPanel,page[aios-inSidebar] #bookmarks-view,page[aios-inSidebar] tree#bookmarks-view,page[aios-inSidebar] #history-panel,page[aios-inSidebar] #historyTree{margin:0;padding:0;border:none;}page[aios-inSidebar] tree{-moz-appearance:none;}page[aios-inSidebar] label[control="search-box"]{display:none;}page[aios-inSidebar] #closeFolder,page[aios-inSidebar] #viewButton{list-style-image:url(../icons/panels_menus.png);}page[aios-inSidebar] #clos [...]
\ No newline at end of file
diff --git a/skin/css/prefs.css b/skin/css/prefs.css
old mode 100755
new mode 100644
index f7340c7..85b70b8
--- a/skin/css/prefs.css
+++ b/skin/css/prefs.css
@@ -1 +1 @@
-radio[pane=aiosGeneral],radio[pane=aiosPanels],radio[pane=aiosMenus],radio[pane=aiosKeys],radio[pane=aiosAbout]{list-style-image:url(../icons/prefs.png)}radio[pane=aiosGeneral]{-moz-image-region:rect(0,32px,32px,0)}radio[pane=aiosPanels]{-moz-image-region:rect(0,64px,32px,32px)}radio[pane=aiosMenus]{-moz-image-region:rect(0,96px,32px,64px)}radio[pane=aiosKeys]{-moz-image-region:rect(0,128px,32px,96px)}radio[pane=aiosAbout]{-moz-image-region:rect(0,160px,32px,128px)}#obj-minWidthVal,#obj- [...]
\ No newline at end of file
+radio[pane=aiosGeneral],radio[pane=aiosPanels],radio[pane=aiosMenus],radio[pane=aiosKeys],radio[pane=aiosAbout]{list-style-image:url(../icons/prefs.png);}radio[pane=aiosGeneral]{-moz-image-region:rect(0, 32px, 32px, 0);}radio[pane=aiosPanels]{-moz-image-region:rect(0, 64px, 32px, 32px);}radio[pane=aiosMenus]{-moz-image-region:rect(0, 96px, 32px, 64px);}radio[pane=aiosKeys]{-moz-image-region:rect(0, 128px, 32px, 96px);}radio[pane=aiosAbout]{-moz-image-region:rect(0, 160px, 32px, 128px);}# [...]
\ No newline at end of file
diff --git a/skin/icons/icon64.png b/skin/icons/icon64.png
old mode 100755
new mode 100644
index 433a1c5..b2f86b1
Binary files a/skin/icons/icon64.png and b/skin/icons/icon64.png differ
diff --git a/skin/icons/panels_menus.png b/skin/icons/panels_menus.png
old mode 100755
new mode 100644
index 8f36d84..05742d7
Binary files a/skin/icons/panels_menus.png and b/skin/icons/panels_menus.png differ
diff --git a/skin/icons/prefs.png b/skin/icons/prefs.png
old mode 100755
new mode 100644
diff --git a/skin/icons/toolbar_darwin.png b/skin/icons/toolbar_darwin.png
old mode 100755
new mode 100644
index 5dd539b..f276596
Binary files a/skin/icons/toolbar_darwin.png and b/skin/icons/toolbar_darwin.png differ
diff --git a/skin/icons/toolbar_darwin_inverted.png b/skin/icons/toolbar_darwin_inverted.png
new file mode 100644
index 0000000..762d939
Binary files /dev/null and b/skin/icons/toolbar_darwin_inverted.png differ
diff --git a/skin/icons/toolbar_generic.png b/skin/icons/toolbar_generic.png
old mode 100755
new mode 100644
index ca1f01a..45a4868
Binary files a/skin/icons/toolbar_generic.png and b/skin/icons/toolbar_generic.png differ
diff --git a/skin/icons/toolbar_inverted_windows.png b/skin/icons/toolbar_inverted_windows.png
deleted file mode 100755
index a6a817b..0000000
Binary files a/skin/icons/toolbar_inverted_windows.png and /dev/null differ
diff --git a/skin/icons/toolbar_windows.png b/skin/icons/toolbar_windows.png
old mode 100755
new mode 100644
index 0d8fdaf..4a34707
Binary files a/skin/icons/toolbar_windows.png and b/skin/icons/toolbar_windows.png differ
diff --git a/skin/icons/toolbar_windows_inverted.png b/skin/icons/toolbar_windows_inverted.png
new file mode 100644
index 0000000..44b4610
Binary files /dev/null and b/skin/icons/toolbar_windows_inverted.png differ
diff --git a/skin/icons/topbar_darwin.png b/skin/icons/topbar_darwin.png
old mode 100755
new mode 100644
index f1d8ccc..ed0b5db
Binary files a/skin/icons/topbar_darwin.png and b/skin/icons/topbar_darwin.png differ
diff --git a/skin/img/arrow-dn.png b/skin/img/arrow-dn.png
old mode 100755
new mode 100644
diff --git a/skin/img/arrow-up.png b/skin/img/arrow-up.png
old mode 100755
new mode 100644
diff --git a/skin/img/arrow.gif b/skin/img/arrow.gif
old mode 100755
new mode 100644
diff --git a/skin/img/console_css.png b/skin/img/console_css.png
old mode 100755
new mode 100644
diff --git a/skin/img/console_xml.png b/skin/img/console_xml.png
old mode 100755
new mode 100644
diff --git a/skin/img/grippy-left.gif b/skin/img/grippy-left.gif
old mode 100755
new mode 100644
diff --git a/skin/img/grippy-right.gif b/skin/img/grippy-right.gif
old mode 100755
new mode 100644
diff --git a/skin/img/info.png b/skin/img/info.png
old mode 100755
new mode 100644
diff --git a/skin/img/paypal.gif b/skin/img/paypal.gif
old mode 100755
new mode 100644
diff --git a/skin/img/sidebarheader.gif b/skin/img/sidebarheader.gif
old mode 100755
new mode 100644
diff --git a/skin/less/addons.less b/skin/less/addons.less
deleted file mode 100755
index 91df33c..0000000
--- a/skin/less/addons.less
+++ /dev/null
@@ -1,735 +0,0 @@
-page[aios-inSidebar] {
-
-    padding: 0;
-
-    /* @group Navigation */
-    > hbox {
-        -moz-box-orient: vertical;
-    }
-
-    #categories {
-        margin: 0;
-        padding: 1px 1px 0 1px;
-    }
-
-    .category,
-    .category:not([disabled]) {
-        height: auto;
-        margin: 0 1px 1px 0;
-        padding: 2px;
-    }
-
-    .category-icon {
-        margin: 0;
-    }
-
-    #category-search[disabled="true"],
-    #category-availableUpdates[disabled="true"],
-    #category-recentUpdates[disabled="true"],
-    .category-name,
-    .category-badge {
-        display: none;
-    }
-    /* @end */
-
-
-    /* @group Header */
-    #header {
-        margin: 0;
-        padding: 4px;
-    }
-
-    #header-utils-btn {
-        margin: 0 5px;
-        min-width: 0;
-    }
-
-    #updates-container {
-        padding: 5px 0;
-
-        .button-box {
-            padding-left: 0;
-            padding-right: 0;
-        }
-
-        button.button-link {
-            margin-left: 5px;
-        }
-
-        #close-btn {
-            display: block !important;
-        }
-    }
-    /* @end */
-
-
-    /* @group Content */
-    .view-header {
-        padding: 0 4px;
-        min-height: 0;
-    }
-
-    .sorter,
-    .search-filter-radio {
-        margin: 3px 0 3px 5px;
-        height: 18px;
-        max-height: 18px;
-    }
-
-    #search-filter {
-        padding: 0;
-        font-size: 11px;
-    }
-
-    /* Textbuttons im Header und in den richlistitems */
-    button.button-link {
-        margin: 0;
-        padding: 0;
-    }
-    /* @end */
-
-
-    /* @group Add-ons */
-    .addon {
-        padding: 5px;
-
-        * {
-            margin: 0;
-        }
-
-        .warning,
-        .error,
-        .pending {
-            margin-bottom: 5px;
-        }
-
-        .pending {
-            > vbox {
-                margin-left: 10px;
-            }
-
-            .button-box {
-                padding-left: 0;
-                padding-right: 0;
-            }
-        }
-
-        .icon-container,
-        .warning-icon,
-        .error-icon,
-        .pending-icon {
-            margin-right: 10px !important;
-        }
-
-        .name-container {
-            font-size: 11px;
-            font-weight: normal;
-
-            .name {
-                font-weight: bold;
-            }
-
-            .version {
-                margin-left: 10px;
-            }
-        }
-
-        .name-container spacer,
-        .creator,
-        .date-updated {
-            display: none;
-        }
-
-
-        /* @group nicht selektierte Add-ons */
-        &:not([selected="true"]) {
-
-            .icon-container,
-            .icon {
-                height: 16px;
-                width: 16px;
-            }
-
-            .disabled-postfix,
-            .update-postfix {
-                margin-left: 5px;
-            }
-
-            .control-container,
-            .addon-control,
-            .description-container,
-            .relnotes-container,
-            .relnotes-toggle {
-                display: none;
-            }
-
-        }
-        /* @end */
-
-
-        /* @group selektierte Add-ons */
-        &[selected="true"] {
-
-            .icon-container,
-            .icon {
-                height: 32px;
-                width: 32px;
-            }
-
-            .name-container {
-                font-size: 13px;
-                font-weight: bold;
-            }
-
-            .warning-icon,
-            .error-icon,
-            .pending-icon {
-                margin: 0 18px 0 8px;
-            }
-
-            .aios-container > vbox,
-            .install-status,
-            .relnotes-toggle {
-                margin-top: 5px;
-            }
-
-            .description-container {
-                -moz-box-orient: vertical;
-                float: left;
-
-                .description {
-                    display: block;
-                }
-
-                .details {
-                    margin-left: -2px;
-                    padding: 0;
-                }
-            }
-
-            .control-container > * {
-                margin-left: 2px;
-                min-width: 0;
-
-                &:first-child {
-                    margin-left: 0;
-                }
-            }
-
-            /*.relnotes H2 {
-                font-size: 10px !important;
-            }
-
-            .relnotes UL {
-                margin: 0 !important;
-                padding: 0 !important;
-            }*/
-
-        }
-        /* @end */
-
-    }
-    /* @end */
-
-
-    /* @group Detail-Ansicht */
-    #detail-view {
-        vbox {
-            font-size: 1em;
-        }
-
-        .detail-view-container {
-            padding: 10px;
-        }
-
-        #detail-notifications {
-            margin: 0;
-            padding: 0;
-        }
-
-        #detail-icon-container {
-            display: none;
-        }
-
-        #warning-container,
-        #error-container,
-        #pending-container {
-            margin-bottom: 9px;
-            padding-bottom: 10px;
-        }
-
-        #pending-container  {
-
-            .button-box {
-                padding-left: 0;
-                padding-right: 0;
-            }
-
-            > vbox {
-                margin-left: 10px;
-            }
-
-        }
-
-        #detail-header {
-            margin-bottom: 15px;
-            padding-bottom: 10px;
-
-            > * {
-                margin: 0;
-                padding: 0;
-            }
-        }
-
-        #detail-icon {
-            margin: 0 10px 0 0;
-            width: 64px;
-            height: 64px;
-        }
-
-        spacer {
-            display: none;
-        }
-
-        #detail-name {
-            margin-bottom: 0;
-        }
-
-        #detail-version {
-            margin-bottom: 5px;
-        }
-
-        #detail-name,
-        #detail-version,
-        .disabled-postfix,
-        .update-postfix {
-            font-size: 14px;
-        }
-
-        #detail-restart-btn,
-        #detail-undo-btn,
-        #detail-name,
-        #detail-version,
-        #detail-creator,
-        #detail-desc,
-        #detail-fulldesc,
-        #detail-grid * {
-            margin-left: 0;
-            margin-right: 0;
-        }
-
-        #detail-name,
-        #detail-desc {
-            font-weight: bold;
-        }
-
-        #detail-screenshot {
-            margin-top: 5px;
-            max-width: none;
-        }
-
-        #detail-contributions > hbox {
-            -moz-box-orient: vertical;
-            -moz-box-align: end;
-        }
-
-        #detail-updates-row {
-
-            radio {
-                margin-right: 6px;
-
-                .radio-icon {
-                    margin-right: 3px;
-                }
-            }
-
-        }
-
-        #detail-rating-row > hbox {
-            -moz-box-orient: vertical;
-        }
-
-        #detail-controls button {
-            margin-left: 0;
-        }
-    }
-    /* @end */
-
-
-
-    /* @group Firefox-Standard-Theme */
-
-    &[aios-appDefTheme="true"] {
-        background-image: none;
-
-        .addon:not([selected="true"]) {
-            background-color: #FFFFFF;
-        }
-
-        #categories {
-            border-top: none;
-            border-bottom: 1px solid ThreedShadow;
-            background-color: #ffffff;
-        }
-
-        .category,
-        .category:not([disabled]) {
-            border: none;
-            border-radius: 0;
-
-            &[selected="true"] {
-                background-color: #C1D2EE;
-            }
-
-            &:hover {
-                background-color: #E0E8F6;
-            }
-        }
-
-        #header {
-            border-top: 1px solid ThreedHighlight;
-            border-bottom: 1px solid ThreedShadow;
-        }
-
-        #updates-container {
-            color: infotext;
-            background-color: infobackground;
-            border-bottom: 1px solid ThreedShadow;
-        }
-
-        .view-header,
-        #search-filter {
-            background-color: -moz-dialog;
-            border-top: 1px solid ThreedHighlight;
-            border-bottom: 1px solid ThreedShadow;
-        }
-
-        #view-port-container {
-            border: 0;
-            border-radius: 0;
-        }
-
-
-        /*[notification="warning"]
-        [notification="error"]
-        [pending="enable"]
-        [pending="upgrade"]
-        [pending="install"]
-        [pending="disable"]
-        [pending="uninstall"]*/
-
-        .addon {
-
-            &:not([selected="true"]) {
-
-                &[active=false]:not([pending]) {
-                    opacity: 0.6;
-
-                    &:not([notification]) {
-                        background-image: none;
-                    }
-                }
-            }
-        }
-
-        #detail-view {
-
-            #warning-container,
-            #error-container,
-            #pending-container,
-            #detail-header {
-                border-bottom: 2px solid;
-                -moz-border-bottom-colors: rgba(255, 255, 255, 0.2) rgba(28, 31, 37, 0.2);
-            }
-
-            #detail-screenshot {
-                border: 5px solid #ffffff;
-                border-radius: 5px;
-            }
-
-        }
-
-
-        /* @group Windows */
-        &[aios-appOS="WINNT"] {
-
-            .sorter {
-                color: black;
-
-                &[checkState="1"],
-                &[checkState="2"] {
-                    background-color: grey;
-                    color: white;
-                    box-shadow: none;
-                    text-shadow: none;
-                }
-
-                &[checkState="1"] {
-                    list-style-image: url("../img/arrow-dn.png");
-                }
-
-                &[checkState="2"] {
-                    list-style-image: url("../img/arrow-up.png");
-                }
-            }
-
-            .addon {
-                border-top: none;
-                border-bottom-width: 1px;
-                border-bottom-style: dotted;
-                border-bottom-color: rgba(0,0,0,0.3);
-
-                &:not([selected="true"]) {
-
-                    &[active=true]:nth-child(odd) {
-                        background-color: rgba(255,255,255,0.6);
-                    }
-
-                }
-            }
-
-            #view-port-container {
-                background-color: transparent;
-                background-image: none;
-            }
-
-
-            /* @group Windows-XP klassisch */
-            &[aios-appOSVersion="Windows NT 5.1"] {
-                background-color: #efedea;
-
-                #header {
-                    background-color: -moz-dialog;
-                }
-            }
-            /* @end */
-
-
-            /* @group Windows-Standard */
-            &:-moz-system-metric(windows-default-theme) {
-
-                /* @group Windows-XP-Standard */
-                &[aios-appOSVersion="Windows NT 5.1"] {
-                    background-color: #EDECEF;
-
-                    #header {
-                        background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.5),
-                                          rgba(255, 255, 255, 0));
-                    }
-
-                }
-                /* @end */
-
-
-                /* @group Windows-Vista-7-Standard */
-                &:not([aios-appOSVersion="Windows NT 5.1"]) {
-                    background-color: #EEF3FA;
-
-                    .view-header,
-                    #search-filter {
-                        background-color: rgb(204, 217, 234);
-                    }
-                }
-                /* @end */
-
-            }
-            /* @end */
-
-        }
-        /* @end */
-
-
-        /* @group Darwin */
-        &[aios-appOS="Darwin"] {
-            background-color: #D4DDE5;
-
-            &:-moz-window-inactive {
-                background-color: #e8e8e8;
-            }
-
-            > hbox {
-                border-top: 1px solid #484848;
-
-                &:-moz-window-inactive {
-                    border-top: 1px solid #929292;
-                }
-            }
-
-            #categories {
-                -moz-box-align: center;
-                background-color: -moz-mac-chrome-active;
-                border-top: 1px solid #c0c0c0;
-                border-left: 1px solid #c0c0c0;
-                border-bottom: 1px solid #484848;
-
-                &:-moz-window-inactive {
-                    background-color: -moz-mac-chrome-inactive;
-                    border-top: 1px solid #e1e1e1;
-                    border-left: 1px solid #e1e1e1;
-                    border-bottom: 1px solid #929292;
-                }
-
-                .scrollbox-innerbox {
-                    margin: 0 0 2px 0;
-                    padding: 0;
-                    background-color: -moz-mac-chrome-active;
-                    border-top: 1px solid #484848;
-                    border-right: 1px solid #484848;
-                    border-bottom: 1px solid #484848;
-
-                    &:-moz-window-inactive {
-                        background-color: -moz-mac-chrome-inactive;
-                        border-top: 1px solid #929292;
-                        border-right: 1px solid #929292;
-                        border-bottom: 1px solid #929292;
-                    }
-                }
-
-                .category,
-                .category:not([disabled]) {
-                    margin: 0;
-                    padding: 5px;
-                    border-left: 1px solid #484848;
-                    background: -moz-linear-gradient(top, #FFF, #ADADAD) repeat-x;
-
-                    &:-moz-window-inactive {
-                        border-left: 1px solid #929292;
-                        background: -moz-linear-gradient(top, #FFF, #ADADAD) repeat-x;
-                    }
-
-                    &[selected="true"] {
-                        background: #606060;
-                        box-shadow: inset rgba(42, 42, 42, 1) 0 3px 3px;
-
-                        &:-moz-window-inactive {
-                            background: #bababa;
-                            box-shadow: inset rgba(42, 42, 42, 0.6) 0 2px 2px;
-                        }
-                    }
-
-                    .category-icon {
-                        max-width: 24px;
-                        max-height: 24px;
-                        opacity: 0.5;
-
-                        &:-moz-window-inactive {
-                            opacity: 0.3;
-                        }
-                    }
-
-                    &:hover,
-                    &[selected="true"] {
-
-                        .category-icon {
-                            opacity: 1;
-
-                            &:-moz-window-inactive {
-                                opacity: 0.8;
-                            }
-                        }
-
-                    }
-                }
-            }
-
-            #header {
-                padding: 11px 3px 6px 5px;
-                border-top: none;
-                border-bottom: none;
-            }
-
-            #updates-container {
-                margin: 5px 0 0 0;
-
-                #close-btn {
-                    margin: 0;
-                    padding: 0;
-                }
-            }
-
-            .view-header,
-            #search-filter {
-                background-color: #D4DDE5;
-                background-image: none;
-                border: none;
-
-                &:-moz-window-inactive {
-                    background-color: #e8e8e8;
-                }
-            }
-
-            #view-port-container {
-                background-color: #D4DDE5;
-                background-image: none;
-
-                &:-moz-window-inactive {
-                    background-color: #e8e8e8;
-                }
-            }
-
-            #view-port richlistbox {
-                margin-top: 5px;
-            }
-
-            .addon {
-                padding: 7px 5px;
-                border: none;
-
-                &:not([selected="true"]) {
-
-                    &[active=true]:nth-child(odd) {
-                        background-color: -moz-oddtreerow;
-                    }
-
-                }
-
-                .details {
-                    margin-left: -3px;
-                }
-            }
-
-        }
-        /* @end */
-
-
-
-        /* @grou Linux */
-        &:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) {
-
-            #categories {
-                padding:  1px;
-                border:  1px solid ThreedShadow;
-            }
-
-            #header {
-                border:  none;
-            }
-
-            category,
-            .category:not([disabled]) {
-                margin: 0 0 1px 0;
-
-                &[selected="true"] {
-                    background-color: highlight;
-                }
-
-                &:hover {
-                    background-color: transparent;
-                }
-            }
-
-        }
-        /* @end */
-
-    }
-
-    /* @end */
-
-
-
-    /* Fix fuer Greasemonkey */
-    richlistitem[type="user-script"] hbox.pending > vbox button:first-child {
-        display: none !important;
-    }
-
-}
\ No newline at end of file
diff --git a/skin/less/aios.less b/skin/less/aios.less
deleted file mode 100755
index 4a478a7..0000000
--- a/skin/less/aios.less
+++ /dev/null
@@ -1,441 +0,0 @@
-
- at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* @group
-    Sidebar Switch
-        => themes must not overwrite the settings for the border and the margin, otherwise the switch will not work correct!
-*/
-
-window[aiosOrient="left"] {
-
-    toolbox#aios-toggle-toolbox,
-    toolbox#aios-toggle-toolbox > toolbar#aios-toggle-toolbar {
-        margin: 0 !important;
-        border-left: none !important;
-    }
-
-}
-
-window[aiosOrient="right"] {
-
-    toolbox#aios-toggle-toolbox,
-    toolbox#aios-toggle-toolbox > toolbar#aios-toggle-toolbar {
-        margin: 0 !important;
-        border-right: none !important;
-    }
-
-}
-
-#aios-toggle-toolbox,
-#aios-toggle-toolbar {
-    padding: 0;
-    border: none;
-}
-
-#aios-toggle-toolbar {
-    -moz-appearance: none;
-}
-/* @end */
-
-
-/* @group AiOS-Toolbar */
-#aios-toolbox-left,
-#aios-toolbox-right,
-#aios-toolbox-sidebartop,
-#aios-toolbox-sidebartop2,
-#aios-toolbox-sidebarbottom,
-#aios-sbhtoolbox {
-    border: none;
-}
-
-#aios-toolbar {
-    -moz-appearance: none;
-    -moz-box-flex: 1;
-    padding: 1px 1px 1px 0;
-    border: none;
-
-    &[orient="vertical"] {
-        -moz-box-orient: vertical;
-    }
-
-    &[orient="horizontal"] {
-        padding: 0 1px 1px 0;
-    }
-}
-
-#aios-toolbar-contextmenu dialogheader,
-#aios-sbhtoolbar-contextmenu dialogheader {
-    margin: 0 0 7px 0;
-    padding: 2px 0;
-    font-weight: bold;
-    border: none;
-}
-
-/* flexible Buttons */
-#aios-toolbar[flexbuttons="true"] toolbarbutton {
-    -moz-box-flex: 1;
-}
-
-/* vertikale Buttons - Fix fuer TotalToolbar */
-window[aiosVButtons="false"] #aios-toolbar[orient="vertical"] toolbarbutton {
-    -moz-box-orient: horizontal !important;
-}
-
-/* vertikale Buttons */
-window[aiosVButtons="true"] #aios-toolbar[orient="vertical"] toolbarbutton {
-    -moz-box-orient: vertical !important;
-}
-
-/* Toolbar-Mode: Text */
-#aios-toolbar[orient="vertical"][mode="text"] toolbarbutton {
-    -moz-box-orient: horizontal;
-
-    .toolbarbutton-text {
-        text-align: left;
-    }
-}
-
-/* Toolbarspacer auf der Toolbar und im Konfigurationsmodus */
-#aios-toolbar[orient="vertical"] {
-
-    toolbarspacer,
-    toolbarpaletteitem[id^="wrapper-spacer"] {
-        height: 21px;
-    }
-
-}
-
-/* Toolbarspring auf der Toolbar und im Konfigurationsmodus */
-#aios-toolbar {
-
-    toolbarspring,
-    toolbarpaletteitem[id^="wrapper-spring"] {
-        -moz-box-flex: 1000;
-    }
-
-}
-
-/* Toolbarseparator auf der Toolbar und im Konfigurationsmodus */
-#aios-toolbar {
-
-    toolbarseparator,
-    toolbarpaletteitem[id^="wrapper-separator"] {
-        margin: 0 0 1px 1px;
-    }
-
-    &[orient="vertical"] {
-
-        toolbarseparator,
-        toolbarpaletteitem[id^="wrapper-separator"] {
-            -moz-appearance: none;
-            height: 2px;
-            max-height: 2px;
-            min-height: 2px;
-            padding: 0;
-            border: none;
-            border-top: 1px solid ThreedShadow;
-            border-bottom: 1px solid ThreedHighlight;
-        }
-    }
-}
-
-#aios-toolbar[orient="vertical"] toolbarpaletteitem[id^="wrapper-separator"] {
-    min-height: 5px;
-    border-bottom: 1px solid ThreedHighlight;
-    background-color: ActiveBorder;
-}
-
-#aios-toolbar[orient="horizontal"] toolbarpaletteitem[id^="wrapper-separator"] {
-    min-width: 5px;
-    max-width: 5px;
-    border-left: 1px solid ThreedShadow;
-    background-color: ActiveBorder;
-}
-
-
-/* Drag-and-Drop-Markierung im Konfigurationsmodus */
-#aios-toolbar[orient="vertical"] toolbarpaletteitem {
-
-    margin: -2px 0;
-    border: none;
-    border-top: 2px solid transparent;
-    border-bottom: 2px solid transparent;
-
-    &[dragover="left"] {
-        border-color: transparent;
-        border-top-color: #000000;
-    }
-
-    &[dragover="right"] {
-        border-color: transparent;
-        border-bottom-color: #000000;
-    }
-
-}
-/* @end */
-
-
-/* @group Grippy */
-#aios-toggle-toolbox grippy,
-#sidebar-splitter grippy {
-    /* eigentlich nur fuer Darwin noetig, sonst gibt es links einen 1px breiten Rand */
-    -moz-binding: url("chrome://aios/content/aios.xml#aiosGrippy");
-
-    cursor: pointer;
-    background: transparent none no-repeat center;
-
-    &:hover {
-        background-color: -moz-MenuHover;
-    }
-}
-
-#sidebar-splitter[orient="horizontal"] grippy {
-    min-width: 5px;
-    min-height: 119px;
-}
-
-#aios-toggle-toolbox grippy,
-#sidebar-splitter[orient="horizontal"] grippy,
-window[aiosOrient="right"][aiosOpen="false"] #aios-toggle-toolbox grippy,
-window[aiosOrient="right"][aiosOpen="false"] #sidebar-splitter[orient="horizontal"] grippy {
-    background-image: url(../img/grippy-left.gif);
-
-}
-
-window[aiosOpen="false"] #aios-toggle-toolbox grippy,
-window[aiosOpen="false"] #sidebar-splitter[orient="horizontal"] grippy,
-window[aiosOrient="right"] #aios-toggle-toolbox grippy,
-window[aiosOrient="right"] #sidebar-splitter[orient="horizontal"] grippy {
-    background-image: url(../img/grippy-right.gif);
-}
-/* @end */
-
-
-/* @group deaktivierte Icons */
-.aios-noIcons > .menu-iconic-left image {
-    display: none;
-}
-/* @end */
-
-
-/* @group
-    Vertikale Lesezeichen auf der AiOS-Toolbar
-         => ergaenzt durch document.getElementById('PlacesToolbarItems').removeAttribute('orient'); in aios.js
-*/
-#personal-bookmarks,
-#PlacesToolbarItems {
-    -moz-box-orient: horizontal;
-}
-
-#aios-toolbar[orient="vertical"] {
-
-    #personal-bookmarks,
-    #PlacesToolbarItems {
-        -moz-box-orient: vertical;
-    }
-
-    &[mode="icons"] {
-
-        label,
-        .chevron > label {
-            display: none !important;
-        }
-
-        menupopup label {
-            display: block !important;
-        }
-
-    }
-
-}
-
-#aios-toolbar[mode="icons"]:not([iconsize="small"]) .bookmark-item > image {
-    width: 22px;
-    height: 22px;
-    margin: 1px;
-}
-/* @end */
-
-
-/* @group Sidebar */
-#sidebar,
-#sidebar-box {
-    margin: 0;
-    padding: 0;
-    max-width: none !important;
-}
-
-/*
-  ermoeglicht eine minimale Groesse von 0, allerdings kann der Splitter
-  dann weiter gezogen werden, als die Maximalbreite zulaesst
-#sidebar-box {
-	overflow-x: hidden;
-}*/
-
-sidebarheader {
-    padding: 0 1px 1px 1px;
-}
-
-#sidebar-title {
-    display: none !important;
-}
-
-#sidebars-titlebutton > label {
-    padding-top: 2px;
-    padding-bottom: 2px;
-    padding-right: 10px;
-    background: url(../img/arrow.gif) no-repeat right 8px;
-}
-
-sidebarheader > .tabs-closebutton {
-    display: none;
-}
-/* @end */
-
-
-/* @group Sidebarheader-Toolabr */
-#aios-sbhtoolbox,
-#aios-sbhtoolbar {
-    -moz-appearance: none;
-    min-width: 30px;
-    background-color: transparent;
-    background-image: none !important;
-    border: none;
-}
-/* @end */
-
-
-/* @group Sidebar left/right */
-
-/* Sidebar on left (RTL-Languages) */
-window[aiosOrient="left"][aiosMode="rtl"] #browser {
-    direction: ltr;
-
-    * {
-        direction: rtl;
-    }
-}
-
-/* Sidebar on right (LTR-Languages) */
-window[aiosOrient="right"][aiosMode="ltr"] #browser {
-    direction: rtl;
-
-    * {
-        direction: ltr;
-    }
-}
-/* @end */
-
-
-/* @group Tooltips */
-#aiosPopupset tooltip {
-    padding: 1px;
-
-    box {
-        -moz-binding: url(chrome://aios/content/aios.xml#aiosTooltips);
-    }
-
-    label {
-        margin: 0;
-        padding: 1px 3px;
-
-        &[value=""],
-        &label:not([value]) {
-            display: none;
-        }
-
-        &:not([class="odd"]) {
-            border-top: 1px dotted ThreedDarkShadow;
-            border-bottom: 1px dotted ThreedDarkShadow;
-        }
-    }
-
-    > label:not([class="odd"]) {
-        margin-bottom: 5px;
-        padding: 2px 3px 4px 3px;
-        border-top: none;
-        border-bottom: 1px solid ThreedDarkShadow;
-    }
-}
-/* @end */
-
-
-/* @group Print Preview */
-window[onclose="PrintUtils.exitPrintPreview(); return false;"] {
-
-    #aios-toggle-toolbox,
-    #sidebar-box,
-    #aios-toolbox-left,
-    #aios-toolbox-right,
-    #sidebar-splitter {
-        display: none;
-    }
-
-}
-/* @end */
-
-
-/* @group Fixes */
-
-/* TotalToolbar */
-sidebarheader #tt-toolbox-sidebarheader {
-    display: none;
-}
-
-
-/* Console2 */
-#console2-button,
-menuitem[observes="viewConsole2Sidebar"]:not([id="console-mitem"]) {
-    display: none !important;
-}
-
-
-/* MR Tech Local Install & Download Manager Tweak */
-/*menuitem[key="key_dmSidebar"],*/
-#emSidebar,
-#tmSidebar {
-    display: none !important;
-}
-
-
-/* Download Manager Tweak */
-menuitem[id="menu_dmtSidebar"] {
-    display: none !important;
-}
-
-
-/* EZ Sidebar */
-menuitem[ezsidebar-id="ezsidebar:viewSidebarMenu:show"],
-menuitem[ezsidebar-id="ezsidebar:viewSidebarMenu:hide"] {
-    display: none !important;
-}
-
-window:not([windowtype="mozilla:sidebar"]) #ezsidebar-panels-button {
-    display: none !important;
-}
-
-
-/* Personas */
-window[persona] #browser,
-window[lwtheme="true"] #browser {
-    border-top: none !important;
-}
-
-window[persona],
-window[lwtheme="true"] {
-
-    #aios-toggle-toolbar,
-    #aios-toolbar,
-    sidebarheader,
-    &:-moz-system-metric(windows-default-theme) #aios-toolbar[posMode="4"],
-    #sidebar-splitter[orient="horizontal"] hbox {
-        border: none !important;
-        background-color: transparent !important;
-    }
-
-    #sidebar-splitter[orient="horizontal"] {
-        -moz-appearance: none !important;
-    }
-
-}
-/* @end */
\ No newline at end of file
diff --git a/skin/less/aios_buttons_darwin.less b/skin/less/aios_buttons_darwin.less
deleted file mode 100755
index 9356f41..0000000
--- a/skin/less/aios_buttons_darwin.less
+++ /dev/null
@@ -1,218 +0,0 @@
-
-/* @group Button-Icons */
-#downloads-button,
-#downloads-button:hover,
-toolbarbutton.toolbarbutton-1.aios-tbutton,
-toolbarbutton.toolbarbutton-1.aios-tbutton:hover,
-toolbar[iconsize="small"] toolbarbutton.toolbarbutton-1.aios-tbutton,
-toolbar[iconsize="small"] toolbarbutton.toolbarbutton-1.aios-tbutton:hover {
-    list-style-image: url(../icons/toolbar_darwin.png);
-}
-
-#downloads-button,
-#downloads-button:hover,
-toolbar[iconsize="small"] #downloads-button,
-toolbar[iconsize="small"] #downloads-button:hover {
-    -moz-image-region: rect(0, 16px, 16px, 0);
-
-    &[checked="true"] {
-        -moz-image-region: rect(16px, 16px, 32px, 0);
-    }
-}
-
-#addons-button,
-toolbar[iconsize="small"] #addons-button {
-    -moz-image-region: rect(0, 32px, 16px, 16px);
-
-    &[checked="true"] {
-        -moz-image-region: rect(16px, 32px, 32px, 16px);
-    }
-}
-
-#multipanel-button,
-toolbar[iconsize="small"] #multipanel-button {
-    -moz-image-region: rect(0, 48px, 16px, 32px);
-
-    &[checked="true"] {
-        -moz-image-region: rect(16px, 48px, 32px, 32px);
-    }
-}
-
-#pageinfo-button,
-toolbar[iconsize="small"] #pageinfo-button {
-    -moz-image-region: rect(0, 64px, 16px, 48px);
-
-    &[checked="true"] {
-        -moz-image-region: rect(16px, 64px, 32px, 48px);
-    }
-}
-
-#console-button,
-toolbar[iconsize="small"] #console-button {
-    -moz-image-region: rect(0, 96px, 16px, 80px);
-
-    &[checked="true"] {
-        -moz-image-region: rect(16px, 96px, 32px, 80px);
-    }
-}
-
-#paneltab-button,
-toolbar[iconsize="small"] #paneltab-button {
-    -moz-image-region: rect(0, 112px, 16px, 96px);
-}
-
-#sidebars-button,
-toolbar[iconsize="small"] #sidebars-button {
-    -moz-image-region: rect(0, 128px, 16px, 112px);
-
-    dropmarker {
-        display: none;
-    }
-}
-
-#sidebars-togglebutton,
-toolbar[iconsize="small"] #sidebars-togglebutton {
-    -moz-image-region: rect(0, 144px, 16px, 128px);
-
-    &[checked="true"] {
-        -moz-image-region: rect(16px, 144px, 32px, 128px);
-    }
-}
-
-toolbar[mode="full"]:not([orient="vertical"]) #sidebars-togglebutton {
-    -moz-box-orient: horizontal;
-
-    .toolbarbutton-menubutton-button {
-        -moz-box-orient: horizontal;
-    }
-}
-
-#autohide-button,
-toolbar[iconsize="small"] #autohide-button {
-    -moz-image-region: rect(0, 160px, 16px, 144px);
-
-    &[checked="true"] {
-        -moz-image-region: rect(16px, 160px, 32px, 144px);
-    }
-}
-
-#toolbar-button,
-toolbar[iconsize="small"] #toolbar-button {
-    -moz-image-region: rect(0, 176px, 16px, 160px);
-
-    &[checked="true"] {
-        -moz-image-region: rect(16px, 176px, 32px, 160px);
-    }
-}
-/* @end */
-
-
-/* @group Menue-Icons */
-menuitem[key="aiosKey_panelTab1"],
-menuitem[key="aiosKey_panelTab2"],
-menuitem#aios-sidebar-mitem-show,
-menuitem#aios-sidebar-mitem-hide,
-menuitem[key="aiosKey_prefs"] {
-    list-style-image: url(../icons/panels_menus.png);
-}
-
-menuitem[key="aiosKey_panelTab1"] {
-    -moz-image-region: rect(48px, 16px, 64px, 0);
-}
-
-menuitem[key="aiosKey_panelTab2"] {
-    -moz-image-region: rect(48px, 32px, 64px, 16px);
-}
-
-menuitem#aios-sidebar-mitem-hide {
-    -moz-image-region: rect(48px, 48px, 64px, 32px);
-}
-
-menuitem#aios-sidebar-mitem-show {
-    -moz-image-region: rect(48px, 64px, 64px, 48px);
-}
-
-menuitem[key="aiosKey_prefs"] {
-    -moz-image-region: rect(32px, 16px, 48px, 0);
-}
-/* @end */
-
-
-
-window[aios-appDefTheme="true"] {
-
-    #downloads-button,
-    #downloads-button:hover,
-    toolbarbutton.toolbarbutton-1.aios-tbutton,
-    toolbarbutton.toolbarbutton-1.aios-tbutton:hover,
-    toolbar[iconsize="small"] toolbarbutton.toolbarbutton-1.aios-tbutton,
-    toolbar[iconsize="small"] toolbarbutton.toolbarbutton-1.aios-tbutton:hover {
-
-        image.toolbarbutton-icon,
-        &:hover image.toolbarbutton-icon:-moz-window-inactive {
-            opacity: 0.75;
-        }
-
-        image.toolbarbutton-icon:-moz-window-inactive {
-            opacity: 0.3;
-        }
-
-        &[checked="true"] {
-
-            image.toolbarbutton-icon,
-            &:hover image.toolbarbutton-icon:-moz-window-inactive {
-                opacity:  1;
-            }
-
-            image.toolbarbutton-icon:-moz-window-inactive {
-                opacity: 0.5;
-            }
-        }
-    }
-
-    #aios-toolbar[orient="vertical"] toolbarbutton {
-        margin: 2px 1px;
-    }
-
-    #aios-sbhtoolbar[iconsize="small"] toolbarbutton {
-        margin: 0 2px;
-        padding: 0;
-        min-width: 0;
-        max-height: none;
-
-        image {
-            margin: 0;
-        }
-    }
-
-    toolbar[mode="full"] #downloads-button {
-        label {
-            margin-top:  5px;
-        }
-    }
-
-    #sidebars-togglebutton,
-    toolbar[iconsize="small"] #sidebars-togglebutton {
-        border: none;
-
-        .toolbarbutton-menubutton-button {
-
-            label {
-                margin-left: 2px;
-                margin-right: 3px;
-            }
-
-        }
-    }
-
-    toolbar[mode="icons"]:not([orient="vertical"]) #sidebars-togglebutton[checked="true"]  {
-        -moz-appearance: toolbarbutton;
-
-        .toolbarbutton-menubutton-button,
-        .toolbarbutton-menubutton-dropmarker {
-            -moz-appearance: none;
-            min-width: 0;
-        }
-
-    }
-}
diff --git a/skin/less/aios_buttons_generic.less b/skin/less/aios_buttons_generic.less
deleted file mode 100755
index 186fd78..0000000
--- a/skin/less/aios_buttons_generic.less
+++ /dev/null
@@ -1,123 +0,0 @@
-
-window:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) {
-
-    #aios-toolbar[orient="vertical"] toolbarseparator {
-        -moz-appearance: none !important;
-        margin: 3px 6px 2px 6px;
-        border-bottom: 1px solid -moz-ButtonHoverFace;
-    }
-
-    #aios-toolbar[orient="vertical"][iconsize="small"] toolbarseparator {
-        margin-left: 5px;
-        margin-right: 5px;
-    }
-
-
-    /* @group Button-Icons */
-    toolbarbutton.toolbarbutton-1.aios-tbutton,
-    toolbarbutton.toolbarbutton-1.aios-tbutton:hover,
-    toolbar[iconsize="small"] toolbarbutton.toolbarbutton-1.aios-tbutton,
-    toolbar[iconsize="small"] toolbarbutton.toolbarbutton-1.aios-tbutton:hover {
-        list-style-image: url(../icons/toolbar_generic.png);
-    }
-
-    #addons-button {
-        -moz-image-region: rect(0, 24px, 24px, 0);
-    }
-    toolbar[iconsize="small"] #addons-button {
-        -moz-image-region: rect(24px, 16px, 40px, 0);
-    }
-
-    #multipanel-button {
-        -moz-image-region: rect(0, 48px, 24px, 24px);
-    }
-    toolbar[iconsize="small"] #multipanel-button {
-        -moz-image-region: rect(24px, 32px, 40px, 16px);
-    }
-
-    #pageinfo-button {
-        -moz-image-region: rect(0, 72px, 24px, 48px);
-    }
-    toolbar[iconsize="small"] #pageinfo-button {
-        -moz-image-region: rect(24px, 48px, 40px, 32px);
-    }
-
-    #console-button {
-        -moz-image-region: rect(0, 120px, 24px, 96px);
-    }
-    toolbar[iconsize="small"] #console-button {
-        -moz-image-region: rect(24px, 80px, 40px, 64px);
-    }
-
-    #paneltab-button {
-        -moz-image-region: rect(0, 144px, 24px, 120px);
-    }
-    toolbar[iconsize="small"] #paneltab-button {
-        -moz-image-region: rect(24px, 96px, 40px, 80px);
-    }
-
-    #sidebars-button {
-        -moz-image-region: rect(0, 168px, 24px, 144px);
-    }
-    toolbar[iconsize="small"] #sidebars-button {
-        -moz-image-region: rect(24px, 112px, 40px, 96px);
-    }
-    /*toolbar:not([mode="text"]) #sidebars-button dropmarker {
-        display: none;
-    }*/
-
-    #sidebars-togglebutton {
-        padding: 0 !important;
-        -moz-image-region: rect(0, 192px, 24px, 168px);
-    }
-    toolbar[iconsize="small"] #sidebars-togglebutton {
-        -moz-image-region: rect(24px, 128px, 40px, 112px);
-    }
-
-    #autohide-button {
-        -moz-image-region: rect(0, 216px, 24px, 192px);
-    }
-    toolbar[iconsize="small"] #autohide-button {
-        -moz-image-region: rect(24px, 144px, 40px, 128px);
-    }
-
-    #toolbar-button {
-        -moz-image-region: rect(0, 240px, 24px, 216px);
-    }
-    toolbar[iconsize="small"] #toolbar-button {
-        -moz-image-region: rect(24px, 160px, 40px, 144px);
-    }
-    /* @end */
-
-
-    /* @group Menue-Icons */
-    menuitem[key="aiosKey_panelTab1"],
-    menuitem[key="aiosKey_panelTab2"],
-    menuitem#aios-sidebar-mitem-show,
-    menuitem#aios-sidebar-mitem-hide,
-    menuitem[key="aiosKey_prefs"] {
-        list-style-image: url(../icons/panels_menus.png) !important;
-    }
-
-    menuitem[key="aiosKey_panelTab1"] {
-        -moz-image-region: rect(80px, 16px, 96px, 0) !important;
-    }
-
-    menuitem[key="aiosKey_panelTab2"] {
-        -moz-image-region: rect(80px, 32px, 96px, 16px) !important;
-    }
-
-    menuitem#aios-sidebar-mitem-hide {
-        -moz-image-region: rect(80px, 48px, 96px, 32px) !important;
-    }
-
-    menuitem#aios-sidebar-mitem-show {
-        -moz-image-region: rect(80px, 64px, 96px, 48px) !important;
-    }
-
-    menuitem[key="aiosKey_prefs"] {
-        -moz-image-region: rect(64px, 16px, 80px, 0) !important;
-    }
-    /* @end */
-
-}
\ No newline at end of file
diff --git a/skin/less/aios_buttons_winnt.less b/skin/less/aios_buttons_winnt.less
deleted file mode 100755
index d4390b2..0000000
--- a/skin/less/aios_buttons_winnt.less
+++ /dev/null
@@ -1,346 +0,0 @@
-
-#aios-toolbar[orient="vertical"] {
-
-    toolbarbutton {
-
-        margin: 2px 1px;
-        padding-top: 2px;
-        padding-bottom: 2px;
-
-        /* Toolbarbutton mit Dropmarker */
-        toolbarbutton {
-            margin: 0;
-        }
-
-    }
-
-    &[iconsize="small"] .toolbarbutton-icon {
-        margin: 1px;
-    }
-
-    toolbarseparator,
-    toolbarpaletteitem[id^="wrapper-separator"] {
-        margin: 4px 2px 2px 2px;
-    }
-
-}
-
-
-/* @group Firefox-Standard-Theme */
-window[aios-appDefTheme="true"] {
-
-    /* Aktivierter Toolbarbutton (type = menu-button) [iconsize="large"] */
-    toolbar[mode="icons"] {
-
-        toolbarbutton[type="menu-button"][checked="true"] {
-
-            .toolbarbutton-icon,
-            .dropmarker-icon {
-                background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1)) !important;
-                background-color: hsla(210,54%,20%,.15) !important;
-                border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4) !important;
-                box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
-                            0 0 1px hsla(210,54%,20%,.2) inset,
-                            /* allows winstripe-keyhole-forward-mask to be used for non-hover as well as hover: */
-                            0 1px 0 hsla(210,54%,20%,0),
-                            0 0 2px hsla(210,54%,20%,0) !important;
-                text-shadow: none !important;
-                -moz-transition: none !important;
-            }
-
-            &:hover {
-
-                .toolbarbutton-icon,
-                .dropmarker-icon {
-                    border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4) !important;
-                    background-color: hsla(210,48%,96%,.75) !important;
-                    box-shadow: 0 0 1px hsla(210,54%,20%,.03),
-                                0 0 2px hsla(210,54%,20%,.1) !important;
-                    -moz-transition: background-color .4s !important;
-                }
-            }
-        }
-
-        /* [type="checkbox"] => u.a. AiOS-Toolbarbutton */
-        toolbarbutton[type="checkbox"]:not([checked="true"]) {
-
-            .toolbarbutton-icon,
-            .dropmarker-icon {
-                background-image: none !important;
-                background-color: transparent !important;
-                box-shadow: none !important;
-                border-color: transparent !important;
-            }
-        }
-
-    }
-    /* @end */
-
-
-    #aios-toolbar[iconsize="large"][mode="icons"],
-    #aios-sbhtoolbar[iconsize="large"][mode="icons"] {
-
-        .toolbarbutton-1 {
-            margin: 2px 2px 2px 3px;
-
-            /* Button-Optik mit BG und Border */
-            &,
-            > .toolbarbutton-menubutton-button,
-            > .toolbarbutton-menubutton-dropmarker {
-                -moz-appearance: none;
-                padding: 1px 5px;
-                border-radius: 2px;
-            }
-
-            /* Hover-Zustand - inaktiver Button */
-            &:hover:not(:active):not([disabled="true"]):not([checked="true"]):not([open="true"]) {
-
-                &:not([type="menu-button"]),
-                > .toolbarbutton-menubutton-button,
-                > .toolbarbutton-menubutton-dropmarker {
-                    background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
-                    border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.2) hsla(210,54%,20%,.25);
-                    box-shadow: 0 1px hsla(0,0%,100%,.3) inset,
-                                0 1px hsla(210,54%,20%,.03),
-                                0 0 2px hsla(210,54%,20%,.1);
-                }
-
-            }
-
-            /* Hover-Zustand aktiver Button */
-            &:active:hover, /* mousedown */
-            &[open="true"]:hover, /* geoeffnetes Menue */
-            &[checked="true"]:hover /* aktiviert */ {
-
-                &:not([type="menu-button"]),
-                .toolbarbutton-menubutton-button,
-                .toolbarbutton-menubutton-dropmarker {
-                    border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
-                    background-color: hsla(210,48%,96%,.75);
-                    box-shadow: 0 0 1px hsla(210,54%,20%,.03),
-                                0 0 2px hsla(210,54%,20%,.1);
-                    -moz-transition: background-color .4s;
-                }
-
-            }
-
-            /* aktiver Button */
-            &:active, /* mousedown */
-            &[open="true"], /* geoeffnetes Menue */
-            &[checked="true"] /* aktiviert */ {
-
-                &:not([type="menu-button"]),
-                .toolbarbutton-menubutton-button,
-                .toolbarbutton-menubutton-dropmarker {
-                    background-image: -moz-linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
-                    background-color: hsla(210,54%,20%,.15);
-                    border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
-                    box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
-                                0 0 1px hsla(210,54%,20%,.2) inset,
-                                /* allows winstripe-keyhole-forward-mask to be used for non-hover as well as hover: */
-                                0 1px 0 hsla(210,54%,20%,0),
-                                0 0 2px hsla(210,54%,20%,0);
-                    text-shadow: none;
-                    -moz-transition: none;
-                }
-
-            }
-
-
-            /* Icons */
-            > .toolbarbutton-icon,
-            > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-                margin: 2px;
-                width: 16px;
-                height: 16px;
-            }
-        }
-    }
-
-
-    #aios-toolbar[iconsize="large"][mode="icons"],
-    #aios-sbhtoolbar[iconsize="large"][mode="icons"] {
-
-        /* Menuebutton */
-        &[type="menu-button"] {
-            padding: 0;
-            background: none;
-            border: none;
-            box-shadow: none;
-        }
-
-        /* Menuebutton auf vertikaler Toolbar - Dropmarker unter dem Button */
-        &[orient="vertical"] {
-
-            .toolbarbutton-1[type="menu-button"] {
-
-                > .toolbarbutton-menubutton-button {
-                    border-bottom: none;
-                    border-bottom-left-radius: 0;
-                    border-bottom-right-radius: 0;
-                }
-
-                > .toolbarbutton-menubutton-dropmarker {
-                    border-top-left-radius: 0;
-                    border-top-right-radius: 0;
-                }
-            }
-
-        }
-
-        /* Menuebutton auf horizontaler Toolbar - Dropmarker rechts neben dem Button */
-        &[orient="horizontal"] {
-
-            .toolbarbutton-1[type="menu-button"] {
-
-                > .toolbarbutton-menubutton-button {
-
-                    :-moz-locale-dir(ltr) {
-                        border-right: none;
-                        border-top-right-radius: 0;
-                        border-bottom-right-radius: 0;
-                    }
-
-                    :-moz-locale-dir(rtl) {
-                        border-left: none;
-                        border-top-left-radius: 0;
-                        border-bottom-left-radius: 0;
-                    }
-
-                }
-
-                > .toolbarbutton-menubutton-dropmarker {
-
-                    :-moz-locale-dir(ltr) {
-                        border-top-left-radius: 0;
-                        border-bottom-left-radius: 0;
-                    }
-
-                    :-moz-locale-dir(rtl) {
-                        border-top-right-radius: 0;
-                        border-bottom-right-radius: 0;
-                    }
-
-                }
-
-            }
-
-        }
-
-    }
-
-    #aios-toolbar[mode="full"] {
-
-        .toolbarbutton-1,
-        .toolbarbutton-menubutton-button {
-            padding: 5px;
-        }
-
-    }
-
-    #aios-toolbar[iconsize="small"] {
-
-        .toolbarbutton-1 {
-            margin: 0 1px;
-            padding: 0 2px;
-        }
-
-        &[orient="horizontal"] {
-
-            .toolbarbutton-1 {
-                padding: 0 3px;
-            }
-
-        }
-
-    }
-
-}
-
-/* @end */
-
-
-/* @group Button-Icons */
-toolbarbutton.aios-tbutton:not([type="menu-button"]),
-toolbarbutton.aios-tbutton[type="menu-button"] {
-    list-style-image: url(../icons/toolbar_windows.png);
-}
-
-toolbar[tabsontop=false] toolbarbutton.aios-tbutton:not([type="menu-button"]),
-toolbar[tabsontop=false] toolbarbutton.aios-tbutton[type="menu-button"],
-toolbarbutton.aios-tbutton:not([type="menu-button"]):-moz-lwtheme-brighttext,
-toolbarbutton.aios-tbutton[type="menu-button"]:-moz-lwtheme-brighttext {
-    list-style-image: url(../icons/toolbar_inverted_windows.png);
-}
-
-#addons-button {
-    -moz-image-region: rect(1px, 17px, 17px, 1px);
-}
-
-#multipanel-button {
-    -moz-image-region: rect(1px, 35px, 17px, 19px);
-}
-
-#pageinfo-button {
-    -moz-image-region: rect(1px, 53px, 17px, 37px);
-}
-
-#console-button {
-    -moz-image-region: rect(1px, 71px, 17px, 55px);
-}
-
-#paneltab-button {
-    -moz-image-region: rect(1px, 89px, 17px, 73px);
-}
-
-#sidebars-button {
-    -moz-image-region: rect(1px, 107px, 17px, 91px);
-
-    /*dropmarker {
-        display: none;
-    }*/
-}
-
-#sidebars-togglebutton {
-    -moz-image-region: rect(1px, 125px, 17px, 109px);
-}
-
-#autohide-button {
-    -moz-image-region: rect(1px, 143px, 17px, 127px);
-}
-
-#toolbar-button {
-    -moz-image-region: rect(1px, 161px, 17px, 145px);
-}
-/* @end */
-
-
-/* @group Menue-Icons */
-menuitem[key="aiosKey_panelTab1"],
-menuitem[key="aiosKey_panelTab2"],
-menuitem#aios-sidebar-mitem-show,
-menuitem#aios-sidebar-mitem-hide,
-menuitem[key="aiosKey_prefs"] {
-    list-style-image: url(../icons/panels_menus.png);
-}
-
-menuitem[key="aiosKey_panelTab1"] {
-    -moz-image-region: rect(16px, 16px, 32px, 0);
-}
-
-menuitem[key="aiosKey_panelTab2"] {
-    -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-
-menuitem#aios-sidebar-mitem-hide {
-    -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
-
-menuitem#aios-sidebar-mitem-show {
-    -moz-image-region: rect(16px, 64px, 32px, 48px);
-}
-
-menuitem[key="aiosKey_prefs"] {
-    -moz-image-region: rect(0, 16px, 16px, 0);
-}
-/* @end */
diff --git a/skin/less/aios_theme_darwin.less b/skin/less/aios_theme_darwin.less
deleted file mode 100755
index 73bb3ae..0000000
--- a/skin/less/aios_theme_darwin.less
+++ /dev/null
@@ -1,253 +0,0 @@
-
-window[aios-appDefTheme="true"] {
-
-    #aios-toggle-toolbar,
-    #aios-toolbar {
-        background-color: -moz-mac-chrome-active;
-
-        &:-moz-window-inactive {
-            background-color: -moz-mac-chrome-inactive;
-        }
-    }
-
-    #aios-toolbar[orient="horizontal"] {
-        padding: 3px 0 4px 0;
-    }
-
-
-    /* @group Sidebar Switch */
-    #aios-toggle-toolbar {
-        border-top: 1px solid #c0c0c0;
-        border-right: 1px solid #484848;
-
-        &:-moz-window-inactive {
-            border-top: 1px solid #e1e1e1;
-            border-right: 1px solid #929292;
-        }
-    }
-
-    &[aiosOrient="right"] {
-
-        #aios-toggle-toolbox {
-            border-left: 1px solid #484848;
-
-            &:-moz-window-inactive {
-                border-left: 1px solid #929292;
-            }
-        }
-
-        #aios-toggle-toolbar {
-            border-left: 1px solid #c0c0c0;
-
-            &:-moz-window-inactive {
-                border-left: 1px solid #e1e1e1;
-            }
-        }
-
-    }
-    /* @end */
-
-
-    /* @group AiOS-Toolbar*/
-
-    /* Toolbar links neben der Sidebar */
-    #aios-toolbar[posMode="1"] {
-        border-top: 1px solid #c0c0c0;
-        border-left: 1px solid #c0c0c0;
-        border-right: 1px solid #484848;
-
-        &:-moz-window-inactive {
-            border-top: 1px solid #e1e1e1;
-            border-left: 1px solid #e1e1e1;
-            border-right: 1px solid #929292;
-        }
-    }
-
-    &[aiosOrient="right"] {
-
-        #aios-toolbar[posMode="1"] {
-            border-left: 2px groove #484848;
-
-            &:-moz-window-inactive {
-                border-left: 1px solid #929292;
-            }
-        }
-
-        &[aiosOpen="false"] #aios-toolbar[posMode="1"] {
-            border-right: none;
-
-            &:-moz-window-inactive {
-                border-left: 1px solid #929292;
-            }
-        }
-    }
-
-
-    /* Toolbar rechts neben der Sidebar */
-    #aios-toolbar[posMode="2"] {
-        border-top: 1px solid #c0c0c0;
-        border-left: 2px groove #484848;
-        border-right: 1px solid #484848;
-
-        &:-moz-window-inactive {
-            border-top: 1px solid #e1e1e1;
-            border-left: 1px solid #929292;
-            border-right: 1px solid #929292;
-        }
-    }
-
-    &[aiosOpen="false"] #aios-toolbar[posMode="2"] {
-        border-left: 1px solid #c0c0c0;
-
-        &:-moz-window-inactive {
-            border-left: 1px solid #e1e1e1;
-        }
-    }
-
-    &[aiosOrient="right"] {
-
-        #aios-toolbar[posMode="2"] {
-            border-right: none;
-        }
-
-        &[aiosOpen="false"] #aios-toolbar[posMode="2"] {
-            border-left: 2px groove #484848;
-
-            &:-moz-window-inactive {
-                border-left: 1px solid #929292;
-            }
-        }
-
-    }
-
-
-    /* Toolbar ueber der Sidebar */
-    #aios-toolbar[posMode="3"] {
-        border-right: 1px solid #484848;
-        border-top: 1px solid #c0c0c0;
-        border-bottom: 1px solid #484848;
-        border-left: 1px solid #c0c0c0;
-
-        &:-moz-window-inactive {
-            border-top: 1px solid #e1e1e1;
-            border-right: 1px solid #929292;
-            border-bottom: 1px solid #929292;
-            border-left: 1px solid #e1e1e1;
-        }
-    }
-
-    &[aiosOrient="right"] #aios-toolbar[posMode="3"] {
-        border-right: none;
-        border-left: 1px solid #484848;
-
-        &:-moz-window-inactive {
-            border-left: 1px solid #929292;
-        }
-    }
-
-
-    /* Toolbar unter der Sidebar-Kopfleiste */
-    #aios-toolbar[posMode="4"] {
-        border-top: 2px groove #c0c0c0;
-        border-right: 1px solid #484848;
-        border-bottom: 1px solid #484848;
-        border-left: 1px solid #c0c0c0;
-
-        &:-moz-window-inactive {
-            border-top: 2px groove #e1e1e1;
-            border-right: 1px solid #929292;
-            border-bottom: 1px solid #929292;
-            border-left: 1px solid #e1e1e1;
-        }
-    }
-
-    &[aiosOrient="right"] #aios-toolbar[posMode="4"] {
-        border-right: none;
-        border-left: 1px solid #484848;
-
-        &:-moz-window-inactive {
-            border-left: 1px solid #929292;
-        }
-    }
-
-
-    /* Toolbar unter der Sidebar */
-    #aios-toolbar[posMode="5"] {
-        border-top: 2px groove #c0c0c0;
-        border-right: 1px solid #484848;
-        border-left: 1px solid #c0c0c0;
-
-        &:-moz-window-inactive {
-            border-top: 2px groove #e1e1e1;
-            border-right: 1px solid #929292;
-            border-left: 1px solid #e1e1e1;
-        }
-    }
-
-    &[aiosOrient="right"] #aios-toolbar[posMode="5"] {
-        border-right: none;
-        border-left: 1px solid #484848;
-
-        &:-moz-window-inactive {
-            border-left: 1px solid #929292;
-        }
-    }
-    /* @end */
-
-
-    /* @group Grippy & Splitter */
-    grippy:hover {
-        background-color: #D4DDE5 !important;
-    }
-
-    #sidebar-splitter grippy:hover {
-        background-color: -moz-mac-chrome-active !important;
-    }
-
-    #sidebar-splitter[orient="horizontal"] {
-        border: none;
-        border-right: 1px solid #484848;
-        background-color: #D4DDE5;
-
-        &:-moz-window-inactive {
-            background-color: #e8e8e8;
-            border-right: 1px solid #929292;
-        }
-
-        &[grippy="false"] {
-            min-width: 3px;
-        }
-
-        &[grippy="true"] {
-            min-width: 6px;
-        }
-
-    }
-
-    &[aiosOrient="right"] #sidebar-splitter[orient="horizontal"] {
-        border-left: 1px solid #484848;
-        border-right: none;
-
-        &:-moz-window-inactive {
-            border-left: 1px solid #929292;
-        }
-    }
-    /* @end */
-
-
-    /* @group Toolbarseparator auf der Toolbar und im Konfigurationsmodus */
-    #aios-toolbar toolbarseparator,
-    #aios-toolbar toolbarpaletteitem[id^="wrapper-separator"] {
-        margin: 0 1px;
-        border-left: 1px dotted #484848;
-    }
-
-    #aios-toolbar[orient="vertical"] toolbarseparator,
-    #aios-toolbar[orient="vertical"] toolbarpaletteitem[id^="wrapper-separator"] {
-        margin: 4px 2px 3px 2px;
-        border-top: 1px dotted #484848;
-        border-bottom: none;
-    }
-    /* @end */
-
-}
\ No newline at end of file
diff --git a/skin/less/aios_theme_generic.less b/skin/less/aios_theme_generic.less
deleted file mode 100755
index eca0e74..0000000
--- a/skin/less/aios_theme_generic.less
+++ /dev/null
@@ -1,53 +0,0 @@
-
-window[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) {
-
-    /* @group Sidebar Switch */
-    #aios-toggle-toolbar {
-        border-top: none;
-        border-right: 1px solid ThreedShadow;
-    }
-
-    &[aiosOrient="right"] #aios-toggle-toolbar {
-        border-left: none;
-        border-left: 1px solid ThreedShadow;
-    }
-    /* @end */
-
-
-    /* @group AiOS-Toolbar */
-    #aios-toolbox-left,
-    #aios-toolbox-right,
-    #aios-toolbox-sidebartop,
-    #aios-toolbox-sidebartop2,
-    #aios-toolbox-sidebarbottom,
-    #aios-toolbar,
-    #aios-toolbar[posMode="1"],
-    #aios-toolbar[posMode="2"],
-    #aios-toolbar[posMode="3"],
-    #aios-toolbar[posMode="4"],
-    #aios-toolbar[posMode="5"] {
-        border: none;
-    }
-
-    #aios-toolbar[posMode="3"],
-    #aios-toolbar[posMode="5"] {
-        border: none !important;
-    }
-
-    &[aiosOrient="left"] #aios-toolbar[posMode="2"] {
-        border-right: 1px solid ThreedShadow;
-    }
-
-    &[aiosOrient="right"] #aios-toolbar[posMode="1"] {
-        border-left: 1px solid ThreedShadow;
-    }
-    /* @end */
-
-
-    /* @group Splitter */
-    #sidebar-splitter[orient="horizontal"] {
-        border: none !important;
-    }
-    /* @end */
-
-}
\ No newline at end of file
diff --git a/skin/less/aios_theme_winnt.less b/skin/less/aios_theme_winnt.less
deleted file mode 100755
index df7a7f1..0000000
--- a/skin/less/aios_theme_winnt.less
+++ /dev/null
@@ -1,154 +0,0 @@
-
-window[aios-appDefTheme="true"] {
-
-    /* @group Sidebar Switch */
-    #aios-toggle-toolbar {
-        border-top: 1px solid ThreedHighlight;
-        border-right: 1px solid ThreedShadow;
-    }
-
-    &[aiosOrient="right"] #aios-toggle-toolbar {
-        border-left: 1px solid ThreedShadow;
-        border-right: none;
-    }
-    /* @end */
-
-
-    /* @group AiOS-Toolbar */
-
-    /* links neben der Sidebar */
-    #aios-toolbar[posMode="1"] {
-        border-top: 1px solid ThreedHighlight;
-        border-left: 1px solid ThreedHighlight;
-        border-right: 1px solid ThreedShadow;
-    }
-
-    &[aiosOpen="false"] {
-
-        &[aiosOrient="left"] {
-
-            #browser[posMode="1"] #sidebar-splitter[grippy="true"] {
-                border-left: none;
-            }
-        }
-
-        &[aiosOrient="right"] {
-
-            #aios-toolbar[posMode="1"] {
-                border-right: none;
-                border-left: 2px groove ThreedHighlight;
-            }
-
-            #browser[posMode="1"] #sidebar-splitter[grippy="true"] {
-                border-right: none;
-            }
-        }
-
-    }
-
-
-    /* rechts neben der Sidebar */
-    #aios-toolbar[posMode="2"] {
-        border-top: 1px solid ThreedHighlight;
-        border-left: 2px groove ThreedHighlight;
-    }
-
-    &[aiosOrient="right"] #aios-toolbar[posMode="2"] {
-        border-left: 2px groove ThreedHighlight;
-        border-right: none;
-    }
-
-    &[aiosOpen="false"] {
-
-        &[aiosOrient="left"] {
-
-            #aios-toolbar[posMode="2"] {
-                border-left: 1px solid ThreedHighlight;
-                border-right: 1px solid ThreedShadow;
-            }
-
-            #browser[posMode="2"] #sidebar-splitter[grippy="true"] {
-                border-left: none;
-            }
-        }
-
-        &[aiosOrient="right"] {
-
-            #browser[posMode="2"] #sidebar-splitter[grippy="true"] {
-                border-right: none;
-            }
-        }
-
-    }
-
-
-    /* ueber der Sidebar */
-    #aios-toolbar[posMode="3"] {
-        border-top: 1px solid ThreedHighlight;
-        border-bottom: 1px solid ThreedShadow;
-    }
-
-
-    /* unter der Sidebar-Kopfleiste */
-    #aios-toolbar[posMode="4"] {
-        border-top: 1px solid ThreedHighlight;
-        border-bottom: 1px solid ThreedShadow;
-    }
-
-
-    /* unter der Sidebar */
-    #aios-toolbar[posMode="5"] {
-        border-top: 1px solid ThreedShadow;
-    }
-    /* @end */
-
-
-
-    &:-moz-system-metric(windows-default-theme) {
-
-        /* @group XP-Standard-Theme */
-        &[aios-appOSVersion="Windows NT 5.1"] {
-
-            #aios-toggle-toolbox,
-            #aios-toolbox-left,
-            #aios-toolbox-right {
-                -moz-appearance: none;
-                background-image: -moz-linear-gradient(135deg,
-                                  rgba(255, 255, 255, 0.5),
-                                  rgba(255, 255, 255, 0));
-            }
-
-            sidebarheader,
-            #aios-toolbox-sidebartop,
-            #aios-toolbox-sidebartop2,
-            #aios-toolbox-sidebarbottom {
-                -moz-appearance: none;
-                background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.5),
-                                  rgba(255, 255, 255, 0));
-            }
-
-        }
-        /* @end */
-
-        /* @group Vista-7-Standard-Theme */
-        &:not([aios-appOSVersion="Windows NT 5.1"]) {
-
-            &[aiosOpen="true"][aiosOrient="left"] #aios-toolbar[posMode="2"] {
-                padding-right: 2px;
-            }
-
-            #sidebar-splitter[grippy="true"] {
-                margin: 0;
-
-                &[orient="horizontal"] {
-                    background-color: #EEF3FA;
-                    border-left: 1px solid #A9B7C9;
-                }
-            }
-
-        }
-        /* @end */
-
-    }
-
-}
\ No newline at end of file
diff --git a/skin/less/console.less b/skin/less/console.less
deleted file mode 100755
index 1729cd2..0000000
--- a/skin/less/console.less
+++ /dev/null
@@ -1,526 +0,0 @@
-
-window#JSConsoleWindow,
-#ConsoleBox {
-    margin: 0;
-    padding: 0;
-    border: none;
-}
-
-toolbox {
-    border: none;	/* Windows-Classic-Theme-Fix */
-}
-
-#ToolbarMode {
-    padding: 0 1px 1px 1px;
-
-    toolbarbutton {
-        min-width: 0;
-        padding: 1px 4px !important;
-    }
-
-    &[hideLabel=true] toolbarbutton:not([class="textonly"]) {
-
-        label {
-            display: none;
-        }
-
-        image {
-            margin: 0;
-        }
-
-    }
-}
-
-
-.console-row {
-
-    /* Texte buendig */
-    padding: 5px;
-
-    & * {
-        margin: 0;
-        padding: 0;
-    }
-
-    .console-row-content > * {
-        margin-bottom: 3px;
-
-        &:last-child {
-            margin-bottom: 0;
-        }
-    }
-
-    .console-row-icon image {
-        width: 16px;
-        height: 16px;
-        min-width: 16px;
-        min-height: 16px;
-        margin-right: 10px;
-    }
-
-
-    /* flexible Zeilen */
-    .console-error-source,
-    .console-error-source label,
-    .console-row-code label {
-        -moz-box-flex: 1;
-    }
-
-    .lineNumberRow label:first-child {
-        margin-right: 5px;
-    }
-
-    &:not([selected=true]) {
-
-        .console-row-code  {
-            display: none;
-        }
-
-        .lineNumberRow label:first-child  {
-            margin-left: 5px;
-        }
-
-    }
-
-
-    /* Zeilenangabe des Fehlers in extra Zeile */
-    &[selected=true] {
-
-        .console-row-file {
-            -moz-box-orient: vertical;
-        }
-
-        .lineNumberRow label {
-            margin-top: 3px;
-        }
-
-    }
-}
-
-
-/* @group farbige Liste */
-*[aios-appDefTheme="true"] .console-row:not([selected=true]) {
-
-    &[type="error"],
-    &[type="exception"] {
-        background-color: #FFECEC;
-    }
-
-    &[type="warning"] {
-        background-color: #FFFFEC;
-    }
-
-    &[type="message"] {
-        background-color: #e8f0fb;
-    }
-}
-/* @end */
-
-
-/* @group Firefox-Standard-Theme */
-*[aios-appDefTheme="true"] {
-
-    .console-row {
-        border-bottom-width: 1px;
-        border-bottom-style: dotted !important;
-        border-bottom-color: rgba(0,0,0,0.3);
-
-        &[selected=true] {
-
-            * {
-                color: #000;
-            }
-
-            .console-row-msg,
-            .console-error-msg,
-            description {
-                font-weight: bold;
-            }
-        }
-    }
-
-
-    /* @group Windows */
-    &[aios-appOS="WINNT"] {
-
-        #ToolbarMode,
-        #ToolbarExt, /* Console2 */
-        #ToolbarEval {
-            -moz-appearance: none;
-            border-top: 1px solid ThreedHighlight;
-            border-bottom: 1px solid ThreedShadow;
-        }
-
-        #ToolbarMode {
-            padding-top: 1px;
-            background-color: #fff;
-
-            toolbarbutton:not([class="textonly"]) {
-                -moz-appearance: none;
-                width: 36px;
-                height: 36px;
-                margin-right: 1px;
-                border: none;
-
-                &[checked="true"] {
-                    background-color: #c1d2ee;
-                }
-
-                &:hover {
-                    background-color: #e0e8f7;
-                }
-
-            }
-        }
-
-        .console-row,
-        .console-row[selected="true"] {
-            border-bottom: 1px solid ThreedShadow;
-
-            .text-link {
-                color: -moz-nativehyperlinktext !important;
-
-                &:hover {
-                    color: #3DA1FF !important;
-                }
-
-            }
-        }
-
-
-        /* @group Windows-XP klassisch */
-        &[aios-appOSVersion="Windows NT 5.1"] {
-
-            .console-box {
-                background-color: #efedea;
-            }
-
-            #ToolbarEval {
-                padding-top: 1px;
-                padding-bottom: 2px;
-
-                #TextboxEval {
-                    height: 26px;
-                }
-            }
-
-        }
-        /* @end */
-
-
-        /* @group Windows-Standard */
-        &:-moz-system-metric(windows-default-theme) {
-
-            /* @group Windows-XP-Standard */
-            &[aios-appOSVersion="Windows NT 5.1"] {
-
-                #console-toolbox {
-                    -moz-appearance: none;
-                }
-
-                #ToolbarEval {
-                    padding-top: 1px;
-                    padding-bottom: 2px;
-                    background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.5),
-                                      rgba(255, 255, 255, 0));
-
-                    #TextboxEval {
-                        height: 22px;
-                    }
-                }
-
-                .console-box {
-                    background-color: #EDECEF;
-                }
-
-                .console-row[selected="true"] {
-                    background: #CAD3E1 none;
-                }
-
-            }
-            /* @end */
-
-
-            /* @group Windws Vista-7-Standard */
-            &:not([aios-appOSVersion="Windows NT 5.1"]) {
-
-                #ToolbarEval,
-                .console-box {
-                    background-color: #eef3fa;
-                }
-
-                .console-row[selected="true"] {
-                    background: #CBD8E8 none;
-                }
-
-            }
-            /* @end */
-
-        }
-        /* @end */
-
-    }
-    /* @end */
-
-
-    /* @group Darwin */
-    &[aios-appOS="Darwin"] {
-
-        window#JSConsoleWindow,
-        #ConsoleBox,
-        #ToolbarExt, /* Console2 */
-        #ToolbarEval {
-            background-color: #D4DDE5;
-
-            &:-moz-window-inactive {
-                background-color: #E8E8E8;
-            }
-        }
-
-        #ToolbarMode,
-        #ToolbarExt, /* Console2 */
-        #ToolbarEval {
-            border-top: none;
-            border-bottom: none;
-            background-image: none;
-        }
-
-        #ToolbarEval {
-            padding-top: 8px;
-            padding-bottom: 8px;
-        }
-
-        #console-toolbox,
-        #ConsoleToolbox /* Console2 */ {
-            border-top: 1px solid #484848;
-
-            &:-moz-window-inactive {
-                border-top: 1px solid #929292;
-            }
-        }
-
-        #ToolbarMode {
-            -moz-appearance: none;
-            padding: 0 2px 1px 2px;
-            border-left: 1px solid #c0c0c0;
-            border-top: 1px solid #c0c0c0;
-            border-bottom: 1px solid #484848;
-            background-color: -moz-mac-chrome-active;
-
-            &:-moz-window-inactive {
-                border-left: 1px solid #e1e1e1;
-                border-top: 1px solid #e1e1e1;
-                border-bottom: 1px solid #929292;
-                background-color: -moz-mac-chrome-inactive;
-            }
-
-            spacer {
-                display: none;
-            }
-
-            #viewGroup {
-                margin: 1px 0;
-                padding: 0;
-                border: 1px solid #484848;
-                border-left: none;
-
-                &:-moz-window-inactive {
-                    border-color: #929292;
-                }
-            }
-
-            toolbarbutton:not([class="textonly"]) {
-                -moz-appearance: none;
-                padding: 5px;
-                border-left: 1px solid #484848;
-                border-right: none;
-                background: -moz-linear-gradient(top, #FFF, #ADADAD) repeat-x;
-                list-style-image: url("../icons/topbar_darwin.png");
-
-                &:-moz-window-inactive {
-                    border-left: 1px solid #929292;
-                }
-
-                &[checked="true"] {
-                    background: #606060;
-                    box-shadow: inset rgba(42, 42, 42, 1) 0 3px 3px;
-
-                    &:-moz-window-inactive {
-                        background: #bababa;
-                        box-shadow: inset rgba(42, 42, 42, 0.6) 0 2px 2px;
-                    }
-                }
-
-                image {
-                    margin: 4px 2px;
-                    display: -moz-box;
-                    opacity: 0.5;
-
-                    &:-moz-window-inactive {
-                        opacity: 0.3;
-                    }
-                }
-
-                &:hover,
-                &[checked="true"] {
-
-                    image {
-                        opacity: 1;
-
-                        &:-moz-window-inactive {
-                            opacity: 0.8;
-                        }
-                    }
-
-                }
-
-                &[id="Console:modeAll"],
-                &[id="item_modeAll"] /* Console2 */ {
-                    -moz-image-region: rect(48px, 24px, 72px, 0);
-                }
-
-                &[id="Console:modeErrors"],
-                &[id="item_modeErrors"] /* Console2 */ {
-                    -moz-image-region: rect(48px, 96px, 72px, 72px);
-                }
-
-                &[id="Console:modeWarnings"],
-                &[id="item_modeWarnings"] /* Console2 */ {
-                    -moz-image-region: rect(48px, 72px, 72px, 48px);
-                }
-
-                &[id="Console:modeMessages"],
-                &[id="item_modeMessages"] /* Console2 */ {
-                    -moz-image-region: rect(48px, 48px, 72px, 24px);
-                }
-
-                &[id="Console:clear"] {
-                    margin: 1px 0;
-                    border: 1px solid #484848;
-                    -moz-image-region: rect(48px, 120px, 72px, 96px);
-
-                    &:-moz-window-inactive {
-                        border-color: #929292;
-                    }
-                }
-
-                &[id="item_clearConsole"] /* Console2 */ {
-                    -moz-image-region: rect(48px, 120px, 72px, 96px);
-                }
-
-                /* Console2 */
-                &[id="item_modeAll"],
-                &[id="item_modeErrors"],
-                &[id="item_modeWarnings"],
-                &[id="item_modeMessages"],
-                &[id="item_clearConsole"] {
-                    margin: 1px;
-                    border: 1px solid #484848;
-
-                    &:-moz-window-inactive {
-                        border-color: #929292;
-                    }
-
-                }
-
-            }
-        }
-
-
-        .console-row {
-
-            .console-row-icon,
-            .console-row-msg > label,
-            .console-row-file > label {
-                display: none;
-            }
-
-            &[selected=true] {
-                background-color: #aab8c6 !important;
-
-                .console-row-msg,
-                .console-error-msg,
-                description {
-                    text-shadow: rgba(255, 255, 255, 0.4) 0 1px 0;
-                }
-
-                .text-link {
-                    color: #0066CC !important;
-
-                    &:hover {
-                      color: #3DA1FF !important;
-                    }
-                }
-            }
-        }
-
-
-        /* Console2-Toolbars */
-        &[id="Console2Window"] {
-
-            #ToolbarExt {
-                padding: 2px 3px 2px 1px;
-            }
-
-            #ToolbarEval {
-                padding: 2px 3px 3px 1px;
-            }
-
-        }
-
-    }
-    /* @end */
-
-
-    /* @group Linux */
-    &:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) {
-
-        #ToolbarMode,
-        #ToolbarExt,
-        #ToolbarEval {
-            -moz-appearance: none;
-        }
-
-    }
-    /* @end */
-
-}
-/* @end */
-
-
-
-
-/* @group Fix fuer Console2 */
-#Console2Window {
-
-    #ConsoleBox {
-        -moz-appearance: none;
-    }
-
-    .console-row-number label:first-child {
-        margin-right: 5px;
-    }
-
-    /* Zeilenangabe des Fehlers in extra Zeile */
-    richlistitem[selected=true] box + box {
-        -moz-box-orient: vertical ;
-
-        .console-row-number {
-            margin-top: 3px;
-        }
-    }
-
-    .console-row[category~="CSS"] .console-row-icon box {
-        background: url("../img/console_css.png") no-repeat left center;
-    }
-
-    .console-row[category]:not([category~="javascript"]):not([category~="JavaScript"]):not([category~="CSS"]) .console-row-icon box {
-        background: url("../img/console_xml.png") no-repeat left center;
-    }
-
-    .console-row-dupes,
-    .console-row-timestamp {
-        margin-left: 10px;
-    }
-}
-/* @end */
diff --git a/skin/less/downloads.less b/skin/less/downloads.less
deleted file mode 100755
index 373ea68..0000000
--- a/skin/less/downloads.less
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#contentAreaDownloadsView {
-    margin: 0;
-    padding: 0;
-    border: none;
-}
diff --git a/skin/less/downloads.old.less b/skin/less/downloads.old.less
deleted file mode 100755
index be86b6e..0000000
--- a/skin/less/downloads.old.less
+++ /dev/null
@@ -1,307 +0,0 @@
-
-#downloadManager,
-#downloadView {
-    margin: 0;
-    padding: 0;
-    border: none;
-}
-
-#search {
-    direction: rtl;	/* Clear Button rechts in der Toolbar */
-
-    * {
-        direction: ltr;
-    }
-
-    #searchbox {
-        -moz-box-flex: 1000;
-    }
-
-    #searchbox,
-    #clearListButton {
-        margin: 1px;
-    }
-}
-
-
-/* @group Icons (Linux hat ein hauseigenes Icon) */
-window[aios-appOS="WINNT"] #clearListButton {
-    list-style-image: url(../icons/panels_menus.png);
-    -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
-window[aios-appOS="Darwin"] #clearListButton {
-    list-style-image: url(../icons/panels_menus.png);
-    -moz-image-region: rect(32px, 48px, 48px, 32px);
-}
-/* @end */
-
-
-/* @group schmale Liste */
-
-/*
-	div. Status-Moeglichkeiten
-
-	state="-1"	=>	download-starting
-	state="0"	=>	download-downloading
-	state="1"	=>	download-done
-	state="2"	=>	download-failed
-	state="3"	=>	download-canceled
-	state="4"	=>	download-paused
-*/
-
-richlistitem:not([selected=true]) {
-
-    &[state="1"],
-    &[state="2"],
-    &[state="3"] {
-        min-height: 0 !important;
-        padding: 5px;
-    }
-
-    &[state="1"] .downloadTypeIcon,
-    &[state="2"] .downloadTypeIcon,
-    &[state="3"] .downloadTypeIcon {
-        width: 16px;
-        height: 16px;
-        min-width: 16px;
-        min-height: 16px;
-    }
-
-    &[state="1"] > hbox > vbox > hbox:nth-child(even),
-
-    &[state="1"] label.status,
-    &[state="2"] label.status,
-    &[state="3"] label.status,
-
-    &[state="1"] .mini-button,
-    &[state="2"] .mini-button,
-    &[state="3"] .mini-button,
-
-    &[state="1"] #dmtDoneShowBtn,
-    &[state="2"] #dmtDoneShowBtn,
-    &[state="3"] #dmtDoneShowBtn,
-
-    &[state="1"] #dmtDoneReloadBtn,
-    &[state="2"] #dmtDoneReloadBtn,
-    &[state="3"] #dmtDoneReloadBtn,
-
-    &[state="1"] #dmtDoneDeleteBtn,
-    &[state="2"] #dmtDoneDeleteBtn,
-    &[state="3"] #dmtDoneDeleteBtn,
-
-    &[state="1"] #dmtDoneCleanUpBtn,
-    &[state="2"] #dmtDoneCleanUpBtn,
-    &[state="3"] #dmtDoneCleanUpBtn {
-        display: none;
-    }
-}
-/* @end */
-
-
-
-/* @group Firefox-Standard-Theme */
-
-*[aios-appDefTheme="true"] {
-
-    richlistitem {
-
-        .name {
-            font-size: 11px;
-            font-weight: bold;
-        }
-
-        &[selected=true] .name,
-        &[state="-1"] .name,
-        &[state="0"] .name,
-        &[state="4"] .name {
-            font-size: 13px;
-        }
-
-        &[selected=true] .status,
-        &[selected=true] .dateTime {
-            font-size: 11px;
-        }
-    }
-
-
-    /* @group farbige Liste */
-    richlistitem:not([selected=true]) {
-
-        /* downloaden */
-        &[state="-1"],
-        &[state="0"],
-        &[state="4"] {
-            color: #006600;
-            background-color: #ECFFEC;
-        }
-
-        /* fehlgeschlagen oder abgebrochen */
-        &[state="2"],
-        &[state="3"] {
-            color: #660000;
-            background-color: #FFECEC;
-        }
-
-    }
-    /* @end */
-
-
-    /* @group Windows */
-    &[aios-appOS="WINNT"]{
-
-        #search {
-            padding: 0 1px 1px 1px;
-            border-top: 1px solid ThreedHighlight;
-        }
-
-        richlistitem {
-            border-bottom: 1px dotted rgba(0,0,0,0.3);
-
-            &[selected="true"] {
-                outline: 0;
-            }
-
-            &:not([selected="true"]) {
-
-                &[state="1"] {
-                    background-color: #FFFFFF;
-
-                    &:nth-child(odd) {
-                        background-color: rgba(255,255,255,0.6);
-                    }
-                }
-            }
-        }
-
-
-        /* @group Windows-XP klassisch */
-        &[aios-appOSVersion="Windows NT 5.1"] {
-
-            #downloadView {
-                -moz-appearance: none;
-                border-top: 1px solid ThreedShadow;
-                background-color: #efedea;
-            }
-
-        }
-        /* @end */
-
-
-        /* @group Windows-Standard */
-        &:-moz-system-metric(windows-default-theme) {
-
-            /* @group Windows XP-Standard */
-            &[aios-appOSVersion="Windows NT 5.1"] {
-
-                #search {
-                    background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.5),
-                                      rgba(255, 255, 255, 0));
-                }
-
-                #downloadView {
-                    background-color: #EDECEF;
-                }
-
-                richlistitem[selected="true"] {
-                    background: #CAD3E1 none;
-                }
-
-            }
-            /* @end */
-
-
-            /* @group Windows Vista-7-Standard */
-            &:not([aios-appOSVersion="Windows NT 5.1"]) {
-
-                #search {
-                    background-color: #eef3fa;
-                    border-bottom: 1px solid ThreedShadow;
-                }
-
-                #downloadView {
-                    background-color: #EEF3FA;
-                }
-
-                richlistitem[selected="true"] {
-                    color: #000000;
-                    background: #CBD8E8 none;
-                }
-
-            }
-            /* @end */
-
-        }
-        /* @end */
-
-    }
-    /* @end */
-
-
-    /* @group Darwin */
-    &[aios-appOS="Darwin"] {
-
-        #downloadView,
-        #search {
-            -moz-appearance: none;
-            background-color: #d4dde5;
-
-            &:-moz-window-inactive {
-                background-color: #e8e8e8;
-            }
-        }
-
-        #search {
-            padding: 6px 1px 10px 3px;
-
-            #searchbox {
-                margin-right: 6px;
-            }
-
-            #clearListButton {
-                -moz-appearance: none;
-                margin-top: 2px;
-                padding: 1px 0 1px 5px;
-                border: 1px solid #7F7F7F;
-                border-radius: 10px;
-                background: -moz-linear-gradient(top, #FFF, #ADADAD) repeat-x;
-
-                &[disabled="true"],
-                &:-moz-window-inactive {
-                    opacity: 0.5;
-                }
-            }
-
-        }
-
-        richlistitem {
-
-            &[state="1"]:not([selected=true]) {
-                background-color: #FFFFFF;
-
-                &:nth-child(odd) {
-                    background-color: #ECF3FE;
-                }
-            }
-
-            &[selected=true] {
-                color: #000;
-                background-color: #aab8c6;
-
-                .name {
-                    text-shadow: rgba(255, 255, 255, 0.4) 0 1px 0;
-                }
-
-                .status,
-                .dateTime {
-                    color: #000 !important;
-                }
-            }
-
-        }
-
-    }
-    /* @end */
-
-}
-/* @end */
diff --git a/skin/less/multipanel.less b/skin/less/multipanel.less
deleted file mode 100755
index efd5bce..0000000
--- a/skin/less/multipanel.less
+++ /dev/null
@@ -1,218 +0,0 @@
-
-#commandBar {
-    padding: 1px 2px 2px 2px;
-}
-
-#ssrSidebar-mitem {
-    margin-left: 13px;
-}
-
-
-/* @group Icons */
-#page-button .toolbarbutton-menubutton-button,
-#about-button .toolbarbutton-menubutton-button,
-#toolsButton {
-    -moz-box-orient: horizontal;
-    list-style-image: url(../icons/panels_menus.png);
-}
-
-
-/* @group Windows */
-page[aios-appOS="WINNT"] {
-
-
-    #page-button .toolbarbutton-menubutton-button {
-        -moz-image-region: rect(0, 80px, 16px, 64px);
-    }
-
-    #about-button .toolbarbutton-menubutton-button {
-        -moz-image-region: rect(0, 96px, 16px, 80px);
-    }
-
-    #toolsButton {
-        -moz-image-region: rect(0, 16px, 16px, 0);
-    }
-
-}
-/* @end */
-
-
-/* @group Darwin */
-page[aios-appOS="Darwin"] {
-
-    #page-button .toolbarbutton-menubutton-button {
-        -moz-image-region: rect(32px, 80px, 48px, 64px);
-    }
-
-    #about-button .toolbarbutton-menubutton-button {
-        -moz-image-region: rect(32px, 96px, 48px, 80px);
-    }
-
-    #toolsButton {
-        -moz-image-region: rect(32px, 16px, 48px, 0);
-    }
-
-}
-/* @end */
-
-
-/* @group Linux */
-page:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) {
-
-    #page-button .toolbarbutton-menubutton-button {
-        -moz-image-region: rect(64px, 80px, 80px, 64px);
-    }
-
-    #about-button .toolbarbutton-menubutton-button {
-        -moz-image-region: rect(64px, 96px, 80px, 80px);
-    }
-
-    #toolsButton {
-        -moz-image-region: rect(64px, 16px, 80px, 0);
-    }
-
-}
-/* @end */
-
-/* @end */
-
-
-/* @group Firefox-Standard-Theme */
-page[aios-appDefTheme="true"] {
-
-    /* @group Windows */
-    &[aios-appOS="WINNT"] {
-
-        #commandBar {
-            border-top: 1px solid ThreedHighlight;
-            border-bottom: 1px solid ThreedShadow;
-        }
-
-        #toolsButton dropmarker image {
-            margin: 0 2px 0 3px;
-        }
-
-        .toolbarbutton-1 {
-            margin-right: 5px;
-
-            label {
-                padding-left: 4px;
-                padding-right: 1px;
-            }
-        }
-
-        /* @group Windows-XP klassisch */
-        &[aios-appOSVersion="Windows NT 5.1"] {
-
-            #commandBar {
-                padding-top: 2px;
-            }
-
-        }
-        /* @end */
-
-
-        /* @group Windows-Standard */
-        &:-moz-system-metric(windows-default-theme) {
-
-            /* @group Windows-XP-Standard */
-            &[aios-appOSVersion="Windows NT 5.1"] {
-
-                #commandBar {
-                    padding-top: 1px;
-                    background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.5),
-                                      rgba(255, 255, 255, 0));
-                }
-
-            }
-            /* @end */
-
-
-            /* @group Windows-Vista-7-Standard */
-            &:not([aios-appOSVersion="Windows NT 5.1"]) {
-
-                #commandBar {
-                    background-color: #eef3fa;
-                }
-
-            }
-            /* @end */
-
-        }
-        /* @end */
-
-    }
-    /* @end */
-
-
-    /* @group Darwin */
-    &[aios-appOS="Darwin"] {
-
-        #commandBar {
-            padding: 8px 0 11px 2px;
-            background-color: #D4DDE5;
-
-            &:-moz-window-inactive {
-                background-color: #e8e8e8;
-            }
-        }
-
-        toolbarbutton {
-
-            &:-moz-window-inactive {
-                opacity: 0.5;
-            }
-
-            &.toolbarbutton-1 {
-                border-radius: 4px;
-                background: -moz-linear-gradient(top, #FFF, #ADADAD) repeat-x;
-
-                &:-moz-window-inactive {
-                    opacity: 0.8;
-                }
-
-                &[checked="true"] {
-                    padding-left: 4px;
-                    padding-right: 4px;
-                    box-shadow: inset #2A2A2A 0 3px 3.5px, 0 1px rgba(255, 255, 255, .4);
-
-                    .toolbarbutton-menubutton-button,
-                    .toolbarbutton-menubutton-dropmarker {
-                        -moz-appearance: none;
-                    }
-
-                }
-
-                .toolbarbutton-icon {
-                    margin-top: 2px;
-                    margin-bottom: 0;
-                }
-
-            }
-
-            &#toolsButton {
-                -moz-appearance: none;
-                padding: 1px 5px;
-                border: 1px solid #7F7F7F;
-                border-radius: 10px;
-                background: -moz-linear-gradient(top, #FFF, #ADADAD) repeat-x;
-
-                image {
-                    margin-right: 6px;
-                }
-
-                label {
-                    margin: 0;
-                }
-
-                .dropmarker-icon {
-                    margin: 2px 0 0 1px;
-                }
-            }
-        }
-
-    }
-    /* @end */
-
-}
-/* @end */
diff --git a/skin/less/multipanel_config.less b/skin/less/multipanel_config.less
deleted file mode 100755
index 84dabbb..0000000
--- a/skin/less/multipanel_config.less
+++ /dev/null
@@ -1,74 +0,0 @@
-
-/* @group Firefox-Standard-Theme */
-
-window[aios-appDefTheme="true"] {
-
-    border-top: 1px solid ThreedHighlight;
-
-    #filterRow {
-        -moz-appearance: toolbox;
-        margin: 0;
-        padding-right: 1px;
-        padding-bottom: 1px;
-    }
-
-    #configTree {
-        -moz-appearance: none;
-        margin: 0;
-        border: none;
-
-        treechildren {
-            margin-left: 5px;
-        }
-    }
-
-
-    /* @group Windows-XP klassisch */
-    &[aios-appOSVersion="Windows NT 5.1"] {
-
-        #filterRow {
-            border-bottom: 1px solid ThreedShadow;
-        }
-
-    }
-    /* @end */
-
-
-    /* @group Windows-Standard */
-    &:-moz-system-metric(windows-default-theme) {
-
-        /* @group Windows-XP-Standard */
-        &[aios-appOSVersion="Windows NT 5.1"] {
-
-            #filterRow {
-                -moz-appearance: none;
-                background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.5),
-                                  rgba(255, 255, 255, 0));
-            }
-
-        }
-        /* @end */
-
-    }
-    /* @end */
-
-
-    /* @group Darwin */
-    &[aios-appOS="Darwin"] {
-
-        #filterRow {
-            padding-bottom: 5px;
-            background-color: #D4DDE5;
-            background-image: none;
-
-            &:-moz-window-inactive {
-                background-color: #e8e8e8;
-            }
-        }
-
-    }
-    /* @end */
-
-}
-
-/* @end */
\ No newline at end of file
diff --git a/skin/less/multipanel_ssr.less b/skin/less/multipanel_ssr.less
deleted file mode 100755
index 9104e83..0000000
--- a/skin/less/multipanel_ssr.less
+++ /dev/null
@@ -1,131 +0,0 @@
-/* The feel-like-a-cellphone stylesheet
- *
- * Original Author: Daniel Glazman <glazman at netscape.com>
-*/
-
-html {
-    background-color: AppWorkspace !important;
-}
-
-body {
-    /* First, let's resize the body to Nokia's screen width */
-    width: 176px !important;
-    min-width: 0 !important;
-
-    /* and make it more visible/readable */
-    /* remove the 3 following lines for embedded version */
-    padding: 3px !important;
-    margin: auto !important;
-    border: 1px solid ThreedDarkShadow !important;
-    border-top: none !important;
-    background-color: #FFFFFF !important;
-}
-
-* {
-    /* on a small screen, we need to use a readable font */
-    font-size: 11px !important;
-    background-image: none !important;
-}
-
-/* for all elements but the root element and the body, let's */
-/* cancel all annoying document's settings */
-*:not(body):not(html):not(select):not(option):not(optgroup) {
-
-    /* first cancel all size settings */
-    width: auto !important;
-    min-width: 0 !important;
-    height: auto !important;
-
-    /* and make the width <= 176px */
-    max-width: 176px !important;
-
-    /* remove all positioning */
-    position: static !important;
-
-    /* remove all positioning offsets */
-    top: auto !important;
-    left: auto !important;
-
-    /* and cancel floats */
-    float: none !important;
-
-    /* margins and paddings have to be changed */
-    padding: 0 !important;
-    margin: 0 !important;
-
-    /* avoid overflow on pre and table cells */
-    white-space: normal !important;
-    overflow: hidden !important;
-}
-
-table,
-tbody,
-thead,
-tfoot,
-tr,
-td,
-th,
-col,
-colgroup {
-    /* we need to "flatten" all tables */
-    display: block !important;
-}
-
-img[width="1"],
-img[height="1"],
-img[width="468"],
-img[height="600"] {
-    /* let's get rid of 1 pixel wide/high images */
-    /* and of std formats of ads ; current ads formats are */
-    /* too big for small screens */
-    display: none !important;
-}
-
-li {
-    /* better placement of the bullet on a small screen */
-    list-style-position: inside !important;
-}
-
-iframe {
-    /* berk, fyyyy, eeeek, iframes are evil and used only for ads */
-    display : none !important;
-}
-
-embed[type*="shockwave"] {
-    /* shockwave on a cellphone ? */
-    display : none !important;
-}
-
-html :-moz-any-link {
-    /* we need to make anchors more visible */
-    text-decoration: underline !important;
-}
-
-/* for CSS-based menus */
-ul,
-ol {
-    display: block !important;
-}
-
-li {
-    display: list-item !important;
-}
-
-a {
-    background-image: none !important;
-}
-
-img[src*="spacer"] {
-    display: none !important;
-}
-
-
-body[aiosSidebar=true] {
-    width: 100% !important;
-    padding: 0 !important;
-    border: none !important;
-}
-
-body[aiosSidebar=true] *:not(body):not(html):not(select):not(option):not(optgroup) {
-    max-width: 100% !important;
-}
\ No newline at end of file
diff --git a/skin/less/pageinfo.less b/skin/less/pageinfo.less
deleted file mode 100755
index 58bf37a..0000000
--- a/skin/less/pageinfo.less
+++ /dev/null
@@ -1,288 +0,0 @@
-
-#mainDeck,
-#topBar,
-#viewGroup {
-    margin: 0;
-    padding: 0;
-}
-
-#viewGroup {
-    padding: 0 0 1px 1px;
-
-    &[hideLabel=true] {
-
-        radio {
-            min-width: 0;
-            margin: 0 2px 0 0;
-            padding: 2px;
-
-            label {
-                display: none;
-            }
-        }
-
-    }
-}
-
-#generalPanel #titletext {
-    padding: 5px;
-}
-
-#permPanel {
-
-    > hbox {
-        padding-top: 5px;
-    }
-
-    #permList {
-        border: none;
-
-        > vbox {
-            padding-left: 0;
-            padding-right: 0;
-
-            hbox {
-                -moz-box-orient: vertical;
-            }
-        }
-    }
-}
-
-#security-privacy-groupbox row {
-    margin-top: 10px;
-    padding-top: 10px;
-
-    :first-child {
-        margin-top: 0;
-        padding-top: 0;
-    }
-}
-
-
-/* @group Firefox-Standard-Theme */
-
-window[aios-appDefTheme="true"] {
-
-    #permList,
-    #security-privacy-groupbox row {
-        border-top: 1px solid ThreedShadow;
-    }
-
-    #security-privacy-groupbox row:first-child {
-        border-top: none;
-    }
-
-
-    /* @group Windows */
-    &[aios-appOS="WINNT"] {
-
-        #topBar {
-            padding-top: 1px;
-        }
-
-
-        /* @group Windows-XP klassisch */
-        &[aios-appOSVersion="Windows NT 5.1"] {
-
-            deck,
-            #feedListbox *,
-            #permList {
-                background-color: #efedea;
-
-                groupbox,
-                groupbox caption {
-                    -moz-appearance: none;
-                    background-color: #efedea;
-                }
-            }
-
-        }
-        /* @end */
-
-
-        /* @group Windows-Standard */
-        &:-moz-system-metric(windows-default-theme) {
-
-            #permList {
-                border-top: 1px solid Threedshadow;
-            }
-
-            #topBar {
-                border-bottom: 1px solid Threedshadow;
-            }
-
-            #mainDeck {
-                border-top: 1px solid ThreedHighlight;
-            }
-
-
-            /* @group Windows XP-Standard */
-            &[aios-appOSVersion="Windows NT 5.1"] {
-
-                deck,
-                #feedListbox *,
-                #permList {
-                    background-color: #EDECEF;
-                }
-
-            }
-            /* @end */
-
-
-            /* @group Windows Vista-7-Standard */
-            &:not([aios-appOSVersion="Windows NT 5.1"]) {
-
-                deck,
-                #feedListbox *,
-                #permList {
-                    background-color: #EEF3FA;
-                }
-
-            }
-            /* @end */
-
-        }
-        /* @end */
-
-    }
-    /* @end */
-
-
-    /* @group Darwin */
-    &[aios-appOS="Darwin"] {
-
-        -moz-appearance: none;
-        border-top: 1px solid #484848;
-
-        &:-moz-window-inactive {
-            -moz-appearance: none;
-            border-top: 1px solid #929292;
-        }
-
-        deck,
-        #feedListbox *,
-        #permList {
-            background-color: #D4DDE5;
-
-            &:-moz-window-inactive {
-                background-color: #E8E8E8;
-            }
-        }
-
-        deck {
-            padding-top: 5px;
-        }
-
-        #topBar {
-            -moz-appearance: none;
-            border-left: 1px solid #c0c0c0;
-            border-top: 1px solid #c0c0c0;
-            border-bottom: 1px solid #484848;
-            background-color: -moz-mac-chrome-active;
-
-            &:-moz-window-inactive {
-                border-left: 1px solid #e1e1e1;
-                border-top: 1px solid #e1e1e1;
-                border-bottom: 1px solid #929292;
-                background-color: -moz-mac-chrome-inactive;
-            }
-        }
-
-        #viewGroup {
-            margin: 1px 0 2px 0;
-            padding: 0;
-            background-color: -moz-mac-chrome-active;
-            border-top: 1px solid #484848;
-            border-right: 1px solid #484848;
-            border-bottom: 1px solid #484848;
-
-            &:-moz-window-inactive {
-                background-color: -moz-mac-chrome-inactive;
-                border-top: 1px solid #929292;
-                border-right: 1px solid #929292;
-                border-bottom: 1px solid #929292;
-            }
-        }
-
-        #viewGroup radio {
-            -moz-appearance: none;
-            display: -moz-box;
-            margin: 0;
-            padding: 5px;
-            list-style-image: url("../icons/topbar_darwin.png");
-
-            border-left: 1px solid #484848;
-            background: -moz-linear-gradient(top, #FFF, #ADADAD) repeat-x;
-
-            &:-moz-window-inactive {
-                border-left: 1px solid #929292;
-                background: -moz-linear-gradient(top, #FFF, #ADADAD) repeat-x;
-            }
-
-            &#generalTab {
-                -moz-image-region: rect(24px, 24px, 48px, 0)
-            }
-
-            &#mediaTab {
-                -moz-image-region: rect(24px, 48px, 48px, 24px)
-            }
-
-            &#feedTab {
-                -moz-image-region: rect(24px, 72px, 48px, 48px)
-            }
-
-            &#permTab {
-                -moz-image-region: rect(24px, 96px, 48px, 72px)
-            }
-
-            &#securityTab {
-                -moz-image-region: rect(24px, 120px, 48px, 96px)
-            }
-
-            &[selected="true"] {
-                background: #606060;
-                box-shadow: inset rgba(42, 42, 42, 1) 0 3px 3px;
-
-                &:-moz-window-inactive {
-                    background: #bababa;
-                    box-shadow: inset rgba(42, 42, 42, 0.6) 0 2px 2px;
-                }
-            }
-
-            image {
-                display: -moz-box;
-                opacity: 0.5;
-
-                &:-moz-window-inactive {
-                    opacity: 0.3;
-                }
-            }
-
-            &:hover image,
-            &[selected="true"] image {
-                opacity: 1;
-
-                &:-moz-window-inactive {
-                    opacity: 0.8;
-                }
-            }
-
-        }
-
-    }
-    /* @end */
-
-
-    /* @group Linux */
-    &:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) {
-
-        #topBar {
-            padding-top: 1px;
-        }
-
-    }
-    /* @end */
-
-}
-
-/* @end */
diff --git a/skin/less/places.less b/skin/less/places.less
deleted file mode 100755
index bdbba4e..0000000
--- a/skin/less/places.less
+++ /dev/null
@@ -1,197 +0,0 @@
-
-page[aios-inSidebar] {
-
-    /* tree#bookmarks-view f. einige themes, z.B. NASA Night Launch */
-    #bookmarksPanel,
-    #bookmarks-view,
-    tree#bookmarks-view,
-    #history-panel,
-    #historyTree {
-        margin: 0;
-        padding: 0;
-        border: none;
-    }
-
-    tree {
-        -moz-appearance: none;
-    }
-
-    label[control="search-box"] {
-        display: none;
-    }
-
-
-    /* @group Icons */
-    #closeFolder,
-    #viewButton {
-        list-style-image: url(../icons/panels_menus.png);
-    }
-
-    #closeFolder {
-        -moz-image-region: rect(64px, 32px, 80px, 16px);
-
-        image {
-            margin-right: 2px;
-        }
-
-        label {
-            display: none;
-        }
-    }
-
-    #viewButton {
-        -moz-image-region: rect(64px, 16px, 80px, 0);
-    }
-
-    &[aios-appOS="WINNT"] {
-
-        #closeFolder {
-            -moz-image-region: rect(0, 32px, 16px, 16px);
-        }
-
-        #viewButton {
-            -moz-image-region: rect(0, 16px, 16px, 0);
-        }
-
-    }
-
-    &[aios-appOS="Darwin"] {
-
-        #closeFolder {
-            -moz-image-region: rect(32px, 32px, 48px, 16px);
-        }
-
-        #viewButton {
-            -moz-image-region: rect(32px, 16px, 48px, 0);
-        }
-
-    }
-    /* @end */
-
-
-    /* @group Firefox-Standard-Theme */
-    &[aios-appDefTheme="true"] {
-
-        #places-toolbar > * {
-            margin: 1px;
-        }
-
-        #search-box.blur {
-            color: #ACA899;
-        }
-
-
-        /* @group Windows */
-        &[aios-appOS="WINNT"] {
-
-            #places-toolbar {
-                padding: 0 1px 1px 1px;
-                border-top: 1px solid ThreedHighlight;
-                border-bottom: 1px solid ThreedShadow;
-            }
-
-            #viewButton dropmarker image {
-                margin: 0 2px 0 3px;
-            }
-
-
-            /* @group Windows-XP klassisch */
-            &[aios-appOSVersion="Windows NT 5.1"] {
-
-                #bookmarks-view,
-                #historyTree {
-                    background-color: #efedea;
-                }
-
-            }
-            /* @end */
-
-
-             /* @group Windows-Standard */
-            &:-moz-system-metric(windows-default-theme) {
-
-                /* @group Windows XP-Standard */
-                &[aios-appOSVersion="Windows NT 5.1"] {
-
-                    -moz-appearance: none !important;
-
-                    #bookmarks-view,
-                    #historyTree {
-                        background-color: #EDECEF;
-                    }
-
-                    #places-toolbar {
-                        -moz-appearance: none;
-                        border-bottom: 1px solid Threedshadow;
-                        background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.5),
-                                          rgba(255, 255, 255, 0));
-                    }
-
-                }
-                /* @end */
-
-
-                /* @group Windows Vista-7-Standard */
-                &:not([aios-appOSVersion="Windows NT 5.1"]) {
-
-                    #bookmarks-view,
-                    #historyTree {
-                       background-color: #EEF3FA;
-                    }
-
-                    #places-toolbar {
-                        background: #eef3fa;
-                    }
-
-                }
-                /* @end */
-
-            }
-            /* @end */
-
-        }
-        /* @end */
-
-
-        /* @group Darwin */
-        &[aios-appOS="Darwin"] {
-
-            #places-toolbar {
-                padding: 7px 1px 5px 3px;
-
-                toolbarbutton {
-
-                    &:-moz-window-inactive {
-                        opacity: 0.5;
-                    }
-
-                }
-            }
-
-            #search-box {
-                margin-top: -1px;
-            }
-
-            #closeFolder {
-                margin-left: 4px;
-            }
-
-            #viewButton {
-                margin-left: 6px;
-
-                label {
-                    margin-right: 1px;
-                }
-
-                dropmarker image {
-                    margin: 3px 5px 0 0;
-                }
-            }
-
-        }
-        /* @end */
-
-    }
-    /* @end */
-
-}
\ No newline at end of file
diff --git a/skin/less/prefs.less b/skin/less/prefs.less
deleted file mode 100755
index 2466d2d..0000000
--- a/skin/less/prefs.less
+++ /dev/null
@@ -1,376 +0,0 @@
-
-/* @group GUI, Buttons */
-
-radio {
-
-    &[pane=aiosGeneral],
-    &[pane=aiosPanels],
-    &[pane=aiosMenus],
-    &[pane=aiosKeys],
-    &[pane=aiosAbout] {
-        list-style-image: url(../icons/prefs.png);
-    }
-
-    &[pane=aiosGeneral] {
-        -moz-image-region: rect(0, 32px, 32px, 0);
-    }
-
-    &[pane=aiosPanels] {
-        -moz-image-region: rect(0, 64px, 32px, 32px);
-    }
-
-    &[pane=aiosMenus] {
-        -moz-image-region: rect(0, 96px, 32px, 64px);
-    }
-
-    &[pane=aiosKeys] {
-        -moz-image-region: rect(0, 128px, 32px, 96px);
-    }
-
-    &[pane=aiosAbout] {
-        -moz-image-region: rect(0, 160px, 32px, 128px);
-    }
-
-}
-
-#obj-minWidthVal,
-#obj-defWidthVal,
-#obj-maxWidthVal {
-    width: 45px;
-}
-
-#obj-minWidthUnit,
-#obj-defWidthUnit,
-#obj-maxWidthUnit {
-    min-width: 80px;
-}
-
-.arrow-lft {
-    list-style-image: url(../img/arrow.gif);
-
-    image {
-        -moz-transform: rotate(90deg);
-        margin-left: 2px;
-    }
-
-    label {
-        padding-bottom: 2px;
-    }
-}
-
-#aios-settings-button image {
-    list-style-image: url(../img/arrow.gif);
-    -moz-transform: rotate(180deg);
-    margin-left: 5px;
-}
-
-/* @end */
-
-
-
-
-/* @group Shortcut Pane */
-
-treechildren {
-
-    &::-moz-tree-row(odd) {
-        background-color: ButtonFace;
-        border-top: 1px solid ButtonFace;
-        border-bottom: 1px solid ButtonFace;
-    }
-
-    &::-moz-tree-row(selected),
-    &::-moz-tree-row(odd, selected)  {
-        background-color: Highlight;
-    }
-
-    /* Style different keys differently */
-    &::-moz-tree-cell-text(hardcoded) {
-        color: GrayText;
-    }
-
-    &::-moz-tree-cell-text(disabled) {
-        text-decoration: line-through;
-    }
-
-    &::-moz-tree-cell-text(user) {
-        font-weight: bold;
-    }
-
-    &::-moz-tree-cell-text(duplicate) {
-        color: #FF0000;
-        font-weight: bold;
-    }
-
-    &::-moz-tree-cell-text(custom) {
-        font-style: italic;
-    }
-}
-
-/* @end */
-
-
-
-
-/* @group Styles */
-
-.indent {
-    margin-left: 1.8em;
-}
-
-.spacer {
-    margin-top: 10px;
-}
-
-.link {
-    color: #0000FF;
-    cursor: pointer;
-
-    &:hover {
-        text-decoration: underline;
-    }
-}
-
-#aiosKeys .link {
-    margin: 1px 0;
-
-    &:hover {
-        margin: 1px 0 0 0;
-        border-bottom: 1px solid #0000FF;
-        text-decoration: none;
-    }
-}
-
-.bold {
-    font-weight: bold;
-}
-
-/* @end */
-
-
-
-
-/* @group Tooltips */
-
-.labelTipElem {
-    -moz-box-orient: vertical;
-
-    box {
-        width: 260px;
-        max-width: 260px;
-        height: 31px;
-        margin-top: 10px;
-        background: url(../img/sidebarheader.gif) no-repeat;
-    }
-}
-
-.labelTip,
-.labelTip > label {
-    cursor: help;
-}
-
-.labelTip > label {
-    border-bottom: 1px dotted;
-}
-
-
-prefwindow {
-
-    &:-moz-system-metric(windows-default-theme) {
-
-        .labelTipElem box {
-            height: 27px;
-            background-position: 0 -31px;
-        }
-
-
-        &[aios-appOSVersion="Windows NT 5.1"] {
-
-            .labelTipElem box {
-                height: 27px;
-                background-position: 0 -59px;
-            }
-
-        }
-
-    }
-
-
-    &[aios-appOS="Darwin"] {
-
-        .labelTipElem box {
-            height: 28px;
-            background-position: -260px 0;
-        }
-
-    }
-
-
-    &:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) {
-
-        .labelTipElem box {
-            height: 30px;
-            background-position: -520px 0;
-        }
-
-    }
-
-}
-
-toolbarbutton.info {
-    -moz-appearance: none;
-    margin: 0;
-    padding: 0;
-    border: none;
-    list-style-image: url(../img/info.png);
-
-    label {
-        display: none;
-    }
-}
-
-/* @end */
-
-
-
-
-/* @group Advanced Mode */
-
-
-.aiosAdvanced label,
-*[aiosAdvanced="true"] caption label,
-*[aiosAdvanced="true"] > label,
-checkbox[aiosAdvanced="true"] label,
-vbox[aiosAdvanced="true"] > checkbox label,
-vbox[aiosAdvanced="true"] radio label,
-vbox[aiosAdvanced="true"] > hbox > checkbox label {
-    color: #FF0000;
-}
-
-/* @end */
-
-
-
-
-/* @group Button in den Allg. Firefox-Optionen */
-
-#aiosDownloadsBox {
-    margin-bottom: 10px;
-}
-
-/* @end */
-
-
-
-
-/* @group About */
-
-#aiosPreferences #aiosAbout {
-
-    #aboutHeader,
-    #aboutHeaderMac {
-        display: none;
-    }
-
-}
-
-#aiosAbout:not([aios-appOS="Darwin"]) {
-
-    #aboutHeaderMac {
-        display: none;
-    }
-
-}
-
-#aiosAbout[aios-appOS="Darwin"] {
-
-    #aboutHeader {
-        display: none;
-    }
-
-    tabpanel {
-        padding-top: 30px;
-    }
-
-    description {
-        font-size: 13px;
-    }
-
-}
-
-#aiosAbout {
-
-    #aboutHeader {
-        margin: 0 0 10px 0;
-    }
-
-     #aboutHeaderMac {
-        margin: 10px 0 15px 0;
-
-        #macTitle {
-            -moz-box-flex: 1;
-            font-size: 150%;
-            font-weight: bold;
-        }
-
-        #macVersion {
-            margin-top: 6px;
-        }
-    }
-
-    tabbox {
-        margin-bottom: 10px;
-    }
-
-    tabpanels {
-        margin: 0;
-        padding: 0;
-
-        tabpanel {
-            padding: 13px;
-
-             description {
-                margin: 0;
-                line-height: 1.3em;
-            }
-
-            menuseparator {
-                margin: 10px 0;
-            }
-        }
-
-    }
-
-    vbox.websites toolbarbutton {
-        -moz-appearance: none;
-        margin: 2px 0;
-        border: none;
-        cursor: pointer;
-        list-style-image: url(../img/info.png);
-
-        label {
-            text-align: left;
-            color: #0000FF;
-            text-decoration: none;
-        }
-
-        &:hover label {
-            text-decoration: underline;
-        }
-    }
-
-    #paypal {
-        cursor: pointer;
-
-        image {
-            margin-left: 10px;
-        }
-    }
-
-    separator.groove {
-        margin: 10px 0 !important;
-    }
-
-}
-
-/* @end */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/all-in-one-sidebar.git



More information about the Pkg-mozext-commits mailing list