[Pkg-mozext-commits] [SCM] A sidebar extension for Iceweasel/Firefox branch, upstream, updated. upstream/0.7.13-1-g68c5252

Andrea Veri av at src.gnome.org
Tue Apr 24 22:11:15 UTC 2012


The following commit has been merged in the upstream branch:
commit 68c52521d4d8e9e5aae856d9b33972487e5902eb
Author: Andrea Veri <av at src.gnome.org>
Date:   Wed Apr 25 00:11:58 2012 +0200

    Imported Upstream Version 0.7.15

diff --git a/chrome.manifest b/chrome.manifest
index 6b3e0ee..210bf02 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -13,7 +13,7 @@ locale          aios            en-GB           locale/en-GB/
 locale          aios            es-AR           locale/es-AR/
 locale          aios            es-ES           locale/es-ES/
 locale          aios            et-EE           locale/et-EE/
-locale          aios            fi-FI           locale/fi-FI/
+locale          aios            fi              locale/fi/
 locale          aios            fr              locale/fr/
 locale          aios            he              locale/he/
 locale          aios            hr-HR           locale/hr-HR/
@@ -29,29 +29,28 @@ locale          aios            pl              locale/pl/
 locale          aios            pt-BR           locale/pt-BR/
 locale          aios            pt-PT           locale/pt-PT/
 locale          aios            ro              locale/ro/
-locale          aios            ru-RU           locale/ru-RU/
+locale          aios            ru              locale/ru/
 locale          aios            sk-SK           locale/sk-SK/
 locale          aios            sq-AL           locale/sq-AL/
 locale          aios            sr              locale/sr/
 locale          aios            sv-SE           locale/sv-SE/
-locale          aios            tr-TR           locale/tr-TR/
-locale          aios            uk-UA           locale/uk-UA/
+locale          aios            tr              locale/tr/
+locale          aios            uk              locale/uk/
 locale          aios            vi              locale/vi/
 locale          aios            zh-CN           locale/zh-CN/
 locale          aios            zh-TW           locale/zh-TW/
 
 overlay         chrome://browser/content/browser.xul                            chrome://aios/content/aios.xul
 
-overlay         chrome://global/content/customizeToolbar.xul                    chrome://aios/content/aios_customize.xul        appversion<3.7
-overlay         chrome://global/content/customizeToolbar.xul                    chrome://aios/content/aios_customize_fx4.xul    appversion>=3.7
+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/bm_hi.xul                 appversion<3.7
-overlay         chrome://browser/content/history/history-panel.xul              chrome://aios/content/bm_hi.xul                 appversion<3.7
-overlay         chrome://browser/content/bookmarks/bookmarksPanel.xul           chrome://aios/content/bm_hi_fx4.xul             appversion>=3.7
-overlay         chrome://browser/content/history/history-panel.xul              chrome://aios/content/bm_hi_fx4.xul             appversion>=3.7
+overlay         chrome://browser/content/bookmarks/bookmarksPanel.xul           chrome://aios/content/bm_hi.xul
+overlay         chrome://browser/content/history/history-panel.xul              chrome://aios/content/bm_hi.xul
 
-overlay         chrome://mozapps/content/extensions/extensions.xul              chrome://aios/content/addons.xul                appversion<3.7
-overlay         about:addons                                                    chrome://aios/content/addons_fx4.xul            appversion>=3.7
+overlay         about:addons                                                    chrome://aios/content/addons.xul
 overlay         chrome://mozapps/content/xpinstall/xpinstallConfirm.xul         chrome://aios/content/addons_xpinstall.xul
 
 overlay         chrome://mozapps/content/downloads/downloads.xul                chrome://aios/content/downloads.xul
@@ -60,7 +59,6 @@ overlay         chrome://global/content/alerts/alert.xul
 overlay         chrome://browser/content/web-panels.xul                         chrome://aios/content/multipanel.xul
 overlay         chrome://global/content/config.xul                              chrome://aios/content/aboutconfig.xul
 
-overlay         chrome://global/content/viewSource.xul                          chrome://aios/content/viewsource.xul
 overlay         chrome://browser/content/pageinfo/pageInfo.xul                  chrome://aios/content/pageinfo.xul
 
 overlay         chrome://global/content/console.xul                             chrome://aios/content/console.xul
diff --git a/content/_common.js b/content/_common.js
index d96e559..fac6da4 100644
--- a/content/_common.js
+++ b/content/_common.js
@@ -21,7 +21,7 @@ var aios_appID = aios_XULAppInfo.ID;
 // Mozilla, Flock
 var aios_appVendor = aios_XULAppInfo.vendor;
 
-// z.B. 4.0b4
+// z.B. 11.0
 var aios_appVersion = aios_XULAppInfo.version;
 
 // WINNT, Darwin
@@ -35,11 +35,11 @@ var aios_appDefTheme = (aios_gPrefBranchN.getCharPref('general.skins.selectedSki
 
 
 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);
+    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);
 }
 
 
@@ -175,7 +175,7 @@ function aios_addTab(aUrl) {
     => Aufruf u.a. durch aios_init() und aios_sidebarLayout() bei den Add-ons, Downloads
 */
 function aios_addCSS(aURI, aBefore) {
-    var path = "chrome://aios/skin/";
+    var path = "chrome://aios/skin/css/";
 
     var elem = (typeof aBefore == "object") ? aBefore : document.getElementById(aBefore);
 	
@@ -410,7 +410,7 @@ function aios_toggleChilds(childElems, childMode) {
 /**
  *  Tastaturkürzel entfernen, um nicht die des Hauptbrowsers zu blockieren
  *
- *      => Aufruf in addons_downloads.js, pageinfo.js, console.js
+ *      => Aufruf in downloads.js, pageinfo.js, console.js
  **/
 function aios_removeAccesskeys() {
     var keys = document.getElementsByAttribute('accesskey', '*');
diff --git a/content/_compatibility.js b/content/_compatibility.js
index 66652a3..4c17fc8 100644
--- a/content/_compatibility.js
+++ b/content/_compatibility.js
@@ -4,14 +4,10 @@
  *      => Aufruf durch aios_initSidebar() in aios.js
  **/
 function aios_improveCompatibility() {   
-    // Optimoz-Tweaks
-    if(document.getElementById('moztweaksBundle')) {
-        aios_optimozTweaksMode(true);
-        window.setTimeout("aios_optimozTweaksMode(true)", 300);
-    }
-	
     // Console2
     if(document.getElementById('viewConsole2Sidebar')) {
+        //var timer = Components.classes["@mozilla.org/timer;1"].createInstance(Components.interfaces.nsITimer);
+        //timer.init(aios_modConsole2, 300, Components.interfaces.nsITimer.TYPE_ONE_SHOT);
         window.setTimeout("aios_modConsole2()", 300);
     }
 	
@@ -27,11 +23,6 @@ function aios_improveCompatibility() {
     if(document.getElementById('su_splitter_first')) {
         document.getElementById('su_splitter_first').style.display = "none";
     }
-    
-    // Autohide
-    if(typeof autoHIDE == "object") {
-        aios_Autohide();
-    }
 }
 
 
@@ -80,62 +71,4 @@ function aios_modConsole2() {
     }
 	
     return true;
-}
-
-
-/**
- *  Optimoz-Tweaks-Anapssungen
- *      => Aufruf durch aios_improveCompatibility()
- **/
-function aios_optimozTweaksMode(mode) {
-	
-    aios_getObjects();
-
-    // 	=> bei jedem MouseOver nötig, weil sich die Einstellungen von OptiMoz geändert haben könnten
-    if(mode == true) {
-        aios_toggleBox.addEventListener("mouseover", aios_optimozTweaksMode, false);
-        aiostbx_left_toolbox.addEventListener("mouseover", aios_optimozTweaksMode, false);
-    }
-    else {
-        try {
-            var hidemethod = aios_gPref.getIntPref('moztweaks.sidebar.hidemethod');
-        }
-        catch(e) { }
-
-        // 	=> Event-Listener entfernen und hinzufügen
-        if(hidemethod == 0) {
-            aios_toggleBox.removeEventListener("mousemove", mtSidebarMouseMoveListener, false);
-            aios_toggleBox.addEventListener("mousemove", mtMouseMoveListener, false);
-            aios_toggleBox.addEventListener("mousemove", mtPreventHiding, true);
-
-            aiostbx_left_toolbox.removeEventListener("mousemove", mtSidebarMouseMoveListener, false);
-            aiostbx_left_toolbox.addEventListener("mousemove", mtMouseMoveListener, false);
-            aiostbx_left_toolbox.addEventListener("mousemove", mtPreventHiding, true);
-        }
-        else if(hidemethod == 1) {
-            aios_toggleBox.removeEventListener("mousemove", mtMouseMoveListener, false);
-            aios_toggleBox.removeEventListener("mousemove", mtPreventHiding, false);
-            aios_toggleBox.addEventListener("mousemove", mtSidebarMouseMoveListener, false);
-
-            aiostbx_left_toolbox.removeEventListener("mousemove", mtMouseMoveListener, false);
-            aiostbx_left_toolbox.removeEventListener("mousemove", mtPreventHiding, false);
-            aiostbx_left_toolbox.addEventListener("mousemove", mtSidebarMouseMoveListener, false);
-        }
-    }
-
-    return true;
-}
-
-
-/**
- *  Autohide-Anapssungen
- *      => Aufruf durch aios_improveCompatibility()
- *      => wenn das Attribut 'fullscreentoolbar' immer verwendet würde, würde ohne Autohide der Switch und die Toolbar immer ausgeblendet
- **/
-function aios_Autohide() {
-	
-    aios_getObjects();
-	
-    aios_toggleBar.setAttribute('fullscreentoolbar', 'true');
-    aios_toolbar.setAttribute('fullscreentoolbar', 'true');
 }
\ No newline at end of file
diff --git a/content/_lib.js b/content/_lib.js
index b8458e8..1ec4738 100644
--- a/content/_lib.js
+++ b/content/_lib.js
@@ -60,11 +60,11 @@ function aios_modSidebarMenu() {
         if(command && commandParent) {
 
             // Event nicht vererben, da er sonst an den Toolbarbutton weitergereicht würde (zwei toggle-Befehle)
-            if(command.indexOf('event.stopPropagation();') < 0) {
+            /*if(command.indexOf('event.stopPropagation();') < 0) {
                 command = command.replace(/ /, "");
                 if(command.substring(command.length-1, command.length) != ";") command = command + ";";
                 commandParent.setAttribute('oncommand', command + " event.stopPropagation();");
-            }
+            }*/
 
             // den Menüpunkt der aktuellen Sidebar aktivieren/deaktivieren
             try {
@@ -298,7 +298,7 @@ function aios_panelTab(event) {
         }
         // in FENSTER öffnen
         else {
-            // wird zur Abfrage in addons/downlaods_....xul und addons_downloads.js benoetigt
+            // wird zur Abfrage in addons/downlaods_....xul und downloads.js benoetigt
             // sonst würden extra geöffnete Fenster (Downloads, Add-ons) sofort wieder geschlossen
             aios_WIN.aiosIsWindow = true;
             window.setTimeout("aios_WIN.aiosIsWindow=false;", 500);
@@ -388,7 +388,7 @@ function aios_contextEvent(event, which) {
             toggleSidebar(cmdObj.getAttribute('aios_sbCmd'));
             break;
 
-        case "window":		// wird zur Abfrage in addons/downloads_....xul und addons_downloads.js benoetigt
+        case "window":		// wird zur Abfrage in addons/downloads_....xul und downloads.js benoetigt
             // sonst würden extra geöffnete Fenster (Downloads, Add-ons) sofort wieder geschlossen
             aios_WIN.aiosIsWindow = true;
             window.setTimeout("aios_WIN.aiosIsWindow=false;", 500);
@@ -496,7 +496,7 @@ function aios_setTargets() {
                 ffObj.setAttribute('aios_sbCmd', targets[obj][1]);
                 ffObj.setAttribute('aios_inSidebar', prefSidebar);
 
-                // für Klicks auf Menüeinträge in den Sidebarmenüs
+                // für Klicks auf Menüeinträge in den Sidebarmenüs => siehe aios_preventDblCmd()
                 sbObj.setAttribute('aios_sbUri', sbObj.getAttribute('sidebarurl'));
                 sbObj.setAttribute('oncommand', "if(aios_preventDblCmd(event)) " + sbObj.getAttribute('oncommand'));
             }
@@ -560,7 +560,11 @@ function aios_setTargets() {
         }
     }
 	
-	
+    
+    // Öffnen des Download-Fensters verhindern, wenn die Sidebar genutzt werden soll
+	if(aios_gPrefBranch.getBoolPref('dm.sidebar')) aios_gPref.setBoolPref("browser.download.manager.showWhenStarting", false);
+    
+    
     // Download-Observer hinzufügen, falls Downloads in der Sidebar geöffnet werden sollen
     var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
 	
@@ -575,8 +579,10 @@ function aios_setTargets() {
             aios_myOs.removeObserver(aios_DownloadObserver, "dl-done");
             aios_DownloadObserver = null;
         }
+        
     }, false);
-	
+    
+    
 	
     return true;
 }
@@ -593,7 +599,7 @@ var aios_DownloadObserver = {
         var autoOpen = aios_gPrefBranch.getBoolPref('dm.autoopen');
         var autoClose = aios_gPrefBranch.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');
diff --git a/content/about.xul b/content/about.xul
index 2adf9d3..ccdee8e 100644
--- a/content/about.xul
+++ b/content/about.xul
@@ -2,368 +2,26 @@
 
 <!-- skin -->
 <?xml-stylesheet href="chrome://browser/skin/"?>
-<?xml-stylesheet href="chrome://mozapps/skin/pref/pref.css" type="text/css"?>
-<?xml-stylesheet href="chrome://aios/skin/prefs.css"?>
+<?xml-stylesheet href="chrome://aios/skin/css/prefs.css"?>
 
 <!-- locale -->
 <!DOCTYPE overlay [
-	<!ENTITY % aiosDTD SYSTEM "chrome://aios/content/aios.dtd"> %aiosDTD;
-	<!ENTITY % aboutDTD SYSTEM "chrome://aios/locale/about.dtd"> %aboutDTD;
+        <!ENTITY % aboutDTD SYSTEM "chrome://aios/locale/about.dtd"> %aboutDTD;
 ]>
 
-<window class="dialog" id="aiosAbout" title="" autostretch="always" orient="vertical"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        persist="screenX screenY seltab" onload="aios_initAbout();">
+<prefwindow id="aiosAboutWindow" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    title = "&title;"
+    persist = "screenX screenY"
+    style = "min-width: 45em; max-width: 780px;"
 
-    <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
-
-    <script><![CDATA[
-
-		function aios_initAbout() {
-			// persist selected tab - workaround bug 256024, part 1
-			var dialog = document.getElementById('aiosAbout');
-			var selTab = dialog.getAttribute("seltab");
-			if(!selTab) selTab = 0;
-
-			if(window.arguments) document.getElementsByTagName('tabbox')[0].selectedIndex = window.arguments[0];
-			else document.getElementsByTagName('tabbox')[0].selectedIndex = selTab;
-
-			document.getElementById('aiosAbout').setAttribute('aios_appOS', aios_WIN.aios_appOS);
-		}
-
-		function aios_closeAbout() {
-			try {
-				if(document.getElementsByTagName('tabbox')[0]) {
-					var dialog = document.getElementById('aiosAbout');
-					dialog.setAttribute("seltab", document.getElementsByTagName('tabbox')[0].selectedIndex);
-				}
-			}
-			catch(e) { }
-
-			window.close();
-		}
-
-	]]>
-    </script>
-
-    <dialogheader id="header" title="&title;" description="&version; &aios.versionNo;" />
-
-    <hbox id="headerMac">
-        <label id="title" value="&title;" />
-        <label id="version" value="&version; &aios.versionNo;" />
-    </hbox>
-
-    <tabbox flex="1">
-
-        <tabs>
-            <tab label="&tab.about;" />
-            <tab label="&tab.contrib;" />
-            <tab label="&tab.trans;" />
-        </tabs>
-
-        <tabpanels flex="1">
-
-<!-- ABOUT -->
-            <tabpanel orient="vertical" class="about">
-
-                <description width="100%">&about.desc;</description>
-
-                <menuseparator />
-
-                <vbox class="indent websites">
-                    <toolbarbutton label="&about1.name;" onclick="aios_addTab('&about1.link;');" />
-                    <toolbarbutton label="&about2.name;" onclick="aios_addTab('&about2.link;');" />
-                    <toolbarbutton label="&about3.name;" onclick="aios_addTab('&about3.link;');" />
-                    <toolbarbutton label="&about4.name;" onclick="aios_addTab('&about4.link;');" />
-                    <toolbarbutton label="&about6.name;" onclick="aios_addTab('&about6.link;');" />
-                    <toolbarbutton label="&about7.name;" onclick="aios_addTab('&about7.link;');" />
-                    <toolbarbutton label="&about5.name;" onclick="aios_addTab('&about5.link;');" />
-                </vbox>
+    buttons = "extra1,extra2"
+    buttonlabelextra1 = "&close;"
+    buttonlabelextra2 = "&settings;"
+    ondialogextra1 = "window.close();"
+    ondialogextra2 = "aios_openDialog('prefs');" >
 
-                <menuseparator />
-
-                <hbox id="paypal" align="center" onclick="aios_addTab('http://firefox.exxile.net/paypal.php');">
-                    <description value="&create.desc;" />
-                    <spacer flex="1" />
-                    <image src="chrome://aios/skin/images/paypal.gif" />
-                </hbox>
-            </tabpanel>
-
-<!-- CONTRIBUTORS -->
-            <tabpanel orient="vertical" class="about">
-
-                <description width="100%">&contrib.desc;</description>
-
-                <menuseparator />
-                <grid flex="1">
-                    <columns>
-                        <column flex="1" />
-                        <column flex="1" />
-                    </columns>
-
-                    <rows>
-                        <row>
-                            <text value="&contrib1.name;" />
-                            <text value="&contrib1.ext;" class="link" onclick="aios_addTab('&contrib1.link;');" />
-                        </row>
-                        <row>
-                            <text value="&contrib2.name;" />
-                            <text value="&contrib2.ext;" class="link" onclick="aios_addTab('&contrib2.link;');" />
-                        </row>
-                        <row>
-                            <text value="&contrib3.name;" />
-                            <text value="&contrib3.ext;" class="link" onclick="aios_addTab('&contrib3.link;');" />
-                        </row>
-                        <row>
-                            <text value="&contrib4.name;" />
-                            <text value="&contrib4.ext;" class="link" onclick="aios_addTab('&contrib4.link;');" />
-                        </row>
-                        <row>
-                            <text value="&contrib5.name;" />
-                            <text value="&contrib5.ext;" class="link" onclick="aios_addTab('&contrib5.link;');" />
-                        </row>
-                        <row>
-                            <text value="&contrib6.name;" />
-                            <text value="&contrib6.ext;" class="link" onclick="aios_addTab('&contrib6.link;');" />
-                        </row>
-                        <row>
-                            <text value="&contrib7.name;" />
-                            <text value="&contrib7.ext;" class="link" onclick="aios_addTab('&contrib7.link;');" />
-                        </row>
-                        <row>
-                            <text value="&contrib8.name;" />
-                            <text value="&contrib8.ext;" class="link" onclick="aios_addTab('&contrib8.link;');" />
-                        </row>
-                        <row>
-                            <text value="&contrib9.name;" />
-                            <text value="&contrib9.ext;" class="link" onclick="aios_addTab('&contrib9.link;');" />
-                        </row>
-
-                        <menuseparator />
-
-                        <description width="100%">&contrib.thanks;</description>
-                    </rows>
-                </grid>
-            </tabpanel>
-
-<!-- TRANSLATORS -->
-            <tabpanel orient="vertical" class="about">
-                <description width="100%">&trans.desc;</description>
-
-                <menuseparator />
-
-                <box style="overflow: auto; height: 235px;">
-                    <grid flex="1">
-                        <columns>
-                            <column flex="1" />
-                            <column flex="1" />
-                            <column flex="1" />
-                        </columns>
-
-                        <rows>
-                            <row>
-                                <text value="&trans.ar-SA.lang;" />
-                                <text value="ar-SA" />
-                                <text value="&trans.ar-SA.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.be-BY.lang;" />
-                                <text value="be-BY" />
-                                <text value="&trans.be-BY.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.cs-CZ.lang;" />
-                                <text value="cs-CZ" />
-                                <text value="&trans.cs-CZ.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.da-DK.lang;" />
-                                <text value="da" />
-                                <text value="&trans.da.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.de-DE.lang;" />
-                                <text value="de" />
-                                <text value="&trans.de.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.el-GR.lang;" />
-                                <text value="el" />
-                                <text value="&trans.el.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.en-GB.lang;" />
-                                <text value="en-GB" />
-                                <text value="&trans.en-GB.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.en-US.lang;" />
-                                <text value="en-US" />
-                                <text value="&trans.en-US.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.es-AR.lang;" />
-                                <text value="es-AR" />
-                                <text value="&trans.es-AR.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.es-ES.lang;" />
-                                <text value="es-ES" />
-                                <text value="&trans.es-ES.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.et-EE.lang;" />
-                                <text value="et-EE" />
-                                <text value="&trans.et-EE.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.fi-FI.lang;" />
-                                <text value="fi-FI" />
-                                <text value="&trans.fi-FI.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.fr-FR.lang;" />
-                                <text value="fr" />
-                                <text value="&trans.fr.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.he-IL.lang;" />
-                                <text value="he-IL" />
-                                <text value="&trans.he.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.hr-HR.lang;" />
-                                <text value="hr-HR" />
-                                <text value="&trans.hr-HR.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.hu-HU.lang;" />
-                                <text value="hu-HU" />
-                                <text value="&trans.hu-HU.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.hy-AM.lang;" />
-                                <text value="hy-AM" />
-                                <text value="&trans.hy-AM.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.it-IT.lang;" />
-                                <text value="it" />
-                                <text value="&trans.it.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.ja-JP.lang;" />
-                                <text value="ja-JP" />
-                                <text value="&trans.ja-JP.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.ko-KR.lang;" />
-                                <text value="ko-KR" />
-                                <text value="&trans.ko-KR.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.lt-LT.lang;" />
-                                <text value="lt-LT" />
-                                <text value="&trans.lt-LT.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.nb-NO.lang;" />
-                                <text value="nb-NO" />
-                                <text value="&trans.nb-NO.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.nl-NL.lang;" />
-                                <text value="nl" />
-                                <text value="&trans.nl.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.pl-PL.lang;" />
-                                <text value="pl" />
-                                <text value="&trans.pl.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.pt-BR.lang;" />
-                                <text value="pt-BR" />
-                                <text value="&trans.pt-BR.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.pt-PT.lang;" />
-                                <text value="pt-PT" />
-                                <text value="&trans.pt-PT.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.ro-RO.lang;" />
-                                <text value="ro" />
-                                <text value="&trans.ro.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.ru-RU.lang;" />
-                                <text value="ru-RU" />
-                                <text value="&trans.ru-RU.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.sk-SK.lang;" />
-                                <text value="sk-SK" />
-                                <text value="&trans.sk-SK.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.sq-AL.lang;" />
-                                <text value="sq-AL" />
-                                <text value="&trans.sq-AL.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.sr-RS.lang;" />
-                                <text value="sr" />
-                                <text value="&trans.sr.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.sv-SE.lang;" />
-                                <text value="sv-SE" />
-                                <text value="&trans.sv-SE.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.tr-TR.lang;" />
-                                <text value="tr-TR" />
-                                <text value="&trans.tr-TR.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.uk-UA.lang;" />
-                                <text value="uk-UA" />
-                                <text value="&trans.uk-UA.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.vi-VN.lang;" />
-                                <text value="vi" />
-                                <text value="&trans.vi.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.zh-CN.lang;" />
-                                <text value="zh-CN" />
-                                <text value="&trans.zh-CN.name;" />
-                            </row>
-                            <row>
-                                <text value="&trans.zh-TW.lang;" />
-                                <text value="zh-TW" />
-                                <text value="&trans.zh-TW.name;" />
-                            </row>
-                        </rows>
-                    </grid>
-                </box>
-
-                <menuseparator />
-
-                <description width="100%">&trans.thanks;</description>
-
-            </tabpanel>
-
-        </tabpanels>
-    </tabbox>
-
-<!-- BUTTONS -->
-    <hbox>
-        <spacer flex="1" />
-        <button label="&settings;" oncommand="aios_openDialog('prefs'); aios_closeAbout();" />
-        <button label="&close;" oncommand="aios_closeAbout();" />
-    </hbox>
+    <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
+    
+    <prefpane id="aiosAbout" src="chrome://aios/content/abouttabs.xul" />
 
-</window>
\ No newline at end of file
+</prefwindow>
\ No newline at end of file
diff --git a/content/about.xul b/content/about_alt.xul
similarity index 93%
copy from content/about.xul
copy to content/about_alt.xul
index 2adf9d3..6dcc3d2 100644
--- a/content/about.xul
+++ b/content/about_alt.xul
@@ -3,7 +3,7 @@
 <!-- skin -->
 <?xml-stylesheet href="chrome://browser/skin/"?>
 <?xml-stylesheet href="chrome://mozapps/skin/pref/pref.css" type="text/css"?>
-<?xml-stylesheet href="chrome://aios/skin/prefs.css"?>
+<?xml-stylesheet href="chrome://aios/skin/css/prefs.css"?>
 
 <!-- locale -->
 <!DOCTYPE overlay [
@@ -28,7 +28,7 @@
 			if(window.arguments) document.getElementsByTagName('tabbox')[0].selectedIndex = window.arguments[0];
 			else document.getElementsByTagName('tabbox')[0].selectedIndex = selTab;
 
-			document.getElementById('aiosAbout').setAttribute('aios_appOS', aios_WIN.aios_appOS);
+			document.getElementById('aiosAbout').setAttribute('aios-appOS', aios_WIN.aios_appOS);
 		}
 
 		function aios_closeAbout() {
@@ -46,9 +46,9 @@
 	]]>
     </script>
 
-    <dialogheader id="header" title="&title;" description="&version; &aios.versionNo;" />
+    <dialogheader id="aboutHeader" title="&title;" description="&version; &aios.versionNo;" />
 
-    <hbox id="headerMac">
+    <hbox id="aboutHeaderMac">
         <label id="title" value="&title;" />
         <label id="version" value="&version; &aios.versionNo;" />
     </hbox>
@@ -85,7 +85,7 @@
                 <hbox id="paypal" align="center" onclick="aios_addTab('http://firefox.exxile.net/paypal.php');">
                     <description value="&create.desc;" />
                     <spacer flex="1" />
-                    <image src="chrome://aios/skin/images/paypal.gif" />
+                    <image src="chrome://aios/skin/img/paypal.gif" />
                 </hbox>
             </tabpanel>
 
@@ -126,18 +126,6 @@
                             <text value="&contrib6.name;" />
                             <text value="&contrib6.ext;" class="link" onclick="aios_addTab('&contrib6.link;');" />
                         </row>
-                        <row>
-                            <text value="&contrib7.name;" />
-                            <text value="&contrib7.ext;" class="link" onclick="aios_addTab('&contrib7.link;');" />
-                        </row>
-                        <row>
-                            <text value="&contrib8.name;" />
-                            <text value="&contrib8.ext;" class="link" onclick="aios_addTab('&contrib8.link;');" />
-                        </row>
-                        <row>
-                            <text value="&contrib9.name;" />
-                            <text value="&contrib9.ext;" class="link" onclick="aios_addTab('&contrib9.link;');" />
-                        </row>
 
                         <menuseparator />
 
diff --git a/content/aboutconfig.xul b/content/aboutconfig.xul
index 30f2238..bb61d05 100644
--- a/content/aboutconfig.xul
+++ b/content/aboutconfig.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!-- skin -->
-<?xml-stylesheet href="chrome://aios/skin/aboutconfig.css"?>
+<?xml-stylesheet href="chrome://aios/skin/css/aboutconfig.css"?>
 
 <overlay id="aios_configOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	
@@ -9,28 +9,8 @@
 	
     <script><![CDATA[
 	
-		// Default-Theme? / OS
-		var aios_window = document.getElementById("config");
-		aios_window.setAttribute('aios_appDefTheme', aios_WIN.aios_appDefTheme);
-		aios_window.setAttribute('aios_appOS', aios_WIN.aios_appOS);
-		
-		// Buttons durch Toolbarbuttons ersetzen
-		if(aios_WIN.aios_appDefTheme) {
-			var tbChilds = document.getElementById("filterRow").childNodes;
-			var tbutton, tobserver;
-			for(var i = 0; i < tbChilds.length; i++) {
-				
-				if(tbChilds[i].tagName == "button") {
-					tbutton = document.createElement("toolbarbutton");
-					
-					for(var j = 0; j < tbChilds[i].attributes.length; j++) {
-						tbutton.setAttribute(tbChilds[i].attributes[j].nodeName, tbChilds[i].attributes[j].nodeValue);
-					}
-					
-					tbChilds[i] = tbChilds[i].parentNode.replaceChild(tbutton, tbChilds[i]);
-				}
-			}
-		}
+		// für CSS-Zwecke speichern
+		aios_appInfo( document.getElementById("config") );
 		
 	]]>
     </script>
diff --git a/content/abouttabs.xul b/content/abouttabs.xul
new file mode 100644
index 0000000..9c915b3
--- /dev/null
+++ b/content/abouttabs.xul
@@ -0,0 +1,346 @@
+<?xml version="1.0"?>
+
+<!-- locale -->
+<!DOCTYPE overlay [
+	<!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">
+
+    <script><![CDATA[
+
+        function aios_init() {
+            var header = document.getElementById("aboutHeader");
+            var headerDesc = header.getAttribute("description");
+                
+            Components.utils.import("resource://gre/modules/AddonManager.jsm");
+
+            AddonManager.getAddonByID("{097d3191-e6fa-4728-9826-b533d755359d}", function(addon) {
+                header.setAttribute("title", addon.name);
+                header.setAttribute("description", headerDesc + addon.version);
+                
+                document.getElementById("macTitle").setAttribute("value", addon.name);
+                document.getElementById("macVersion").setAttribute("value", document.getElementById("macVersion").getAttribute("value") + addon.version);
+            });
+            
+            var aios_appOS = Components.classes['@mozilla.org/xre/app-info;1'].getService(Components.interfaces.nsIXULRuntime).OS;
+            document.getElementById("aiosAbout").setAttribute("aios-appOS", aios_appOS);
+            
+            if(aios_appOS == "Darwin") header.setAttribute("hidden", true);
+            else document.getElementById("aboutHeaderMac").setAttribute("hidden", true);
+        }
+        
+	]]>
+    </script>
+
+    <prefpane id="aiosAbout" onpaneload="aios_init();" style="min-height:310px;">
+
+        <dialogheader id="aboutHeader" title="" description="" />
+        
+        <hbox id="aboutHeaderMac">
+            <label id="macTitle" value="" />
+            <label id="macVersion" value="&version; " />
+        </hbox>
+
+        <tabbox flex="1">
+
+            <tabs>
+                <tab label="&tab.about;" />
+                <tab label="&tab.help;" />
+                <tab label="&tab.contrib;" />
+                <tab label="&tab.trans;" />
+            </tabs>
+
+            <tabpanels flex="1">
+
+    <!-- ABOUT -->
+                <tabpanel orient="vertical" class="about">
+
+                    <description width="100%">&about.desc;</description>
+                    
+                    <separator class="groove" />
+
+                    <hbox id="paypal" align="center" onclick="aios_addTab('http://firefox.exxile.net/paypal.php');">
+                        <description value="&create.desc;" />
+                        <spacer flex="1" />
+                        <image src="chrome://aios/skin/img/paypal.gif" />
+                    </hbox>
+                </tabpanel>
+                
+    <!-- HELP -->
+                <tabpanel orient="vertical" class="about">
+                    
+                    <description width="100%">&help.desc;</description>
+                    
+                    <separator class="groove" />
+
+                    <vbox class="indent websites">
+                        <toolbarbutton label="&about1.name;" onclick="aios_addTab('&about1.link;');" />
+                        <toolbarbutton label="&about2.name;" onclick="aios_addTab('&about2.link;');" />
+                        <toolbarbutton label="&about3.name;" onclick="aios_addTab('&about3.link;');" />
+                        <toolbarbutton label="&about4.name;" onclick="aios_addTab('&about4.link;');" />
+                        <toolbarbutton label="&about6.name;" onclick="aios_addTab('&about6.link;');" />
+                        <toolbarbutton label="&about7.name;" onclick="aios_addTab('&about7.link;');" />
+                        <toolbarbutton label="&about5.name;" onclick="aios_addTab('&about5.link;');" />
+                    </vbox>
+
+                </tabpanel>
+
+    <!-- CONTRIBUTORS -->
+                <tabpanel orient="vertical" class="about">
+
+                    <description width="100%">&contrib.desc;</description>
+
+                    <separator class="groove" />
+                    
+                    <grid flex="1">
+                        <columns>
+                            <column flex="1" />
+                            <column flex="1" />
+                        </columns>
+
+                        <rows>
+                            <row>
+                                <text value="&contrib1.name;" />
+                                <text value="&contrib1.ext;" class="link" onclick="aios_addTab('&contrib1.link;');" />
+                            </row>
+                            <row>
+                                <text value="&contrib2.name;" />
+                                <text value="&contrib2.ext;" class="link" onclick="aios_addTab('&contrib2.link;');" />
+                            </row>
+                            <row>
+                                <text value="&contrib3.name;" />
+                                <text value="&contrib3.ext;" class="link" onclick="aios_addTab('&contrib3.link;');" />
+                            </row>
+                            <row>
+                                <text value="&contrib4.name;" />
+                                <text value="&contrib4.ext;" class="link" onclick="aios_addTab('&contrib4.link;');" />
+                            </row>
+                            <row>
+                                <text value="&contrib5.name;" />
+                                <text value="&contrib5.ext;" class="link" onclick="aios_addTab('&contrib5.link;');" />
+                            </row>
+
+                            <separator class="groove" />
+
+                            <description width="100%">&contrib.thanks;</description>
+                        </rows>
+                    </grid>
+                </tabpanel>
+
+    <!-- TRANSLATORS -->
+                <tabpanel orient="vertical" class="about">
+                    
+                    <description width="100%">&trans.desc;</description>
+
+                    <separator class="groove" />
+
+                    <box style="overflow: auto; height: 135px;">
+                        <grid flex="1">
+                            <columns>
+                                <column flex="1" />
+                                <column flex="1" />
+                                <column flex="1" />
+                            </columns>
+
+                            <rows>
+                                <row>
+                                    <text value="&trans.ar-SA.lang;" />
+                                    <text value="ar-SA" />
+                                    <text value="&trans.ar-SA.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.be-BY.lang;" />
+                                    <text value="be-BY" />
+                                    <text value="&trans.be-BY.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.cs-CZ.lang;" />
+                                    <text value="cs-CZ" />
+                                    <text value="&trans.cs-CZ.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.da-DK.lang;" />
+                                    <text value="da" />
+                                    <text value="&trans.da.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.de-DE.lang;" />
+                                    <text value="de" />
+                                    <text value="&trans.de.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.el-GR.lang;" />
+                                    <text value="el" />
+                                    <text value="&trans.el.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.en-GB.lang;" />
+                                    <text value="en-GB" />
+                                    <text value="&trans.en-GB.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.en-US.lang;" />
+                                    <text value="en-US" />
+                                    <text value="&trans.en-US.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.es-AR.lang;" />
+                                    <text value="es-AR" />
+                                    <text value="&trans.es-AR.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.es-ES.lang;" />
+                                    <text value="es-ES" />
+                                    <text value="&trans.es-ES.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.et-EE.lang;" />
+                                    <text value="et-EE" />
+                                    <text value="&trans.et-EE.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.fi-FI.lang;" />
+                                    <text value="fi-FI" />
+                                    <text value="&trans.fi-FI.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.fr-FR.lang;" />
+                                    <text value="fr" />
+                                    <text value="&trans.fr.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.he-IL.lang;" />
+                                    <text value="he-IL" />
+                                    <text value="&trans.he.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.hr-HR.lang;" />
+                                    <text value="hr-HR" />
+                                    <text value="&trans.hr-HR.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.hu-HU.lang;" />
+                                    <text value="hu-HU" />
+                                    <text value="&trans.hu-HU.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.hy-AM.lang;" />
+                                    <text value="hy-AM" />
+                                    <text value="&trans.hy-AM.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.it-IT.lang;" />
+                                    <text value="it" />
+                                    <text value="&trans.it.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.ja-JP.lang;" />
+                                    <text value="ja-JP" />
+                                    <text value="&trans.ja-JP.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.ko-KR.lang;" />
+                                    <text value="ko-KR" />
+                                    <text value="&trans.ko-KR.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.lt-LT.lang;" />
+                                    <text value="lt-LT" />
+                                    <text value="&trans.lt-LT.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.nb-NO.lang;" />
+                                    <text value="nb-NO" />
+                                    <text value="&trans.nb-NO.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.nl-NL.lang;" />
+                                    <text value="nl" />
+                                    <text value="&trans.nl.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.pl-PL.lang;" />
+                                    <text value="pl" />
+                                    <text value="&trans.pl.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.pt-BR.lang;" />
+                                    <text value="pt-BR" />
+                                    <text value="&trans.pt-BR.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.pt-PT.lang;" />
+                                    <text value="pt-PT" />
+                                    <text value="&trans.pt-PT.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.ro-RO.lang;" />
+                                    <text value="ro" />
+                                    <text value="&trans.ro.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.ru-RU.lang;" />
+                                    <text value="ru-RU" />
+                                    <text value="&trans.ru-RU.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.sk-SK.lang;" />
+                                    <text value="sk-SK" />
+                                    <text value="&trans.sk-SK.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.sq-AL.lang;" />
+                                    <text value="sq-AL" />
+                                    <text value="&trans.sq-AL.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.sr-RS.lang;" />
+                                    <text value="sr" />
+                                    <text value="&trans.sr.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.sv-SE.lang;" />
+                                    <text value="sv-SE" />
+                                    <text value="&trans.sv-SE.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.tr-TR.lang;" />
+                                    <text value="tr-TR" />
+                                    <text value="&trans.tr-TR.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.uk-UA.lang;" />
+                                    <text value="uk-UA" />
+                                    <text value="&trans.uk-UA.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.vi-VN.lang;" />
+                                    <text value="vi" />
+                                    <text value="&trans.vi.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.zh-CN.lang;" />
+                                    <text value="zh-CN" />
+                                    <text value="&trans.zh-CN.name;" />
+                                </row>
+                                <row>
+                                    <text value="&trans.zh-TW.lang;" />
+                                    <text value="zh-TW" />
+                                    <text value="&trans.zh-TW.name;" />
+                                </row>
+                            </rows>
+                        </grid>
+                    </box>
+
+                    <separator class="groove" />
+
+                    <description width="100%">&trans.thanks;</description>
+
+                </tabpanel>
+
+            </tabpanels>
+        </tabbox>
+    </prefpane>
+</overlay>
\ No newline at end of file
diff --git a/content/addons_fx4.js b/content/addons.js
similarity index 95%
rename from content/addons_fx4.js
rename to content/addons.js
index a0bbd56..ec7ece9 100644
--- a/content/addons_fx4.js
+++ b/content/addons.js
@@ -29,13 +29,13 @@ var AiOS_Addons = {};
             aios_appInfo(document.getElementById("addons-page"));
 
             // CSS-Datei einbinden
-            aios_addCSS("addons_fx4.css", document.getElementById("addons-page"));
+            aios_addCSS("addons.css", document.getElementById("addons-page"));
             
             AiOS_Addons.setSidebarLayout();
             AiOS_Addons.checkNotification();
 
             // without the timeout the childNodes.length of "addon-list" will be 0
-            window.setTimeout("AiOS_Addons.countElements()", 200);
+            window.setTimeout("AiOS_Addons.countElements()", 500);
         }
 
         // sorgt dafür, dass bei neuen Downloads oder neuen Add-on-Installationen der Titel aktualisiert wird
@@ -219,7 +219,7 @@ var AiOS_Addons = {};
         if(top.document.getElementById('sidebar-title')) top.document.getElementById('sidebar-title').setAttribute("value", newTitle);
 
         // Sidebartitel im Broadcaster speichern, damit er beim Schließen/öffnen der Sidebar wiederhergestellt werden kann
-        //if(top.document.getElementById('sidebar-box')) aios_WIN.document.getElementById(top.document.getElementById('sidebar-box')).setAttribute('sidebartitle', newTitle);
+        if(top.document.getElementById('viewAddonsSidebar')) top.document.getElementById('viewAddonsSidebar').setAttribute('sidebartitle', newTitle);
 
         return true;
         
@@ -233,16 +233,11 @@ var AiOS_Addons = {};
 
         var childs = document.getElementById(aList).childNodes;
         
-        var j = 0;
         for(var i = 0; i < childs.length; i++) {
             if(childs[i].nodeName == "richlistitem" && childs[i].getAttribute('hidden') != "true") {
                 if(aType == "all") r.push(childs[i]);
                 else if(aType == "local" && childs[i].getAttribute('remote') == "false") r.push(childs[i]);
                 else if(aType == "remote" && childs[i].getAttribute('remote') == "true") r.push(childs[i]);
-                
-                /*if(j % 2 == 0) childs[i].setAttribute('alternate', true);
-                else childs[i].removeAttribute('alternate');*/
-                j++;
             }
         }
         
diff --git a/content/addons.xul b/content/addons.xul
index 431a415..991a92a 100644
--- a/content/addons.xul
+++ b/content/addons.xul
@@ -1,41 +1,67 @@
 <?xml version="1.0"?>
 
-<overlay id="aios_ExtensionsOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<!-- DTD (e.g. for the "updates-restart-btn") -->
+<!DOCTYPE page [
+    <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD;
+    <!ENTITY % extensionsDTD SYSTEM "chrome://mozapps/locale/extensions/extensions.dtd"> %extensionsDTD;
+]>
 
-    <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
-    <script type="application/x-javascript" src="chrome://aios/content/addons_downloads.js" />
-    
-    <radiogroup id="viewGroup">
+<!-- skin (for the "close-btn") -->
+<?xml-stylesheet href="chrome://browser/skin/browser.css"?> 
 
-        <radio id="search-view" onclick="aios_setTitle(this);" />
-        <radio id="extensions-view" onclick="aios_setTitle(this);" />
-        <radio id="themes-view" onclick="aios_setTitle(this);" />
-        <radio id="locales-view" onclick="aios_setTitle(this);" />
-        <radio id="plugins-view" onclick="aios_setTitle(this);" />
-        <radio id="updates-view" onclick="aios_setTitle(this);" />
+<overlay id="aios_AddonsOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-        <!-- Ansicht bei Installation eines Add-ons zum Installationspanel wechseln -->
-        <radio id="installs-view" onclick="aios_setTitle(this);">
-            <observes element="installs-view" attribute="hidden" onbroadcast="showView('installs'); var msg = document.getElementById('addonsMsg'); msg.getElementsByTagName('notification')[0].style.opacity = '1';" />
-        </radio>
+    <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
+    <script type="application/x-javascript" src="chrome://aios/content/addons.js" />
 
-    </radiogroup>
+    <richlistbox id="categories">
+        <observes element="categories" attribute="last-selected" onbroadcast="window.setTimeout('AiOS_Addons.countElements()', 100);" />
+        <observes element="search-filter-radiogroup" attribute="value" onbroadcast="window.setTimeout('AiOS_Addons.countElements()', 100);" />
+    </richlistbox>
 
+    <hbox id="header">
+        <toolbarbutton id="back-btn">
+            <observes element="back-btn" attribute="hidden" onbroadcast="document.getElementById('back-btn').setAttribute('hidden', false)" />
+        </toolbarbutton>
+        
+        <toolbarbutton id="forward-btn">
+            <observes element="forward-btn" attribute="hidden" onbroadcast="document.getElementById('forward-btn').setAttribute('hidden', false)" />
+        </toolbarbutton>
+        
+        <textbox id="header-search" flex="1" />
+    </hbox>
 
-    <window id="extensionsManager">
+    <hbox id="updates-container">
+        <image class="spinner"/>
+        
+        <label id="updates-noneFound" >
+            <observes element="updates-noneFound" attribute="hidden" onbroadcast="AiOS_Addons.checkNotification();" />
+        </label>
 
-        <notificationbox id="addonsMsg">
-            <vbox id="extensionsBox">
+        <button id="updates-manualUpdatesFound-btn">
+            <observes element="updates-manualUpdatesFound-btn" attribute="hidden" onbroadcast="AiOS_Addons.checkNotification();" />
+        </button>
+        
+        <label id="updates-progress">
+            <observes element="updates-progress" attribute="hidden" onbroadcast="AiOS_Addons.checkNotification();" />
+        </label>
 
-                <hbox id="aios-searchpanel-top" position="1">
-                    <observes element="searchPanel" attribute="hidden" />
-                </hbox>
+        <label id="updates-installed">
+            <observes element="updates-installed" attribute="hidden" onbroadcast="AiOS_Addons.checkNotification();" />
+        </label>
+        
+        <label id="updates-downloaded">
+            <observes element="updates-downloaded" attribute="hidden" onbroadcast="AiOS_Addons.checkNotification();" />
+        </label>
 
-            </vbox>
-        </notificationbox>
+        <button id="updates-restart-btn" label="&addon.restartNow.label;">
+            <observes element="updates-restart-btn" attribute="hidden" onbroadcast="AiOS_Addons.checkNotification();" />
+        </button>
 
-    </window>
+        <spacer flex="1" />
 
-    <vbox id="themePreviewArea" persist="width height" />
+        <toolbarbutton id="close-btn" class="tabs-closebutton" oncommand="AiOS_Addons.hideNotification();" style="display:none;" />
+      
+    </hbox>
 
-</overlay>
\ No newline at end of file
+</overlay>
diff --git a/content/addons_downloads.js b/content/addons_downloads.js
deleted file mode 100644
index 242c0d1..0000000
--- a/content/addons_downloads.js
+++ /dev/null
@@ -1,380 +0,0 @@
-
-window.addEventListener("DOMContentLoaded", aios_init, false);
-
-var aios_mode, aios_prefstring, aios_sidebarItem, aios_managerWindow, aios_posElem, aios_Interval;
-var aios_IntervalCount = 0;
-
-var aios_inSidebar = (top.document.getElementById('sidebar-box')) ? true : false;
-
-var aios_loc = window.location.href;
-
-
-/* Fix für Clean-Button im Downloads-Panel */
-if(aios_inSidebar && aios_loc.indexOf('downloads.xul') > 0) {
-    window.arguments = [];
-}
-
-/* Workaround, um anfangs kein Element automatisch zu selektieren => schmalere Anzeige der Paneele */
-/* erzeugt einen Bug in Verbindung mit Greasemonkey 
-if(aios_loc.indexOf('extensions.xul') > 0) {
-    document.getElementById("extensionsManager").parentNode.orient = document.getElementById("extensionsView").parentNode.orient;
-}*/
-
-function aios_init() {
-    var enable_sidebar, enable_slim, enable_colors, enable_count, enable_layout, enable_layoutall;
-
-    // Menüleiste unter Mac OS X ausblenden
-    aios_hideMacMenubar();
-    
-    if(aios_loc.indexOf('downloads.xul') > 0) {
-        aios_mode = "downloads";
-        aios_prefstring = "dm";
-        aios_sidebarItem = "viewDownloadsSidebar";
-		
-        aios_managerWindow = document.getElementById("downloadManager");
-        aios_posElem = document.getElementById("downloadView");
-    }
-    else if(aios_loc.indexOf('extensions.xul') > 0) {
-        aios_mode = "addons";
-        aios_prefstring = "em";
-        aios_sidebarItem = "viewAddonsSidebar";
-		
-        aios_managerWindow = document.getElementById("extensionsManager");
-        aios_posElem = document.getElementById("addonsMsg");
-    }
-    
-    // für CSS-Zwecke speichern
-    aios_appInfo(aios_managerWindow);
-
-    // Fenster auf Fokus überwachen => unterschiedliche Farben für Darwin
-    if(aios_inSidebar && aios_appOS == "Darwin" && top.aios_notifyActive) top.aios_notifyActive();
-	
-    try {
-        enable_sidebar = aios_gPrefBranch.getBoolPref(aios_prefstring + ".sidebar");
-        enable_slim = aios_gPrefBranch.getBoolPref(aios_prefstring + ".slim");
-        enable_colors = aios_gPrefBranch.getBoolPref(aios_prefstring + ".colors");
-        enable_count = aios_gPrefBranch.getBoolPref(aios_prefstring + ".count");
-        enable_layout = aios_gPrefBranch.getBoolPref(aios_prefstring + ".layout");
-        enable_layoutall = aios_gPrefBranch.getBoolPref(aios_prefstring + ".layoutall");
-    }
-    catch(e) {
-        return false;
-    }
-	
-    /*
-		Add-ons-Fenster schließen, wenn der Manager nur in der Sidebar geöffnet werden soll
-			=> enable_sidebar => Manager soll in der Sidebar geöffnet 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(aios_mode == "addons" && enable_sidebar && !top.document.getElementById('sidebar') && top.toString() != "[object XPCNativeWrapper [object Window]]" && !aios_WIN.aiosIsWindow) {
-        // wenn die Sidebar nicht schon geöffnet ist (z.B. Aufruf durch MR Tech Local Install)
-        // ohne diese Abfrage werden Erweiterungen u.U. doppelt installiert
-        if(!aios_WIN.aios_getBoolean(aios_sidebarItem, 'checked')) aios_WIN.toggleSidebar(aios_sidebarItem, true);
-        window.close();
-    }
-	
-    // Sidebar-Layout
-    if((enable_layout && aios_inSidebar) || enable_layoutall) aios_sidebarLayout();
-	
-    // farbige Einträge
-    if(enable_colors) {
-        aios_managerWindow.setAttribute('aiosColors', true);
-        aios_addCSS("_coloredlist.css", aios_managerWindow);
-		
-        // alternierende Listeneinträge (Downloads verfügen automatisch über das Attribut)
-        if(!enable_count) window.setTimeout("aios_filterItems()", 200);
-    }
-
-    // kompakte Ansicht
-    if(enable_slim) {
-        aios_managerWindow.setAttribute('aiosSlim', true);
-        aios_addCSS("_slimlist.css", aios_managerWindow);
-    }
-	
-    // Titel setzen
-    if(aios_mode == "addons") aios_setTitle();
-	
-    // Elemente zaehlen und anzeigen
-    if(enable_count) {
-        aios_countItems();	// der Aufruf ist nötig, wenn die Downloads-Liste leer ist (sonst wird keine 0 angezeigt)
-		
-        // sorgt dafür, dass bei neuen Downloads oder neuen Add-on-Installationen der Titel aktualisiert wird
-        try {
-            window.addEventListener("DOMNodeInserted", aios_countItems, true);
-            window.addEventListener("DOMNodeRemoved", aios_countItems, true);
-            window.addEventListener("DOMAttrModified", function(e){
-                if(e.originalTarget.tagName == "richlistitem" && e.attrName == "state") {
-                    //alert(e.attrName);
-                    if(e.originalTarget.getAttribute('state') == "1") {
-                        aios_countItems();
-                    }
-                }
-            }, true);
-        } catch(ex) { }
-    }
-    else {
-        // Zahl im Titel entfernen
-        // => nötig nur direkt nach der Deaktivierung der Option, weil im Broadcaster die Anzahl gespeichert ist
-        if(top.document.getElementById('sidebar-title')) {
-            var title = top.document.getElementById('sidebar-title').getAttribute("value");
-			
-            if(title.indexOf(" [") > 0) {
-                var newTitle = title.substring(0, title.indexOf(" ["));
-                top.document.getElementById('sidebar-title').setAttribute("value", newTitle);
-				
-                if(aios_inSidebar) aios_WIN.document.getElementById(aios_sidebarItem).setAttribute('sidebartitle', newTitle);
-            }
-        }
-    }
-
-    if(aios_mode == "addons") {
-        
-        // Fix für MR Tech Local Install
-        if(typeof Local_Install == "object") {
-            // Padding des Managers abschalten
-            if((enable_layout && aios_inSidebar) || enable_layoutall)
-                try {
-                    aios_gPref.setCharPref("local_install.viewPadding", "");
-                } catch(e) { }
-        }
-    }
-	
-    if(document.getElementById("searchbox")) window.setTimeout('document.getElementById("searchbox").focus()', 50);
-
-    // Tastaturkürzel entfernen, um nicht die des Hauptbrowsers zu blockieren
-    if(aios_inSidebar) aios_removeAccesskeys();
-
-    return true;
-}
-
-
-/*
-	aktiviert das an die Sidebar angepasste Layout
-		=> Aufruf durch aios_init()
-*/
-function aios_sidebarLayout() {
-    var cmdBar, i;
-
-    // CSS für Sidebar-Optimierungen aktivieren
-    aios_managerWindow.setAttribute('aiosLayout', true);
-    aios_addCSS(aios_mode + "_layout.css", aios_managerWindow);
-	
-    if(aios_mode == "addons") {
-        cmdBar = document.getElementById("commandBarBottom");
-		
-        // Label der Radio-Buttons unsichtbar machen
-        var cStyle = document.defaultView.getComputedStyle(document.getElementById('extensions-view'), '');
-        if(cStyle.listStyleImage && cStyle.listStyleImage != "none") {
-            if(document.getElementById('viewGroup')) document.getElementById('viewGroup').setAttribute("hideLabel", true);
-        }
-		
-        // Radio-Buttons mit Tooltip
-        if(document.getElementById("viewGroup")) {
-            var radioChilds = document.getElementById("viewGroup").childNodes;
-            for(i = 0; i < radioChilds.length; i++) {
-                if(radioChilds[i].tagName == "radio") radioChilds[i].setAttribute('tooltiptext', radioChilds[i].getAttribute('label'));
-            }
-        }
-
-        if(document.getElementById("getMore")) cmdBar.appendChild(document.getElementById("getMore"));
-        if(document.getElementById("newUserscript")) cmdBar.appendChild(document.getElementById("newUserscript"));
-        if(document.getElementById("getMoreUserscripts")) cmdBar.appendChild(document.getElementById("getMoreUserscripts"));
-    }
-    else if(aios_mode == "downloads") {
-        cmdBar = document.getElementById("search");
-    }
-	
-	
-    // Toolbar nach oben versetzen
-    aios_managerWindow.insertBefore(cmdBar, aios_posElem);
-	
-	
-    // Buttons durch Toolbarbuttons ersetzen
-    //if(aios_WIN.aios_appDefTheme) {
-    var tbChilds = cmdBar.childNodes;
-    var tbutton, tobserver;
-    for(i = 0; i < tbChilds.length; i++) {
-			
-        if(tbChilds[i].tagName == "button") {
-            tbutton = document.createElement("toolbarbutton");
-				
-            for(var j = 0; j < tbChilds[i].attributes.length; j++) {
-                tbutton.setAttribute(tbChilds[i].attributes[j].nodeName, tbChilds[i].attributes[j].nodeValue);
-            }
-
-            tbChilds[i].parentNode.replaceChild(tbutton, tbChilds[i]);
-        }
-    }
-//}
-}
-
-
-/*
-	zählt und zeigt die aktivierten und deaktivierten Extensions im Sidebartitel an
-		=> Aufruf durch aios_init()
-*/
-function aios_countItems() {
-    if(!aios_WIN.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.");
-        li_count = li_gPrefBranch.getBoolPref("showManagerTotals");
-        if(li_count) return false;
-        else Local_Install.setWindowTitle = function(){};
-    }
-	
-    // bisherigen Titel feststellen
-    var newTitle;
-    var origTitle = "";
-    if(aios_WIN.document.getElementById(aios_sidebarItem)) origTitle = aios_WIN.document.getElementById(aios_sidebarItem).getAttribute('label');
-	
-    if(document.getElementById("viewGroup")) {
-        if(document.getElementById("viewGroup").selectedItem) {
-            var viewTitle = document.getElementById("viewGroup").selectedItem.getAttribute('label');
-            origTitle = origTitle + " - " + viewTitle;
-        }
-    }
-	
-    // Elemente zaehlen
-    //var exts = aios_filterItems(aios_boxElem.childNodes, function(c){ return c.nodeName == "richlistitem" });
-    var exts = aios_filterItems();
-	
-    var str_count = "";
-
-    // DOWNLOADS
-    if(aios_mode == "downloads") {
-        var list_downloading = 0;
-        var list_done = 0;
-        var list_failed = 0;
-		
-        for(var i = 0; i < exts.length; i++) {
-            var state = exts[i].getAttribute('state');
-			
-            // downloading => starting + downloading + paused + downloading
-            if(state == "-1" || state == "0" || state == "4" || state == "5") list_downloading++;
-			
-            // done => done
-            if(state == "1") list_done++;
-			
-            // failed => failed + canceled
-            if(state == "2" || state == "3") list_failed++;
-        }
-		
-        str_count = list_done;
-        if(list_downloading > 0 || list_failed > 0) str_count = str_count + "/" + list_downloading;
-        if(list_failed > 0) str_count = str_count + "/" + list_failed;
-    }
-    // ADD-ONS
-    else {
-        var list_enabled = 0;
-        var list_disabled = 0;
-		
-        for(i = 0; i < exts.length; i++) {
-            if(exts[i].getAttribute('hidden') != "true") {
-                if(exts[i].getAttribute('isDisabled') == "true") list_disabled++;
-                else  list_enabled++;
-            }
-        }
-		
-        str_count = list_enabled;
-        if(list_disabled > 0) str_count = str_count + "/" + list_disabled;
-		
-		
-        // bei den Add-ons muss eine Weile im Interval gezählt werden,
-        // da beim Aufbau nicht bei jedem Add-on ein 'DOMNodeInserted' ausgelöst wird
-        if(aios_IntervalCount < 500) {
-            window.setTimeout("aios_countItems()", 20);
-            aios_IntervalCount = aios_IntervalCount + 20;
-        }
-        else {
-            aios_IntervalCount = 0;
-        }
-    }
-	
-    //return str_count;
-	
-    newTitle = origTitle + " [" + str_count + "]";
-	
-    // Titel und Label setzen
-    document.title = newTitle;
-	
-    if(top.document.getElementById('sidebar-title')) top.document.getElementById('sidebar-title').setAttribute("value", newTitle);
-	
-    // Sidebartitel im Broadcaster speichern, damit er beim Schließen/öffnen der Sidebar wiederhergestellt werden kann
-    if(aios_inSidebar) aios_WIN.document.getElementById(aios_sidebarItem).setAttribute('sidebartitle', newTitle);
-	
-    return true;
-}
-
-
-/*
-	Original-Code by Caio Chassot
-		Slim_Extension_List_0.1
-		http://v2studio.com/k/moz/
-
-		=> 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;
-}*/
-function aios_filterItems() {
-    var r = [];
-    var childs;
-	
-    if(aios_sidebarItem == "viewDownloadsSidebar") childs = document.getElementById("downloadView").childNodes;
-    else childs = document.getElementById("extensionsView").childNodes;
-	
-    var j = 0;
-    for (var i = 0; i < childs.length; i++) {
-        if (childs[i].nodeName == "richlistitem" && childs[i].getAttribute('hidden') != "true") {
-            r.push(childs[i]);
-            if(j % 2 == 0) childs[i].setAttribute('alternate', true);
-            else childs[i].removeAttribute('alternate');
-            j++;
-        }
-    }
-	
-    return r;
-}
-
-
-/*
-	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;
-	
-    var newTitle;
-    var origTitle = aios_WIN.document.getElementById(aios_sidebarItem).getAttribute('label');
-	
-    var viewTitle;
-	
-    // Label des zukünftigen Panels (ausgelöst nur durch Klick auf Radio-Button)
-    if(typeof aObj == "object") viewTitle = aObj.getAttribute('label');
-    // Label des selektierten Radio-Buttons
-    else if(document.getElementById("viewGroup")) viewTitle = document.getElementById("viewGroup").selectedItem.getAttribute('label');
-	
-    newTitle = origTitle + " - " + viewTitle;
-	
-    // Titel und Label setzen
-    //document.title = newTitle;
-	
-    if(!top.document.getElementById('sidebar-title')) return false;
-    top.document.getElementById('sidebar-title').setAttribute("value", newTitle);
-	
-    // Sidebartitel im Broadcaster speichern, damit er beim Schließen/öffnen der Sidebar wiederhergestellt werden kann
-    if(aios_inSidebar) aios_WIN.document.getElementById(aios_sidebarItem).setAttribute('sidebartitle', newTitle);
-	
-    return true;
-}
\ No newline at end of file
diff --git a/content/addons_fx4.xul b/content/addons_fx4.xul
deleted file mode 100644
index 508a95b..0000000
--- a/content/addons_fx4.xul
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE page [
-    <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD;
-    <!ENTITY % extensionsDTD SYSTEM "chrome://mozapps/locale/extensions/extensions.dtd"> %extensionsDTD;
-]>
-
-<!-- skin -->
-<?xml-stylesheet href="chrome://browser/skin/browser.css"?>
-
-<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/addons_fx4.js" />
-
-    <richlistbox id="categories">
-        <observes element="categories" attribute="last-selected" onbroadcast="window.setTimeout('AiOS_Addons.countElements()', 100);" />
-        <observes element="search-filter-radiogroup" attribute="value" onbroadcast="window.setTimeout('AiOS_Addons.countElements()', 100);" />
-    </richlistbox>
-
-    <hbox id="header">
-        <toolbarbutton id="back-btn">
-            <observes element="back-btn" attribute="hidden" onbroadcast="document.getElementById('back-btn').setAttribute('hidden', false)" />
-        </toolbarbutton>
-        
-        <toolbarbutton id="forward-btn">
-            <observes element="forward-btn" attribute="hidden" onbroadcast="document.getElementById('forward-btn').setAttribute('hidden', false)" />
-        </toolbarbutton>
-    </hbox>
-
-    <hbox id="updates-container">
-        <image class="spinner"/>
-        
-        <label id="updates-noneFound" >
-            <observes element="updates-noneFound" attribute="hidden" onbroadcast="AiOS_Addons.checkNotification();" />
-        </label>
-
-        <button id="updates-manualUpdatesFound-btn">
-            <observes element="updates-manualUpdatesFound-btn" attribute="hidden" onbroadcast="AiOS_Addons.checkNotification();" />
-        </button>
-        
-        <label id="updates-progress">
-            <observes element="updates-progress" attribute="hidden" onbroadcast="AiOS_Addons.checkNotification();" />
-        </label>
-
-        <label id="updates-installed">
-            <observes element="updates-installed" attribute="hidden" onbroadcast="AiOS_Addons.checkNotification();" />
-        </label>
-        
-        <label id="updates-downloaded">
-            <observes element="updates-downloaded" attribute="hidden" onbroadcast="AiOS_Addons.checkNotification();" />
-        </label>
-
-        <button id="updates-restart-btn" label="&addon.restartNow.label;">
-            <observes element="updates-restart-btn" attribute="hidden" onbroadcast="AiOS_Addons.checkNotification();" />
-        </button>
-        
-        <spacer flex="1" />
-
-        <toolbarbutton id="close-btn" class="tabs-closebutton" oncommand="AiOS_Addons.hideNotification();" style="display:none;" />
-      
-    </hbox>
-
-</overlay>
diff --git a/content/aios.dtd b/content/aios.dtd
index 8ed9e25..b09e664 100644
--- a/content/aios.dtd
+++ b/content/aios.dtd
@@ -1,7 +1,4 @@
 
-<!ENTITY aios.versionNo         "0.7.13">
-
-
 <!ENTITY about1.link            "http://firefox.exxile.net/aios/index.php">
 <!ENTITY about2.link            "http://firefox.exxile.net/aios/features.php">
 <!ENTITY about3.link            "http://firefox.exxile.net/aios/faq.php">
@@ -10,43 +7,25 @@
 <!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 contrib2.name          "Caio Chassot">
-<!ENTITY contrib2.ext           "Slim Extension List">
-<!ENTITY contrib2.link          "https://addons.mozilla.org/firefox/addon/1230">
-
-<!ENTITY contrib3.name          "CPU">
-<!ENTITY contrib3.ext           "Tab Mix Plus">
-<!ENTITY contrib3.link          "https://addons.mozilla.org/firefox/addon/1122">
-
-<!ENTITY contrib4.name          "Dorando">
-<!ENTITY contrib4.ext           "keyconfig">
-<!ENTITY contrib4.link          "http://forums.mozillazine.org/viewtopic.php?t=72994">
-
-<!ENTITY contrib5.name          "Gabriele Best">
-<!ENTITY contrib5.ext           "Custom Download Manager">
-<!ENTITY contrib5.link          "https://addons.mozilla.org/firefox/addon/6945">
-
-<!ENTITY contrib6.name          "Leon Huang">
-<!ENTITY contrib6.ext           "POTO Sidebar">
-<!ENTITY contrib6.link          "https://addons.mozilla.org/firefox/addon/836">
-
-<!ENTITY contrib7.name          "Mel Reyes">
-<!ENTITY contrib7.ext           "MR Tech Toolkit">
-<!ENTITY contrib7.link          "https://addons.mozilla.org/firefox/addon/421">
+<!ENTITY contrib2.name          "CPU">
+<!ENTITY contrib2.ext           "Tab Mix Plus">
+<!ENTITY contrib2.link          "https://addons.mozilla.org/firefox/addon/1122">
 
-<!ENTITY contrib8.name          "Neil Rashbrook">
-<!ENTITY contrib8.ext           "Grippies">
-<!ENTITY contrib8.link          "https://addons.mozilla.org/firefox/addon/2242">
+<!ENTITY contrib3.name          "Dorando">
+<!ENTITY contrib3.ext           "keyconfig">
+<!ENTITY contrib3.link          "http://forums.mozillazine.org/viewtopic.php?t=72994">
 
-<!ENTITY contrib9.name          "Ronny Perinke">
-<!ENTITY contrib9.ext           "Autoclose Bookmark & History Folders">
-<!ENTITY contrib9.link          "http://www.sephiroth-j.de/1/mozilla/">
+<!ENTITY contrib4.name          "Leon Huang">
+<!ENTITY contrib4.ext           "POTO Sidebar">
+<!ENTITY contrib4.link          "https://addons.mozilla.org/firefox/addon/836">
 
+<!ENTITY contrib5.name          "Ronny Perinke">
+<!ENTITY contrib5.ext           "Autoclose Bookmark & History Folders">
+<!ENTITY contrib5.link          "http://www.sephiroth-j.de/1/mozilla/">
 
 <!ENTITY trans.ar-SA.name       "Natty Dreed">
 <!ENTITY trans.be-BY.name       "Drive DRKA">
@@ -63,25 +42,25 @@
 <!ENTITY trans.fr.name       	"Jean-Bernard Marcon">
 <!ENTITY trans.he.name       	"SiiiE">
 <!ENTITY trans.hr-HR.name       "Krcko">
-<!ENTITY trans.hu-HU.name       "Henriett Peller, KAMI, Sil">
+<!ENTITY trans.hu-HU.name       "kami, Henriett Peller, Sil">
 <!ENTITY trans.hy-AM.name       "Babayan Eduard">
-<!ENTITY trans.it.name       	"Roccobot, Luana di Muzio">
-<!ENTITY trans.ja-JP.name       "Premier">
+<!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.pt-BR.name       "E.R.D'Avila, Rodrigo Bergmann Laurindo">
-<!ENTITY trans.pt-PT.name       "Jorge Laranjo, zefranc">
+<!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.ru-RU.name       "Quicksilver tears">
 <!ENTITY trans.sk-SK.name       "Martin Peterčák">
 <!ENTITY trans.sq-AL.name       "Puntori">
-<!ENTITY trans.sr.name       	"Rasa">
-<!ENTITY trans.sv-SE.name       "Richard Norén, Carlos Murakami">
+<!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.zh-CN.name       "George C. Tsoi, Long G.W., blackdire">
-<!ENTITY trans.zh-TW.name       "Willy Young, Unicorn2">
\ No newline at end of file
+<!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
index a0269db..76e7ca4 100644
--- a/content/aios.js
+++ b/content/aios.js
@@ -1,6 +1,6 @@
 
 // dem Sidebarheader eine ID zuweisen => dann per CSS ansprechbar (bei load oder DOMContentLoaded zu spät)
-top.document.getElementById("sidebar-throbber").parentNode.setAttribute('id', 'sidebarheader');
+//top.document.getElementById("sidebar-throbber").parentNode.setAttribute('id', 'sidebar-header');
 
 window.addEventListener("DOMContentLoaded", aios_dominitSidebar, false);
 window.addEventListener("load", aios_initSidebar, false);
@@ -22,29 +22,13 @@ var elem_switch, elem_tbb, elem_key, elem_close, elem_close2;
 var aios_collapseSidebar = aios_gPrefBranch.getBoolPref('collapse');
 
 
-/**
- *  CSS-Styles hinzufügen
- *      => Fx 3.x unter Darwin stürzt ab, wenn der Code bei DOMContentLoaded ausgeführt wird
- *      => AiOS Toolbar wird zu breit angezeigt, wenn der Code erst bei load ausgeführt wird, weil die CSS-Spezifikationen für das Rendering zu spät sind
- **/
-if(parseFloat(aios_appVersion) <= 3.6 || aios_appOS == "Linux") aios_addCSS("aios_buttons.css", "main-window");
-if(parseFloat(aios_appVersion) >= 3.7 && aios_appOS == "WINNT") aios_addCSS("aios_buttons_fx4.css", "main-window");
-
-// CSS-Stylesheets entsprechend des Themes und des OS hinzufügen
-if(aios_appDefTheme) aios_addCSS("aios_theme_default.css", "main-window");
-if(aios_appDefTheme && aios_appOS == "WINNT") aios_addCSS("aios_theme_winnt.css", "main-window");
-if(aios_appDefTheme && aios_appOS == "Linux") aios_addCSS("aios_theme_linux.css", "main-window");
-if(parseFloat(aios_appVersion) <= 3.6 && aios_appDefTheme && aios_appOS == "Darwin") aios_addCSS("aios_theme_darwin.css", "main-window");
-if(parseFloat(aios_appVersion) >= 3.7 && aios_appDefTheme && aios_appOS == "Darwin") aios_addCSS("aios_theme_darwin_fx4.css", "main-window");
-
-
 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('sidebarheader');
+        fx_sidebarHeader = document.getElementById('sidebar-header');
         fx_sidebarSplitter = document.getElementById('sidebar-splitter');
         fx_sidebarMenu = document.getElementById('viewSidebarMenu');
 
@@ -74,9 +58,22 @@ function aios_getObjects() {
 		=> Aufruf durch das DOMContentLoaded-Event
 */
 function aios_dominitSidebar() {
-
+    // CSS-Styles hinzufügen  
+    if(aios_appOS == "WINNT") {
+        aios_addCSS("aios_buttons_winnt.css", "main-window");
+        if(aios_appDefTheme) aios_addCSS("aios_theme_winnt.css", "main-window");
+    }
+    else if(aios_appOS == "Darwin") {
+        aios_addCSS("aios_buttons_darwin.css", "main-window");
+        if(aios_appDefTheme) aios_addCSS("aios_theme_darwin.css", "main-window");
+    }
+    else {
+        aios_addCSS("aios_buttons_generic.css", "main-window");
+        if(aios_appDefTheme) aios_addCSS("aios_theme_generic.css", "main-window");
+    }
 }
 
+
 /*
 	Initialisierung
 		=> Aufruf durch das onload-Event
@@ -89,9 +86,6 @@ function aios_initSidebar() {
         aios_stripClass(document.getElementById('aios-sbhtoolbar').childNodes[i], 'toolbarbutton-1');
     }*/
 
-    // Sidebar-URL für Fx4 anpassen
-    if(parseInt(aios_appVersion) > 3) document.getElementById('viewAddonsSidebar').setAttribute("sidebarurl", "about:addons");
-
     // MacOS X => Tastaturkürzel ersetzen (Strg. wird durch Command ersetzt und Umschalt durch das Symbol dafür)
     if(aios_appOS == "Darwin") {
         aios_replaceKey('switch-tooltip-box', 'r2c2', 'command');
@@ -255,27 +249,32 @@ function aios_initSidebar() {
     catch(e) { }
 
     // mit einer manuell gesetzten 0 lässt sich das abschalten
-    // aiosVersion ist die aktuelle Version
-    if(parseFloat(changelog) != 0 && fx_sidebarBox) {
-        var aiosVersion = fx_sidebarBox.getAttribute('aiosVersion');
-        if(aiosVersion && (aiosVersion != changelog)) {
+    if(parseFloat(changelog) != 0) {
 
-            var aiosUpdated = (changelog != "") ? true : false;
+        Components.utils.import("resource://gre/modules/AddonManager.jsm");
 
-            try {
-                aios_gPrefBranch.setCharPref('changelog', aiosVersion);
-                var changelog_new = aios_gPrefBranch.getCharPref('changelog');
-            }
-            catch(e) { }
+        AddonManager.getAddonByID("{097d3191-e6fa-4728-9826-b533d755359d}", function(addon) {
+            var aiosVersion = addon.version;
+
+            if(aiosVersion && (aiosVersion != changelog)) {
 
-            // 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;
+                var aiosUpdated = (changelog != "") ? true : false;
 
-                window.setTimeout("gBrowser.loadTabs(new Array('"+hp+"'), false);", 500);
+                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("gBrowser.loadTabs(new Array('"+hp+"'), false);", 500);
+                }
             }
-        }
+        });
     }
 
     // vertikale Buttons?
@@ -289,10 +288,7 @@ function aios_initSidebar() {
     catch(e) { }
 
     // vertikale Bookmarkleiste?
-    // Fx 3.x
-    if(document.getElementById('bookmarksBarContent')) document.getElementById('bookmarksBarContent')._scrollbox.removeAttribute('orient');
-
-    // Fx 4: Attribut der Bookmarks-Leiste entfernen. Wenn sie auf der AiOS-Toolbar platziert wird, kann man per CSS die Orientation bestimmen.
+    // 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;
@@ -577,7 +573,7 @@ function aios_autoShowHide(mode) {
         // wenn Sidebar sichtbar und ausgeblendet werden soll
         // mode.originalTarget.parentNode.id != "" => behebt Kompatibilitätsproblem mit TabSidebar (Sidebar wird bei Rollover des SidebarTabs ausgeblendet)
         
-        // macht scheinbar Probleme in Fx 4, weil der Event auf appcontent nicht (immer) gelöscht wird => TabSidebar wird nicht weiterentwickelt
+        // macht scheinbar Probleme, weil der Event auf appcontent nicht (immer) gelöscht wird => TabSidebar wird nicht weiterentwickelt
         //if(!aios_isSidebarHidden() && hidemethod == 1 && mode.originalTarget.parentNode.id != "") {
         if(!aios_isSidebarHidden() && hidemethod == 1) {
 
@@ -676,7 +672,11 @@ function aios_toggleSidebar(aMode, aForceOpen) {
 */
 function aios_useGrippy() {
     fx_sidebarBox.collapsed = !fx_sidebarBox.collapsed;
-
+    
+    // Fix für 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;')*/
@@ -829,45 +829,4 @@ function aios_BrowserFullScreen() {
     aios_adjustToolboxWidth(false);
 
     return true;
-}
-
-
-/*
-	Überwacht ob das Fenster den Fokus hat => unterschiedliche Farben für Darwin
-		=> Aufruf durch den observer in aios.xul
-*/
-function aios_notifyActive() {
-    if(aios_appOS != "Darwin") return;
-
-    var elem;
-    var sb = document.getElementById('sidebar');
-    var active = document.getElementById('main-window').getAttribute('active');
-
-    if(sb.contentDocument) {
-        if(sb.contentDocument.getElementById('downloadManager')) {
-            elem = sb.contentDocument.getElementById('downloadManager');
-        }
-
-        if(sb.contentDocument.getElementById('extensionsManager')) {
-            elem = sb.contentDocument.getElementById('extensionsManager');
-        }
-
-        if(sb.contentDocument.getElementById('JSConsoleWindow')) {
-            elem = sb.contentDocument.getElementById('JSConsoleWindow');
-        }
-
-        if(sb.contentDocument.getElementById('Console2Window')) {
-            elem = sb.contentDocument.getElementById('Console2Window');
-        }
-
-        if(sb.contentDocument.getElementById('webpanels-window')) {
-            elem = sb.contentDocument.getElementById('webpanels-window');
-        }
-
-        if(sb.contentDocument.getElementById('main-window')) {
-            elem = sb.contentDocument.getElementById('main-window');
-        }
-    }
-
-    if(typeof elem == "object") elem.setAttribute('active', active);
 }
\ No newline at end of file
diff --git a/content/aios.xml b/content/aios.xml
index c43abb8..c8b299e 100644
--- a/content/aios.xml
+++ b/content/aios.xml
@@ -26,67 +26,12 @@
         </content>
     </binding>
   
-  
+    
+    <!-- eigentlich nur für Darwin nötig, sonst gibt es links einen 1px breiten Rand -->
     <binding id="aiosGrippy">
         <resources>
-            <stylesheet src="chrome://aios/skin/aios_grippies.css" />
+            <stylesheet src="chrome://aios/skin/css/aios_grippies.css" />
         </resources>
     </binding>
-
     
-    <!-- taken from TotalToolbar 1.8b6 by alta88 -->
-    <binding id="toolbox" extends="chrome://global/content/bindings/toolbar.xml#toolbox">
-        <implementation>
-
-            <constructor><![CDATA[
-
-                let wm = Components.classes["@mozilla.org/appshell/window-mediator;1"].
-                         getService(Components.interfaces.nsIWindowMediator);
-                let browserWindow = wm.getMostRecentWindow("navigator:browser");
-
-                // Initialise palette and leave on document for other toolboxes.
-                var paletteId = this.getAttribute("palette");
-                var navToolbox = browserWindow.gNavToolbox;
-                var navPaletteId = navToolbox.palette ? navToolbox.palette.id : null;
-                var palette = paletteId == navPaletteId ? navToolbox.palette :
-                                                          document.getElementById(paletteId);
-
-                if (!("toolbarpalettes" in document))
-                  document.toolbarpalettes = [];
-                if (paletteId in document.toolbarpalettes)
-                  this.palette = document.toolbarpalettes[paletteId];
-                else
-                  if (palette) {
-                    document.toolbarpalettes[paletteId] = palette;
-                    this.palette = palette;
-                  }
-
-                // Create palette with all the multiuse items and add it to the document
-                // and clone the palette to toolboxes.
-                var docPalette = document.toolbarpalettes[paletteId];
-                var paletteIdMultiuse = paletteId + "Multiuse";
-                if (paletteIdMultiuse in document.toolbarpalettes)
-                  this.paletteMultiuse = document.toolbarpalettes[paletteIdMultiuse].cloneNode(true);
-                else {
-                  var paletteNode = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
-                                                             "toolbarpalette");
-                  var multiuseItem;
-                  if (docPalette && docPalette.getElementsByAttribute("multiuseid", "*").length)
-                    multiuseItem = docPalette.getElementsByAttribute("multiuseid", "*")[0];
-                  while (multiuseItem) {
-                    paletteNode.appendChild(multiuseItem);
-                    multiuseItem = docPalette.getElementsByAttribute("multiuseid", "*")[0];
-                  }
-
-                  document.toolbarpalettes[paletteIdMultiuse] = paletteNode;
-                  this.paletteMultiuse = document.toolbarpalettes[paletteIdMultiuse].cloneNode(true);
-                }
-
-              ]]>
-              
-            </constructor>
-
-        </implementation>
-    </binding>
-
 </bindings>
\ No newline at end of file
diff --git a/content/aios.xul b/content/aios.xul
index 1219159..149ad4f 100644
--- a/content/aios.xul
+++ b/content/aios.xul
@@ -1,8 +1,7 @@
 <?xml version="1.0" ?>
 
 <!-- skin -->
-<?xml-stylesheet href="chrome://aios/skin/aios.css" ?>
-<?xml-stylesheet href="chrome://aios/skin/aios_grippies.css"?>
+<?xml-stylesheet href="chrome://aios/skin/css/aios.css" ?>
 
 <!-- locale -->
 <!DOCTYPE overlay [
@@ -55,7 +54,7 @@
             label="&downloads.label;" tooltiptext="&downloads.tooltip;" />
 
         <broadcaster id="viewAddonsSidebar" autoCheck="false" type="checkbox" group="sidebar"
-            sidebartitle="&button.addons.label;" sidebarurl="chrome://mozapps/content/extensions/extensions.xul"
+            sidebartitle="&button.addons.label;" sidebarurl="about:addons"
             onclick="aios_contextEvent(event, this);"
             oncommand="toggleSidebar('viewAddonsSidebar');"
             label="&button.addons.label;" tooltiptext="&button.addons.tooltip;" />
@@ -127,7 +126,7 @@
     </menupopup>
 
     <!-- Sidebar-Status auf Veraenderungen ueberwachen -->
-    <vbox id="sidebar-box" aiosVersion="&aios.versionNo;">
+    <vbox id="sidebar-box">
 	<!--
             Darwin: => bei ständiger Überwachung der beiden Attribute startet Fx immer mit geöffneter Sidebar
                     => ohne Überwachung und deaktiviertem SidebarCollapsing fehlt die Ausführung der Funktion,
@@ -153,13 +152,8 @@
 
 
     <!-- Grippy -->
-    <splitter id="sidebar-splitter" orient="horizontal" grippy="false" persist="grippy">
-<!--
-	<hbox flex="1">	=> ohne align="center" ist der Grippy auf die volle Hoehe gestreckt
--->
-        <hbox flex="1" align="center">
-            <grippy id="aios-sidebarGrippy" hidden="true" persist="hidden" onclick="aios_useGrippy();" />
-        </hbox>
+    <splitter id="sidebar-splitter" orient="horizontal" grippy="false" persist="grippy"> 
+        <grippy id="aios-sidebarGrippy" hidden="true" persist="hidden" onclick="aios_useGrippy();" />
     </splitter>
 
 
@@ -246,9 +240,6 @@
     <!-- Popups & Tooltips -->
     <window id="main-window" aiosVButtons="true">
 
-	<!-- überwacht ob das Fenster den Fokus hat => unterschiedliche Farben für Darwin -->
-        <observes element="main-window" attribute="active" onbroadcast="aios_notifyActive();" />
-
         <popupset id="aiosPopupset">
 
             <menupopup id="aios-toolbar-contextmenu" onpopupshowing="aios_onToolbarPopupShowing(this);">
@@ -455,17 +446,19 @@
 
 
     <hbox id="browser">
+        
+        <!-- für CSS benötigt -->
+        <observes element="aios-toolbar" attribute="posMode" />
 
-	<!-- Sidbar-Switch -->
-        <toolbox id="aios-toggle-toolbox" insertbefore="sidebar-box" class="chromeclass-toolbar"
+	<!-- Sidebar-Switch -->
+        <toolbox id="aios-toggle-toolbox" insertafter="browser-border-start" class="chromeclass-toolbar"
             persist="hidden fsToolbar fsToolbarMode fsToolbarIconsize fsSidebar fsSwitch">
 
             <!-- Fenstermodus fuer schmalen Umschalter ueberwachen (maximized, normal, minimized) -->
             <observes element="main-window" attribute="sizemode" onbroadcast="aios_checkThinSwitch();" />
 
-            <!-- AIOS-Sidebar-Switch -->
             <toolbar id="aios-toggle-toolbar" class="chromeclass-toolbar" flex="1"
-                style="min-width: 6px; max-width: 6px;" persist="style">
+                style="min-width: 6px; max-width: 6px;" persist="style" fullscreentoolbar="true">
 
         	<!-- 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;"
@@ -487,17 +480,16 @@
             <observes element="aios-toolbar" attribute="mode" />
             <observes element="aios-toolbar" attribute="defaultmode" />
             <observes element="aios-toolbar" attribute="iconsize" />
-            <observes element="aios-toolbar" attribute="posMode" />
             
             <!--
                 => die Toolbox darf beim Start nicht 'hidden sein', weil sonst die Toolbar nicht befüllt wird
                 => 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 aios-nav-bar"
+            <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"
-	      	defaultset="bookmarks-button,history-button,separator,downloads-button,addons-button,separator,multipanel-button,pageinfo-button"
-                toolboxid="navigator-toolbox" >
+                defaultset="bookmarks-button,history-button,separator,downloads-button,addons-button,separator,multipanel-button,pageinfo-button"
+                toolboxid="navigator-toolbox" fullscreentoolbar="true" >
             </toolbar>
 
             <toolbarset />
@@ -510,7 +502,6 @@
             <observes element="aios-toolbar" attribute="mode" />
             <observes element="aios-toolbar" attribute="defaultmode" />
             <observes element="aios-toolbar" attribute="iconsize" />
-            <observes element="aios-toolbar" attribute="posMode" />
             
             <!--
                 => die Toolbox darf beim Start nicht 'hidden sein', weil sonst die Toolbar nicht befüllt wird
@@ -532,10 +523,8 @@
                 <toolbarset />
             </toolbox>
 
-            <vbox id="aios-sidebardivider-1" position="2" />
-
             <!-- SIDEBARHEADER -->
-            <sidebarheader id="sidebarheader" tooltip="sidebarheader-tooltip" position="3">
+            <sidebarheader id="sidebar-header" tooltip="sidebarheader-tooltip">
 
 		<!-- Attribut wird in CSS benötigt (aios.css) -->
                 <observes element="aios-sbhtoolbar" attribute="iconsize" />
@@ -555,7 +544,7 @@
                     <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 aios-nav-bar"
+                    <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" >
 
@@ -570,10 +559,8 @@
 
             </sidebarheader>
 
-            <vbox id="aios-sidebardivider-2" position="4" />
-
             <!-- TOOLBOX UNTER DEM SIDEBARHEADER -->
-            <toolbox id="aios-toolbox-sidebartop2" position="5" defaultmode="icons" palette="BrowserToolbarPalette">
+            <toolbox id="aios-toolbox-sidebartop2" insertafter="sidebar-header" defaultmode="icons" palette="BrowserToolbarPalette">
                 <observes element="aios-toolbar" attribute="mode" />
                 <observes element="aios-toolbar" attribute="defaultmode" />
                 <observes element="aios-toolbar" attribute="iconsize" />
@@ -581,10 +568,6 @@
                 <toolbarset />
             </toolbox>
 
-            <vbox id="aios-sidebardivider-3" position="6" />
-
-            <vbox id="aios-sidebardivider-4" position="100" />
-
             <!-- TOOLBOX UNTER DER SIDEBAR -->
             <toolbox id="aios-toolbox-sidebarbottom" position="101" defaultmode="icons" palette="BrowserToolbarPalette">
                 <observes element="aios-toolbar" attribute="mode" />
diff --git a/content/aios_customize.xul b/content/aios_customize.xul
index 1e8e80b..582dad6 100644
--- a/content/aios_customize.xul
+++ b/content/aios_customize.xul
@@ -1,12 +1,12 @@
 <?xml version="1.0" ?>
 
-<!-- skin -->
-<?xml-stylesheet href="chrome://aios/skin/aios_buttons.css"?>
-
 <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" />
 
+    <!-- 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_customize_fx4.xul b/content/aios_customize_fx4.xul
deleted file mode 100644
index 972095a..0000000
--- a/content/aios_customize_fx4.xul
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" ?>
-
-<!-- skin -->
-<?xml-stylesheet href="chrome://aios/skin/aios_buttons_fx4.css"?>
-
-<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_fx4.js" />
-
-    <!-- Elements - taken from TotalToolbar 1.8b6 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
index 941e9fb..05a05af 100644
--- a/content/aios_fx.js
+++ b/content/aios_fx.js
@@ -1,4 +1,4 @@
-if(aios_collapseSidebar && parseInt(aios_appVersion) > 3) BrowserStartup = function() {
+if(aios_collapseSidebar) BrowserStartup = function() {
   var uriToLoad = null;
 
   // window.arguments[0]: URI to load (string), or an nsISupportsArray of
@@ -130,7 +130,7 @@ if(aios_collapseSidebar && parseInt(aios_appVersion) > 3) BrowserStartup = funct
       if (screen.availWidth >= 1600)
         defaultWidth = (screen.availWidth / 2) - 20;
       defaultHeight = screen.availHeight - 10;
-//@line 1301 "e:\builds\moz2_slave\rel-2.0-w32-bld\build\browser\base\content\browser.js"
+//@line 1344 "e:\builds\moz2_slave\rel-m-beta-w32-bld\build\browser\base\content\browser.js"
     }
     document.documentElement.setAttribute("width", defaultWidth);
     document.documentElement.setAttribute("height", defaultHeight);
@@ -145,21 +145,20 @@ if(aios_collapseSidebar && parseInt(aios_appVersion) > 3) BrowserStartup = funct
       gURLBar.setAttribute("readonly", "true");
       gURLBar.setAttribute("enablehistory", "false");
     }
-    goSetCommandEnabled("Browser:OpenLocation", false);
     goSetCommandEnabled("cmd_newNavigatorTab", false);
   }
 
-//@line 1278 "e:\builds\moz2_slave\rel-cen-w32-bld\build\browser\base\content\browser.js"
-    //mod by exxile updateAppButtonDisplay();
-    //
+//@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();
-    //@line 1280 "e:\builds\moz2_slave\rel-cen-w32-bld\build\browser\base\content\browser.js"
+//@line 1364 "e:\builds\moz2_slave\rel-m-beta-w32-bld\build\browser\base\content\browser.js"
 
   CombinedStopReload.init();
 
   allTabs.readPref();
 
-  TabsOnTop.syncCommand();
+  // mod by exxile: init >= Fx 12, syncCommand <= Fx 11
+  (typeof TabsOnTop.init == "function") ? TabsOnTop.init() : TabsOnTop.syncCommand();
 
   BookmarksMenuButton.init();
 
@@ -169,167 +168,12 @@ if(aios_collapseSidebar && parseInt(aios_appVersion) > 3) BrowserStartup = funct
 
   retrieveToolbarIconsizesFromTheme();
 
-  setTimeout(delayedStartup, 0, isLoadingBlank, mustLoadSidebar);
+  gDelayedStartupTimeoutId = setTimeout(delayedStartup, 0, isLoadingBlank, mustLoadSidebar);
+  gStartupRan = true;
 }
 
 
 
-if(aios_collapseSidebar && parseInt(aios_appVersion) <= 3) BrowserStartup = function() {
-    var uriToLoad = null;
-
-    // window.arguments[0]: URI to load (string), or an nsISupportsArray of
-    //                      nsISupportsStrings to load, or a xul:tab of
-    //                      a tabbrowser, which will be replaced by this
-    //                      window (for this case, all other arguments are
-    //                      ignored).
-    //                 [1]: character set (string)
-    //                 [2]: referrer (nsIURI)
-    //                 [3]: postData (nsIInputStream)
-    //                 [4]: allowThirdPartyFixup (bool)
-    if ("arguments" in window && window.arguments[0])
-        uriToLoad = window.arguments[0];
-
-    var isLoadingBlank = uriToLoad == "about:blank";
-    var mustLoadSidebar = false;
-
-    prepareForStartup();
-
-    if (uriToLoad && !isLoadingBlank) {
-        if (uriToLoad instanceof Ci.nsISupportsArray) {
-            let count = uriToLoad.Count();
-            let specs = [];
-            for (let i = 0; i < count; i++) {
-                let urisstring = uriToLoad.GetElementAt(i).QueryInterface(Ci.nsISupportsString);
-                specs.push(urisstring.data);
-            }
-
-            // This function throws for certain malformed URIs, so use exception handling
-            // so that we don't disrupt startup
-            try {
-                gBrowser.loadTabs(specs, false, true);
-            } catch (e) {}
-        }
-        else if (uriToLoad instanceof XULElement) {
-            // swap the given tab with the default about:blank tab and then close
-            // the original tab in the other window.
-
-            // Stop the about:blank load
-            gBrowser.selectedBrowser.stop();
-            // make sure it has a docshell
-            gBrowser.selectedBrowser.docShell;
-
-            gBrowser.swapBrowsersAndCloseOther(gBrowser.selectedTab, uriToLoad);
-        }
-        else if (window.arguments.length >= 3) {
-            loadURI(uriToLoad, window.arguments[2], window.arguments[3] || null,
-            window.arguments[4] || false);
-            content.focus();
-        }
-        // Note: loadOneOrMoreURIs *must not* be called if window.arguments.length >= 3.
-        // Such callers expect that window.arguments[0] is handled as a single URI.
-        else
-            loadOneOrMoreURIs(uriToLoad);
-    }
-
-    if (window.opener && !window.opener.closed) {
-        let openerFindBar = window.opener.gFindBar;
-        if (openerFindBar && !openerFindBar.hidden &&
-            openerFindBar.findMode == gFindBar.FIND_NORMAL)
-            gFindBar.open();
-
-        let openerSidebarBox = window.opener.document.getElementById("sidebar-box");
-        // If the opener had a sidebar, open the same sidebar in our window.
-        // The opener can be the hidden window too, if we're coming from the state
-        // where no windows are open, and the hidden window has no sidebar box.
-        //mod by exxile if (openerSidebarBox && !openerSidebarBox.hidden) {
-        // CollapseByStyle-Methode if (openerSidebarBox && !openerSidebarBox.hidden && openerSidebarBox.getAttribute('style') == "") {
-        if (openerSidebarBox && !openerSidebarBox.hidden && !openerSidebarBox.collapsed) {
-            let sidebarCmd = openerSidebarBox.getAttribute("sidebarcommand");
-            let sidebarCmdElem = document.getElementById(sidebarCmd);
-
-            // dynamically generated sidebars will fail this check.
-            if (sidebarCmdElem) {
-                let sidebarBox = document.getElementById("sidebar-box");
-                let sidebarTitle = document.getElementById("sidebar-title");
-
-                sidebarTitle.setAttribute(
-                "value", window.opener.document.getElementById("sidebar-title").getAttribute("value"));
-                sidebarBox.setAttribute("width", openerSidebarBox.boxObject.width);
-
-                sidebarBox.setAttribute("sidebarcommand", sidebarCmd);
-                // Note: we're setting 'src' on sidebarBox, which is a <vbox>, not on
-                // the <browser id="sidebar">. This lets us delay the actual load until
-                // delayedStartup().
-                sidebarBox.setAttribute(
-                "src", window.opener.document.getElementById("sidebar").getAttribute("src"));
-                mustLoadSidebar = true;
-
-                sidebarBox.hidden = false;
-                document.getElementById("sidebar-splitter").hidden = false;
-                sidebarCmdElem.setAttribute("checked", "true");
-            }
-        }
-    }
-    else {
-        let box = document.getElementById("sidebar-box");
-        if (box.hasAttribute("sidebarcommand")) {
-            let commandID = box.getAttribute("sidebarcommand");
-            if (commandID) {
-                let command = document.getElementById(commandID);
-                if (command) {
-                    mustLoadSidebar = true;
-                    box.hidden = false;
-                    document.getElementById("sidebar-splitter").hidden = false;
-                    command.setAttribute("checked", "true");
-                }
-                else {
-                    // Remove the |sidebarcommand| attribute, because the element it
-                    // refers to no longer exists, so we should assume this sidebar
-                    // panel has been uninstalled. (249883)
-                    box.removeAttribute("sidebarcommand");
-                }
-            }
-        }
-    }
-
-    // Certain kinds of automigration rely on this notification to complete their
-    // tasks BEFORE the browser window is shown.
-    Cc["@mozilla.org/observer-service;1"]
-    .getService(Ci.nsIObserverService)
-    .notifyObservers(null, "browser-window-before-show", "");
-
-    // Set a sane starting width/height for all resolutions on new profiles.
-    if (!document.documentElement.hasAttribute("width")) {
-        let defaultWidth = 994;
-        let defaultHeight;
-        if (screen.availHeight <= 600) {
-            document.documentElement.setAttribute("sizemode", "maximized");
-            defaultWidth = 610;
-            defaultHeight = 450;
-        }
-        else {
-            // Create a narrower window for large or wide-aspect displays, to suggest
-            // side-by-side page view.
-            if (screen.availWidth >= 1600)
-                defaultWidth = (screen.availWidth / 2) - 20;
-            defaultHeight = screen.availHeight - 10;
-            //@line 1058 "e:\builds\moz2_slave\win32_build\build\browser\base\content\browser.js"
-        }
-        document.documentElement.setAttribute("width", defaultWidth);
-        document.documentElement.setAttribute("height", defaultHeight);
-    }
-
-    if (gURLBar &&
-        document.documentElement.getAttribute("chromehidden").indexOf("toolbar") != -1) {
-        gURLBar.setAttribute("readonly", "true");
-        gURLBar.setAttribute("enablehistory", "false");
-    }
-
-    allTabs.readPref();
-
-    setTimeout(delayedStartup, 0, isLoadingBlank, mustLoadSidebar);
-}
-
 
 /**
  * Opens or closes the sidebar identified by commandID.
@@ -352,73 +196,80 @@ if(aios_collapseSidebar && parseInt(aios_appVersion) <= 3) BrowserStartup = func
  *  - group        this attribute must be set to "sidebar".
  */
 if(aios_collapseSidebar) toggleSidebar = function(commandID, forceOpen) {
-
-    var sidebarBox = document.getElementById("sidebar-box");
-    if (!commandID)
-        commandID = sidebarBox.getAttribute("sidebarcommand");
-
-    var sidebarBroadcaster = document.getElementById(commandID);
-    var sidebar = document.getElementById("sidebar"); // xul:browser
-    var sidebarTitle = document.getElementById("sidebar-title");
-    var sidebarSplitter = document.getElementById("sidebar-splitter");
-
-    if (sidebarBroadcaster.getAttribute("checked") == "true") {
-        if (!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;
-            sidebarBox.removeAttribute('hidden');
-            sidebarBox.collapsed = true;
-            // CollapseByStyle-Methode sidebarBox.setAttribute('style', 'display:none;');
-            sidebarSplitter.hidden = true;
-            content.focus();
-        } else {
-            fireSidebarFocusedEvent();
-        }
-        return;
-    }
-
-    // now we need to show the specified sidebar
-
-    // ..but first update the 'checked' state of all sidebar broadcasters
-    var broadcasters = document.getElementsByAttribute("group", "sidebar");
-    for (var i = 0; i < broadcasters.length; ++i) {
-        // skip elements that observe sidebar broadcasters and random
-        // other elements
-        if (broadcasters[i].localName != "broadcaster")
-            continue;
-
-        if (broadcasters[i] != sidebarBroadcaster)
-            broadcasters[i].removeAttribute("checked");
-        else
-            sidebarBroadcaster.setAttribute("checked", "true");
-    }
-
-    //mod by exxile sidebarBox.hidden = false;
-    sidebarBox.removeAttribute('hidden');
-    sidebarBox.removeAttribute('collapsed');
-    // CollapseByStyle-Methode sidebarBox.removeAttribute('style');
-    sidebarSplitter.hidden = false;
-
-    var url = sidebarBroadcaster.getAttribute("sidebarurl");
-    var title = sidebarBroadcaster.getAttribute("sidebartitle");
-    if (!title)
-        title = sidebarBroadcaster.getAttribute("label");
-    sidebar.setAttribute("src", url); // kick off async load
-    sidebarBox.setAttribute("sidebarcommand", sidebarBroadcaster.id);
-    sidebarTitle.value = title;
-
-    // We set this attribute here in addition to setting it on the <browser>
-    // element itself, because the code in BrowserShutdown persists this
-    // attribute, not the "src" of the <browser id="sidebar">. The reason it
-    // does that is that we want to delay sidebar load a bit when a browser
-    // window opens. See delayedStartup().
-    sidebarBox.setAttribute("src", url);
-
-    if (sidebar.contentDocument.location.href != url)
-        sidebar.addEventListener("load", sidebarOnLoad, true);
-    else // older code handled this case, so we do it too
-        fireSidebarFocusedEvent();
+
+  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
+  if(!commandID) return;
+  
+  var sidebarBroadcaster = document.getElementById(commandID);
+  var sidebar = document.getElementById("sidebar"); // xul:browser
+  var sidebarTitle = document.getElementById("sidebar-title");
+  var sidebarSplitter = document.getElementById("sidebar-splitter");
+
+  if (sidebarBroadcaster.getAttribute("checked") == "true") {
+    if (!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;
+      sidebarBox.removeAttribute('hidden');
+      sidebarBox.collapsed = true;
+      // CollapseByStyle-Methode sidebarBox.setAttribute('style', 'display:none;');
+      
+      sidebarSplitter.hidden = true;
+      content.focus();
+    } else {
+      fireSidebarFocusedEvent();
+    }
+    return;
+  }
+
+  // now we need to show the specified sidebar
+
+  // ..but first update the 'checked' state of all sidebar broadcasters
+  var broadcasters = document.getElementsByAttribute("group", "sidebar");
+  for (var i = 0; i < broadcasters.length; ++i) {
+    // skip elements that observe sidebar broadcasters and random
+    // other elements
+    if (broadcasters[i].localName != "broadcaster")
+      continue;
+
+    if (broadcasters[i] != sidebarBroadcaster)
+      broadcasters[i].removeAttribute("checked");
+    else
+      sidebarBroadcaster.setAttribute("checked", "true");
+  }
+
+  //mod by exxile sidebarBox.hidden = false;
+  sidebarBox.removeAttribute('hidden');
+  sidebarBox.removeAttribute('collapsed');
+  // CollapseByStyle-Methode sidebarBox.removeAttribute('style');
+  
+  sidebarSplitter.hidden = false;
+
+  var url = sidebarBroadcaster.getAttribute("sidebarurl");
+  var title = sidebarBroadcaster.getAttribute("sidebartitle");
+  if (!title)
+    title = sidebarBroadcaster.getAttribute("label");
+  sidebar.setAttribute("src", url); // kick off async load
+  sidebarBox.setAttribute("sidebarcommand", sidebarBroadcaster.id);
+  sidebarTitle.value = title;
+
+  // We set this attribute here in addition to setting it on the <browser>
+  // element itself, because the code in BrowserShutdown persists this
+  // attribute, not the "src" of the <browser id="sidebar">. The reason it
+  // does that is that we want to delay sidebar load a bit when a browser
+  // window opens. See delayedStartup().
+  sidebarBox.setAttribute("src", url);
+
+  if (sidebar.contentDocument.location.href != url)
+    sidebar.addEventListener("load", sidebarOnLoad, true);
+  else // older code handled this case, so we do it too
+    fireSidebarFocusedEvent();
 }
\ No newline at end of file
diff --git a/content/aios_tbx.js b/content/aios_tbx.js
index 4cd06ea..a3a7c77 100644
--- a/content/aios_tbx.js
+++ b/content/aios_tbx.js
@@ -1,111 +1,6 @@
 
-/* LÖSCHEN NACH UPDATE AUF FX4 */
-
-/* totaltoolbar.js */
-
-window.addEventListener("load", aios_initTBX, false);
-
-
-/* Onload initialization */
-/* Original: tt_init() => taken from TotalToolbar 1.8b3 by alta88 */
-function aios_initTBX() {
-    if (document.documentElement.getAttribute("windowtype") != "navigator:browser")
-        return;
-
-    var fx_BrowserToolboxCustomizeDone = BrowserToolboxCustomizeDone;
-    BrowserToolboxCustomizeDone = function BrowserToolboxCustomizeDone() {
-        fx_BrowserToolboxCustomizeDone();
-        aios_adjustToolboxWidth(true);
-    }
-
-    aios_adjustToolboxWidth(true);
-}
-
-
-/* Create toolboxes array */
-/* Original: tt_getToolboxes() => taken from TotalToolbar 1.8b3 by alta88 */
-function aios_getToolboxes(aType) {
-    let toolboxes = [];
-
-    if (aType != "statusbar") {
-        let aios_tmpBoxes = document.getElementsByTagName("toolbox");
-        for (let z = 0; z < aios_tmpBoxes.length; z++) {
-            toolboxes.push(aios_tmpBoxes[z]);
-        }
-    }
-
-    return toolboxes;
-}
-
-
-/* Rewritten to pass all toolboxes to the Customize window */
-/* Original: BrowserCustomizeToolbar() => taken from TotalToolbar 1.8b3 by alta88 */
-if(parseInt(aios_appVersion) < 4) BrowserCustomizeToolbar = function(aType) {
-    // Disable the toolbar context menu items.
-    let menubar = document.getElementById("main-menubar");
-    for (let i = 0; i < menubar.childNodes.length; ++i)
-        menubar.childNodes[i].setAttribute("disabled", true);
-
-    let cmd = document.getElementById("cmd_CustomizeToolbars");
-    cmd.setAttribute("disabled", true);
-
-    if(document.getElementById("cmd_CustomizeStatusbar")){
-        cmd = document.getElementById("cmd_CustomizeStatusbar");
-        cmd.setAttribute("disabled", true);
-    }
-
-    // Either statusbar or array of all <toolbox> elements; may be just one item
-    // with gNavToolbox.
-    let toolboxes;
-    if(aType == "statusbar") toolboxes = tt_getToolboxes("statusbar");
-    else toolboxes = aios_getToolboxes("toolbars");
-
-    let splitter = document.getElementById("urlbar-search-splitter");
-    if (splitter)
-        splitter.parentNode.removeChild(splitter);
-
-    let customizeURL = "chrome://global/content/customizeToolbar.xul";
-    gCustomizeSheet = getBoolPref("toolbar.customization.usesheet", false);
-
-    if (gCustomizeSheet) {
-        let sheetFrame = document.getElementById("customizeToolbarSheetIFrame");
-        sheetFrame.hidden = false;
-        sheetFrame.toolbox = toolboxes;
-
-        // The document might not have been loaded yet, if this is the first time.
-        // If it is already loaded, reload it so that the onload initialization code
-        // re-runs.
-        if (sheetFrame.getAttribute("src") == customizeURL)
-            sheetFrame.contentWindow.location.reload()
-        else
-            sheetFrame.setAttribute("src", customizeURL);
-
-        // XXXmano: there's apparently no better way to get this when the iframe is
-        // hidden
-        //let sheetWidth = sheetFrame.style.width.match(/([0-9]+)px/)[1];
-        document.getElementById("customizeToolbarSheetPopup").
-            openPopup(gNavToolbox,
-        "after_start",
-        (window.innerWidth - 0) / 2,
-        0);
-
-        return sheetFrame.contentWindow;
-    }
-    else {
-        let whichBar = aType == "statusbar" ? "CustomizeStatusbar" : "CustomizeToolbar";
-        return window.openDialog(customizeURL,
-        whichBar,
-        "chrome,titlebar,toolbar,location,resizable,dependent",
-        gNavToolbox,
-        toolboxes);
-    }
-}
-
-/*  ENDE LÖSCHEN FX4 */
-
-
 /* Clean up options from root doc for removed or empty toolbars */
-/* Original: handleOptions() => taken from TotalToolbar 1.8b6 by alta88 */
+/* Original: handleOptions() => taken from TotalToolbar 1.8 by alta88 */
 function handleOptions(aType, toolbar, aNavToolbox) {
     if (toolbar.localName != "toolbar")
         return;
@@ -331,25 +226,6 @@ function aios_setToolbarPos(posMode) {
     aios_adjustToolboxWidth(false);
 
     document.getElementById('aios-pos-mitem' + posMode).setAttribute('checked', true);
-
-    // Divider nur anzeigen, wenn auch die Toolbar unmittelbar dort platziert wird
-    if(posMode != 4 && aios_appOS == "Darwin") document.getElementById('aios-sidebardivider-2').setAttribute('hidden', true);
-    else document.getElementById('aios-sidebardivider-2').setAttribute('hidden', false);
-
-    if(posMode != 4) document.getElementById('aios-sidebardivider-3').setAttribute('hidden', true);
-    else document.getElementById('aios-sidebardivider-3').setAttribute('hidden', false);
-    
-    if(posMode != 5) document.getElementById('aios-sidebardivider-4').setAttribute('hidden', true);
-    else document.getElementById('aios-sidebardivider-4').setAttribute('hidden', false);
-
-    // FX 3.6: vertikale Bookmarkleiste? => Attribut entfernen, um es dynamisch per CSS zu setzen
-    if(aios_WIN.document.getElementById('bookmarksBarContent')) {
-        for(var i = 0; i < aios_WIN.aios_toolbar.childNodes.length; i++){
-            if(aios_WIN.aios_toolbar.childNodes[i].id == "personal-bookmarks") {
-                aios_WIN.document.getElementById('bookmarksBarContent')._scrollbox.removeAttribute('orient');
-            }
-        }
-    }
 }
 
 
@@ -456,7 +332,7 @@ function aios_addToolbarMitem(aWhich) {
     // Menuitem erzeugen
     var menuItem = document.createElement("menuitem");
     // toolbarid = TotalToolbar-Fix => ohne wird der Eintrag mehrmals angezeigt, weil das Menü nicht korrekt entleert wird
-    menuItem.setAttribute("toolbarid", 'aios-toolbar');
+    menuItem.setAttribute("toolbarId", 'aios-toolbar');
     menuItem.setAttribute("observes", "aios-viewToolbar");
     menuItem.setAttribute("label", aios_toolbar.getAttribute('toolbarname'));
 
@@ -464,8 +340,9 @@ function aios_addToolbarMitem(aWhich) {
     for(var i = 0; i < mitems.length; i++) {
         // TotalToolbar => unnötige/unerwünschte Menuitems entfernen
         if(mitems[i].tagName == "menuitem") {
-            if(mitems[i].getAttribute('toolbarid') == "aios-toolbar") mitems[i].parentNode.removeChild(mitems[i]);
-            if(mitems[i].getAttribute('toolbarid') == "aios-sbhtoolbar") mitems[i].parentNode.removeChild(mitems[i]);
+            if(mitems[i].getAttribute('toolbarId') == "aios-toolbar") mitems[i].parentNode.removeChild(mitems[i]);
+            if(mitems[i].getAttribute('toolbarId') == "aios-sbhtoolbar") mitems[i].parentNode.removeChild(mitems[i]);
+            if(mitems[i].getAttribute('label') == menuItem.getAttribute("label")) mitems[i].parentNode.removeChild(mitems[i]);
         }
 
         // ersten Separator ermitteln, um gleich den Menüeintrag direkt davor einzufügen
diff --git a/content/aios_tbx_customize.js b/content/aios_tbx_customize.js
index e066136..1f54625 100644
--- a/content/aios_tbx_customize.js
+++ b/content/aios_tbx_customize.js
@@ -1,274 +1,21 @@
 
-/**
- *  All functions below are modified from native Fx Customize code in
- *  ../toolkit/customizeToolbar.js, as of changeset:
- *
- *  40690e93dfc0 2009-06-22 20:29 +0800.
- *
- *  The major changes are to wrap functions in a for(){} loop to handle multiple
- *  toolboxes, to change the reference from the single gToolbox to multiple
- *  toolbox elements within the loop.
- */
-
-/**
- *  All functions taken from TotalToolbar 1.7 by alta88
- */
-
-var navToolbox, gToolboxes, winDoc, gStatusbar, gStatusbarMode;
-
-// Icons im Konfigurationsfenster anzeigen
-if(parseFloat(aios_appVersion) <= 3.6 && aios_appDefTheme && aios_appOS == "Darwin") aios_addCSS("aios_theme_darwin.css", "CustomizeToolbarWindow");
-
-InitWithToolbox = function (aToolbox) {
-    // Get the navToolbox (original toolbox, containing defaults).
-    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-    .getService(Components.interfaces.nsIWindowMediator);
-    var win = wm.getMostRecentWindow("navigator:browser");
-    gStatusbar = win.document.getElementById("status-bar");
-    navToolbox = win.gNavToolbox; //getNavToolbox();
-
-    if (gToolboxSheet) {
-        // Note: if gToolboxSheet (customize dialog in an iframe) then aToolbox is
-        // our array, as there won't be a window; make gToolbox be the navToolbox.
-        gToolbox = navToolbox;
-        gToolboxes = aToolbox;
-        winDoc = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-        .getInterface(Components.interfaces.nsIWebNavigation)
-        .QueryInterface(Components.interfaces.nsIDocShellTreeItem)
-        .rootTreeItem
-        .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-        .getInterface(Components.interfaces.nsIDOMWindow)
-        .document;
-    }
-    else {
-        // Pass the full array of toolboxes as the 2nd argument so as not to
-        // break any other xul app (extension) using customisable toolbars.
-        gToolbox = aToolbox;
-        gToolboxes = (window.arguments && window.arguments.length > 1) ?
-        window.arguments[1] : [aToolbox];
-        winDoc = window.opener.top.document;
-    }
-
-    gStatusbarMode = gToolboxes[0].localName == "statusbar" ? true : false;
-    gToolboxDocument = gToolbox.ownerDocument;
-
-    for(var i = 0; i < gToolboxes.length; i++) {
-        gToolboxes[i].addEventListener("dragstart", onToolbarDragStart, false);
-        gToolboxes[i].addEventListener("dragover", onToolbarDragOver, false);
-        gToolboxes[i].addEventListener("dragleave", onToolbarDragLeave, false);
-        gToolboxes[i].addEventListener("drop", onToolbarDrop, false);
-        // For css styling of min-width etc.
-        gToolboxes[i].customizing = true;
-    }
-
-    if(gStatusbarMode) gToolbox = gStatusbar;
-
-    initDialog();
-}
-
-
-removeToolboxListeners = function () {
-    for(var i = 0; i < gToolboxes.length; i++) {
-        gToolboxes[i].removeEventListener("dragstart", onToolbarDragStart, false);
-        gToolboxes[i].removeEventListener("dragover", onToolbarDragOver, false);
-        gToolboxes[i].removeEventListener("dragleave", onToolbarDragLeave, false);
-        gToolboxes[i].removeEventListener("drop", onToolbarDrop, false);
-        gToolboxes[i].customizing = false;
-    }
-}
-
 
 /**
- * Persist the current set of buttons in all customizable toolbars to
- * localstore.
- */
-//TODO: make reusable function
-function persistCurrentSets() {
-
-    // FX 3.6: vertikale Bookmarkleiste? => Attribut entfernen, um es dynamisch per CSS zu setzen
-    if(aios_WIN.document.getElementById('bookmarksBarContent')) {
-        for(var i = 0; i < aios_WIN.aios_toolbar.childNodes.length; i++){
-            if(aios_WIN.aios_toolbar.childNodes[i].id == "personal-bookmarks") {
-                aios_WIN.document.getElementById('bookmarksBarContent')._scrollbox.removeAttribute('orient');
-            }
-        }
-    }
-
-    if (!gToolboxChanged || gToolboxDocument.defaultView.closed)
-        return;
-
-    var docElt = gToolboxDocument.documentElement;
-
-    for(var j = 0; j < gToolboxes.length; j++) {
-        var toolbox = gToolboxes[j];
-        var len = gStatusbarMode ? gToolboxes.length : gToolboxes[j].childNodes.length;
-
-        var customCount = 0;
-        var toolboxEmpty = true;
-        for(var i = 0; i < len; ++i) {
-            // Look for customizable toolbars that need to be persisted.  If toolbar
-            // added but no buttons, arrays will not have it, so handle |i| node
-            // undefined.
-            var toolbar = gStatusbarMode ? toolbox :
-            toolbox.childElementCount > 0 ? (toolbox.childNodes[i] ?
-                toolbox.childNodes[i] : null) : null;
-            if (isCustomizableToolbar(toolbar)) {
-                // Calculate currentset and store it in the attribute.
-                var currentSet = toolbar.currentSet;
-                toolbar.setAttribute("currentset", currentSet);
-
-                var customIndex = toolbar.hasAttribute("customindex");
-                if (customIndex) {
-                    if (!toolbar.firstChild) {
-                        // Remove custom toolbars whose contents have been removed.
-                        toolbox.removeChild(toolbar);
-                        // Bump count since an item is gone.
-                        i++;
-                    }
-                    else {
-                        toolboxEmpty = false;
-                        if (toolbox.toolbarset.hasAttribute('anonymous')) {
-                            if (currentSet != "__empty") {
-                                // Must persist xbl 'below-tabs' toolbar on the document root
-                                var attrPrefix = '_toolbarset.' +
-                                toolbox.toolbarset.getAttribute('id') + '.toolbar';
-                                docElt.setAttribute(attrPrefix +
-                                    (++customCount), toolbar.toolbarName + ":" + currentSet);
-                                toolbar.setAttribute("customindex", customCount); //adjust count
-                                gToolboxDocument.persist(docElt.id, attrPrefix+customCount);
-                            }
-                        }
-                        else {
-                            // Persist custom toolbar info on the <toolbarset/>
-                            toolbox.toolbarset.setAttribute("toolbar" + (++customCount),
-                                toolbar.toolbarName + ":" + currentSet);
-                            toolbar.setAttribute("customindex", customCount); //adjust count
-                            gToolboxDocument.persist(toolbox.toolbarset.id,
-                                "toolbar" + customCount);
-                        }
-                    }
-                }
-
-                if (!customIndex) {
-                    if (toolbar.firstChild) toolboxEmpty = false;
-                    if (currentSet != "__empty" || toolbar.hasAttribute("defaultset")) {
-                        if (toolbar.hasAttribute('anonymous')) {
-                            // Must persist xbl tabbar toolbars on the document root
-                            var attr = "_toolbar."+toolbar.getAttribute('id')+".currentset";
-                            docElt.setAttribute(attr, currentSet);
-                            gToolboxDocument.persist(gToolboxDocument.documentElement.id, attr);
-                        }
-                    }
-                    else
-                    if (!toolbar.hasAttribute("defaultset"))
-                        toolbar.removeAttribute("currentset");
-                    // Persist the currentset attribute directly on hardcoded toolbars.
-                    gToolboxDocument.persist(toolbar.id, "currentset");
-                }
-            }
-        }
-
-        // Number of remaining toolbars in toolbox
-        toolbox.customToolbarCount = customCount;
-        setAttribute(toolbox, "empty", toolboxEmpty);
-        gToolboxDocument.persist(toolbox.id, "empty");
-
-        // Remove toolbarX attributes from toolbarset for removed toolbars, ie any
-        // entries past those for toolbars already indexed..
-        if (toolbox.toolbarset) {
-            if (toolbox.toolbarset.hasAttribute('anonymous')) {
-                var attrPrefix = '_toolbarset.' +
-                toolbox.toolbarset.getAttribute('id') + '.toolbar';
-                while (docElt.hasAttribute(attrPrefix+(++customCount))) {
-                    docElt.removeAttribute(attrPrefix+customCount);
-                    gToolboxDocument.persist(docElt.id, attrPrefix+customCount);
-                }
-            }
-            else {
-                while (toolbox.toolbarset.hasAttribute("toolbar"+(++customCount))) {
-                    toolbox.toolbarset.removeAttribute("toolbar"+customCount);
-                    gToolboxDocument.persist(toolbox.toolbarset.id, "toolbar"+customCount);
-                }
-            }
-        }
-    }
-}
-
-
-/**
- * Wraps all items in all customizable toolbars in a toolbox.
- */
-wrapToolbarItems = function () {
-    for(var j = 0; j < gToolboxes.length; j++) {
-        var toolbox = gStatusbarMode ? {
-            childNodes: [gToolboxes[0]]
-            } : gToolboxes[j];
-        var len = gToolboxes[j].childNodes.length;
-
-        for(var i = 0; i < len; ++i) {
-            var toolbar = toolbox.childNodes ? toolbox.childNodes[i] : null;
-            if (isCustomizableToolbar(toolbar)) {
-                for(var k = 0; k < toolbar.childNodes.length; ++k) {
-                    var item = toolbar.childNodes[k];
-
-                    // Bug 317062 fix for MacOS
-                    if (item.firstChild && item.firstChild.localName == "menubar")
-                        continue;
-
-                    if (isToolbarItem(item)) {
-                        var wrapper = wrapToolbarItem(item);
-                        cleanupItemForToolbar(item, wrapper);
-                    }
-                }
-            }
-        }
-    }
-}
+ *  Breite der vertikalen Toolbar bei jeder Änderung der Toolbox (Drag 'n Drop) neu definieren
+ **/
+var fx_toolboxChanged = toolboxChanged;
+toolboxChanged = function() {
+    fx_toolboxChanged();
+    aios_WIN.aios_adjustToolboxWidth();
+};
 
 
 /**
- * Unwraps all items in all customizable toolbars in a toolbox.
- */
-unwrapToolbarItems = function () {
-    for(var j = 0; j < gToolboxes.length; j++) {
-        var toolbox = gToolboxes[j];
-
-        var paletteItems = toolbox.getElementsByTagName("toolbarpaletteitem");
-        var paletteItem;
-        while ((paletteItem = paletteItems.item(0)) != null) {
-            var toolbarItem = paletteItem.firstChild;
-
-            if (paletteItem.hasAttribute("itemdisabled"))
-                toolbarItem.disabled = true;
-
-            if (paletteItem.hasAttribute("itemcommand"))
-                toolbarItem.setAttribute("command", paletteItem.getAttribute("itemcommand"));
-
-            if (paletteItem.hasAttribute("itemhidden"))
-                toolbarItem.hidden = true;
-
-            if (paletteItem.hasAttribute("itemcollapsed"))
-                toolbarItem.collapsed = true;
-
-            // Remove label child from statusbarpanel item, if added..
-            if (paletteItem.hasAttribute("itemlabelled")) {
-                if (toolbarItem.className == "statusbarpanel-iconic-text")
-                    toolbarItem.removeAttribute("label");
-                else
-                    toolbarItem.removeChild(toolbarItem.lastChild);
-            }
-
-            // Restore style if any, remove forced display
-            toolbarItem.removeAttribute("style");
-            if (paletteItem.hasAttribute("itemstyle"))
-                toolbarItem.setAttribute("style", paletteItem.getAttribute("itemstyle"));
-
-            paletteItem.parentNode.replaceChild(toolbarItem, paletteItem);
-        }
-    }
-
-    if(gStatusbarMode)
-        winDoc.getElementById("tt-statusbar-spacer").setAttribute("flex", 1);
+ *  Positionierung des Dialogs unter Mac OS X verhindern
+ **/
+if(aios_appOS != "Darwin") repositionDialog = function(aWindow) {
+    // Always use persisted dimensions and position!
+    return;
 }
 
 
@@ -276,90 +23,52 @@ unwrapToolbarItems = function () {
  * 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();
 
-    aios_WIN.aios_setToolbarPos(1);
-    aios_WIN.aios_toolbar.setAttribute('flexbuttons', 'false');
-
-    var docElt = gToolboxDocument.documentElement;
-
-    for(var i = 0; i < gToolboxes.length; i++) {
-        var toolbox = gToolboxes[i];
-
-        if (!gStatusbarMode) {
-            // Remove all of the customized toolbars.
-            var child = toolbox.lastChild;
-            while(child) {
-                if (child.hasAttribute("customindex")) {
-
-                    var thisChild = child;
-                    child = child.previousSibling;
-                    thisChild.currentSet = "__empty";
-                    toolbox.removeChild(thisChild);
-                } else {
-                    child = child.previousSibling;
-                }
-            }
-        }
-
-        if(gStatusbarMode) {
-            unwrapToolbarItems();
-            tt_resetStatusbar();
+    // 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;
         }
-        else {
-            // Restore the default icon size and mode - meaning Fx main toolbox if none
-            var defaultMode = toolbox.hasAttribute("defaultmode") ?
-            toolbox.getAttribute("defaultmode") :
-            (navToolbox ? navToolbox.getAttribute("defaultmode") : null);
-            var defaultIconsSmall = toolbox.hasAttribute("defaulticonsize") ?
-            (toolbox.getAttribute("defaulticonsize") == "small" ?
-                "small" : "large") :
-            (navToolbox ? (navToolbox.getAttribute("defaulticonsize") == "small" ?
-                "small" : "large") : "small");
+    });
 
-            setAttribute(toolbox, "iconsize", defaultIconsSmall);
-            gToolboxDocument.persist(toolbox.id, "iconsize");
-            document.getElementById("smallicons").checked = defaultIconsSmall == "small";
-            document.getElementById("smallicons").disabled = (defaultMode == "text" ? true : false);
-            setAttribute(toolbox, "mode", defaultMode);
-            gToolboxDocument.persist(toolbox.id, "mode");
-            document.getElementById("modelist").value = defaultMode;
-
-            // Restore the defaultset for fixed toolbars.
-            var toolbar = toolbox.firstChild;
-            while (toolbar) {
-                if (isCustomizableToolbar(toolbar)) {
-                    var defaultSet = toolbar.getAttribute("defaultset");
-                    if (defaultSet || defaultSet == "")
-                        toolbar.currentSet = defaultSet;
-                    //Toolbox has custom binding, otherwise it's some other 3rd party toolbox
-                    if (typeof toolbar.parentNode.setToolbarIconSize == "function")
-                        toolbar.parentNode.setToolbarIconSize(toolbar, defaultIconsSmall);
-                    else
-                    if (toolbar.getAttribute("currentset") != "__empty") {
-                        setAttribute(toolbar, "iconsize", defaultIconsSmall);
-                        gToolboxDocument.persist(toolbar.id, "iconsize");
-                    }
+    // mod by exxile: Werte für AiOS-Toolbar zurücksetzen => bevor defaultset zurückgesetzt 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;
 
-                    // Toolbox has custom binding, otherwise it's some other 3rd party toolbox
-                    if (typeof toolbar.parentNode.setToolbarMode == "function")
-                        toolbar.parentNode.setToolbarMode(toolbar, defaultMode);
-                    else
-                    if (toolbar.getAttribute("currentset") != "__empty") {
-                        setAttribute(toolbar, "mode", defaultMode);
-                        gToolboxDocument.persist(toolbar.id, "mode");
-                    }
-                }
-                // Show nav-bar and bookmarks toolbar if hidden
-                if (toolbar.id == "nav-bar" || toolbar.id == "PersonalToolbar")
-                    toolbar.removeAttribute("collapsed");
+        // Remove any contextmenu options.
+        aios_WIN.handleOptions("remove", toolbar, gToolbox);
+    });
 
-                toolbar = toolbar.nextSibling;
-            }
-        }
-    }
+    // Restore the default icon size and mode.
+    document.getElementById("smallicons").checked = (updateIconSize() == "small");
+    document.getElementById("modelist").value = updateToolbarMode();
 
     // Now rebuild the palette.
     buildPalette();
@@ -368,81 +77,7 @@ restoreDefaultSet = function () {
     wrapToolbarItems();
 
     toolboxChanged("reset");
-}
-
-
-updateIconSize = function (aUseSmallIcons, localDefault) {
-    gToolboxIconSize = aUseSmallIcons ? "small" : "large";
-
-    for(var j = 0; j < gToolboxes.length; j++) {
-        var toolbox = gToolboxes[j];
-
-        setAttribute(toolbox, "iconsize", gToolboxIconSize);
-        gToolboxDocument.persist(toolbox.id, "iconsize");
 
-        for(var i = 0; i < toolbox.childNodes.length; ++i) {
-            var toolbar = toolbox.childNodes[i];
-            if (isCustomizableToolbar(toolbar)) {
-                //Toolbox has custom binding, otherwise it's some other 3rd party toolbox
-                if (typeof toolbar.parentNode.setToolbarIconSize == "function")
-                    toolbar.parentNode.setToolbarIconSize(toolbar, gToolboxIconSize);
-                else {
-                    var toolbarIconSize = (localDefault &&
-                        toolbar.hasAttribute("defaulticonsize")) ?
-                    toolbar.getAttribute("defaulticonsize") : gToolboxIconSize;
-                    setAttribute(toolbar, "iconsize", toolbarIconSize);
-                    gToolboxDocument.persist(toolbar.id, "iconsize");
-                }
-            }
-        }
-    }
-
-    aios_WIN.aios_adjustToolboxWidth();
-}
-
-
-updateToolbarMode = function (aModeValue, localDefault) {
-
-    for(var j = 0; j < gToolboxes.length; j++) {
-        var toolbox = gToolboxes[j];
-
-        setAttribute(toolbox, "mode", aModeValue);
-        gToolboxDocument.persist(toolbox.id, "mode");
-
-        for (var i = 0; i < toolbox.childNodes.length; ++i) {
-            var toolbar = toolbox.childNodes[i];
-            if (isCustomizableToolbar(toolbar)) {
-                // Toolbox has custom binding, otherwise it's some other 3rd party toolbox
-                if (typeof toolbar.parentNode.setToolbarMode == "function")
-                    toolbar.parentNode.setToolbarMode(toolbar, aModeValue);
-                else {
-                    var toolbarMode = (localDefault &&
-                        toolbar.hasAttribute("defaultmode")) ?
-                    toolbar.getAttribute("defaultmode") : aModeValue;
-                    setAttribute(toolbar, "mode", toolbarMode);
-                    gToolboxDocument.persist(toolbar.id, "mode");
-                }
-            }
-        }
-    }
-
-    var iconSizeCheckbox = document.getElementById("smallicons");
-    iconSizeCheckbox.disabled = aModeValue == "text";
-
-    aios_WIN.aios_adjustToolboxWidth();
-}
-
-function isCustomizableToolbar(aElt) {
-    return (aElt) && ((aElt.localName == "toolbar" && aElt.getAttribute("customizable")) ||
-        aElt.localName == "statusbar");
-}
-
-
-/**
- *  Breite der vertikalen Toolbar bei jeder Änderung der Toolbox (Drag 'n Drop) neu definieren
- **/
-var fx_toolboxChanged = toolboxChanged;
-toolboxChanged = function() {
-    fx_toolboxChanged();
-    aios_WIN.aios_adjustToolboxWidth();
-};
\ No newline at end of file
+    // mod by exxile: Iconsize der Sidebarheader-Toolbar zurücksetzen => nachdem die globale Größe zurückgesetzt wurde
+    aios_WIN.document.getElementById('aios-sbhtoolbar').setAttribute('iconsize', 'small');
+}
\ No newline at end of file
diff --git a/content/aios_tbx_customize_fx4.js b/content/aios_tbx_customize_fx4.js
deleted file mode 100644
index 96f8bed..0000000
--- a/content/aios_tbx_customize_fx4.js
+++ /dev/null
@@ -1,89 +0,0 @@
-
-/**
- *  Icons im Konfigurationsfenster anzeigen
- **/
-if(parseFloat(aios_appVersion) >= 3.7 && aios_appDefTheme && aios_appOS == "Darwin") aios_addCSS("aios_theme_darwin_fx4.css", "CustomizeToolbarWindow");
-if(parseFloat(aios_appVersion) >= 3.7 && aios_appDefTheme && aios_appOS == "Linux") aios_addCSS("aios_theme_linux.css", "CustomizeToolbarWindow");
-
-
-/**
- *  Breite der vertikalen Toolbar bei jeder Änderung 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.8b6 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 für AiOS-Toolbar zurücksetzen => bevor defaultset zurückgesetzt 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 zurücksetzen => nachdem die globale Größe zurückgesetzt wurde
-    aios_WIN.document.getElementById('aios-sbhtoolbar').setAttribute('iconsize', 'small');
-}
\ No newline at end of file
diff --git a/content/bm_hi.js b/content/bm_hi.js
index ea22173..481bb9d 100644
--- a/content/bm_hi.js
+++ b/content/bm_hi.js
@@ -128,8 +128,7 @@ function aios_sidebarLayout() {
     var attr, i;
 
     // CSS für Sidebar-Optimierungen aktivieren
-    aios_managerWindow.setAttribute('aiosLayout', true);
-    aios_addCSS("bmhi_layout.css", aios_managerWindow);
+    aios_addCSS("places.css", aios_managerWindow);
 
     var searchObj = document.getElementById("search-box");
 
diff --git a/content/bm_hi.xul b/content/bm_hi.xul
index 462a6c9..87a47e4 100644
--- a/content/bm_hi.xul
+++ b/content/bm_hi.xul
@@ -3,7 +3,6 @@
 <!-- locale -->
 <!DOCTYPE overlay [
     <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd"> %browserDTD;
-    <!ENTITY % historyDTD SYSTEM "chrome://browser/locale/history/history.dtd"> %historyDTD;
     <!ENTITY % libDTD SYSTEM "chrome://aios/locale/lib.dtd"> %libDTD;
 ]>
 
@@ -16,7 +15,7 @@
 
     <page id="history-panel" persist="width height screenX screenY" title="&historyButton.label;" windowtype="aiosGlobal:History" />
 
-    <textbox id="search-box" tooltiptext="&find.label;" />
+    <textbox id="search-box" tooltiptext="&search.label;" />
 
     <hbox id="places-toolbar">
         <stringbundleset id="propSet">
diff --git a/content/bm_hi_fx4.xul b/content/bm_hi_fx4.xul
deleted file mode 100644
index 87a47e4..0000000
--- a/content/bm_hi_fx4.xul
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- locale -->
-<!DOCTYPE overlay [
-    <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd"> %browserDTD;
-    <!ENTITY % libDTD SYSTEM "chrome://aios/locale/lib.dtd"> %libDTD;
-]>
-
-<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/bm_hi.js" />
-
-    <page id="bookmarksPanel" persist="width height screenX screenY" title="&bookmarksButton.label;" windowtype="aiosGlobal:Bookmarks" />
-
-    <page id="history-panel" persist="width height screenX screenY" title="&historyButton.label;" windowtype="aiosGlobal:History" />
-
-    <textbox id="search-box" tooltiptext="&search.label;" />
-
-    <hbox id="places-toolbar">
-        <stringbundleset id="propSet">
-            <stringbundle id="propSetStrings" src="chrome://aios/locale/lib.properties" />
-        </stringbundleset>
-
-        <button id="closeFolder" insertbefore="viewButton" oncommand="aios_closeFolder();"
-			label="&closeFolder.label;" tooltiptext="&closeFolder.label;" />
-
-        <button id="viewButton" type="menu" label="&menu.tools.label;">
-
-            <menupopup id="viewPopUp">
-
-                <menuitem id="aios-enableAutoClose" type="checkbox" checked="false" persist="checked" autocheck="false"
-					label="&enable.autoClose.label;" oncommand="aios_toggleElement(this); event.stopPropagation();" />
-
-                <menuitem id="aios-rememberFolder" type="checkbox" checked="false" persist="checked" autocheck="false"
-					label="&enable.rememberFolder.label;" oncommand="aios_toggleElement(this); event.stopPropagation();" />
-
-                <menuitem id="aios-scrollToFolder" type="checkbox" checked="false" persist="checked" autocheck="false"
-					label="&enable.scrollToFolder.label;" oncommand="aios_toggleElement(this); event.stopPropagation();" />
-
-                <menuseparator id="close-separator" />
-
-                <menuitem id="aios-viewClose" type="checkbox" checked="false" persist="checked" autocheck="false"
-					label="&show.closeFolder.label;" aiosChilds="closeFolder"
-					oncommand="aios_toggleElement(this); event.stopPropagation();" />
-
-            </menupopup>
-
-        </button>
-
-    </hbox>
-
-</overlay>
\ No newline at end of file
diff --git a/content/console.js b/content/console.js
index d168961..da187c5 100644
--- a/content/console.js
+++ b/content/console.js
@@ -14,9 +14,7 @@ function aios_init() {
     try {
         var enable_layout = aios_gPrefBranch.getBoolPref("co.layout");
         var enable_layoutall = aios_gPrefBranch.getBoolPref("co.layoutall");
-        var enable_colors = aios_gPrefBranch.getBoolPref("co.colors");
-        var enable_slim = aios_gPrefBranch.getBoolPref("co.slim");
-		
+
         var aios_inSidebar = (top.document.getElementById('sidebar-box')) ? true : false;
     }
     catch(e) { }
@@ -26,22 +24,7 @@ function aios_init() {
     
     // für CSS-Zwecke speichern
     aios_appInfo(conWindow);
-	
-    // Fenster auf Fokus überwachen => unterschiedliche Farben für Darwin
-    if(aios_inSidebar && aios_appOS == "Darwin" && top.aios_notifyActive) top.aios_notifyActive();
-	
-    // Farben aktivieren?
-    if(enable_colors) {
-        conWindow.setAttribute('aiosColors', true);
-        aios_addCSS("_coloredlist.css", conWindow);
-    }
-	
-    // Slim-List aktivieren?
-    if(enable_slim) {
-        conWindow.setAttribute('aiosSlim', true);
-        aios_addCSS("_slimlist.css", conWindow);
-    }
-	
+    
     // Layout-Optimierungen aktivieren?
     if((enable_layout && aios_inSidebar) || enable_layoutall) aios_sidebarLayout();
 
@@ -56,8 +39,7 @@ function aios_init() {
 */
 function aios_sidebarLayout() {
 
-    conWindow.setAttribute('aiosLayout', true);
-    aios_addCSS("console_layout.css", conWindow);
+    aios_addCSS("console.css", conWindow);
 	
     // Fx-Error-Console
     if(conWindow.id == "JSConsoleWindow") {
@@ -75,10 +57,14 @@ function aios_sidebarLayout() {
             }
         }
 		
-        // Label der Buttons unsichtbar machen
+        // Label der Buttons unsichtbar machen => nur wenn es Icons gibt
         var cStyle = document.defaultView.getComputedStyle(document.getElementById('Console:modeAll'), '');
-        if(cStyle.listStyleImage && cStyle.listStyleImage != "none") {
-            if(document.getElementById('ToolbarMode')) document.getElementById('ToolbarMode').setAttribute("hideLabel", true);
-        }
+    }
+    else if (conWindow.id == "Console2Window") {
+        var cStyle = document.defaultView.getComputedStyle(document.getElementById('item_modeAll'), '');
+    }
+    
+    if(cStyle && cStyle.listStyleImage && cStyle.listStyleImage != "none") {
+        if(document.getElementById('ToolbarMode')) document.getElementById('ToolbarMode').setAttribute("hideLabel", true);
     }
 }
\ No newline at end of file
diff --git a/content/downloads.js b/content/downloads.js
new file mode 100644
index 0000000..5fbe31a
--- /dev/null
+++ b/content/downloads.js
@@ -0,0 +1,250 @@
+
+window.addEventListener("DOMContentLoaded", aios_init, false);
+
+var aios_managerWindow, aios_posElem, aios_Interval;
+var aios_IntervalCount = 0;
+
+var aios_inSidebar = (top.document.getElementById('sidebar-box')) ? true : false;
+
+var aios_loc = window.location.href;
+
+
+/* Fix für Clean-Button im Downloads-Panel */
+if(aios_inSidebar && aios_loc.indexOf('downloads.xul') > 0) {
+    window.arguments = [];
+}
+
+function aios_init() {
+    var enable_sidebar, enable_count, enable_layout, enable_layoutall;
+
+    // Menüleiste unter Mac OS X ausblenden
+    aios_hideMacMenubar();
+
+    aios_managerWindow = document.getElementById("downloadManager");
+    aios_posElem = document.getElementById("downloadView");
+    
+    // für CSS-Zwecke speichern
+    aios_appInfo(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");
+    }
+    catch(e) {
+        return false;
+    }
+
+    // Sidebar-Layout
+    if((enable_layout && aios_inSidebar) || enable_layoutall) aios_sidebarLayout();
+
+    // Elemente zaehlen und anzeigen
+    if(enable_count) {
+        aios_countItems();	// der Aufruf ist nötig, wenn die Downloads-Liste leer ist (sonst wird keine 0 angezeigt)
+		
+        // sorgt dafür, dass bei neuen Downloads oder neuen Add-on-Installationen der Titel aktualisiert wird
+        try {
+            window.addEventListener("DOMNodeInserted", aios_countItems, true);
+            window.addEventListener("DOMNodeRemoved", aios_countItems, true);
+            window.addEventListener("DOMAttrModified", function(e){
+                if(e.originalTarget.tagName == "richlistitem" && e.attrName == "state") {
+                    //alert(e.attrName);
+                    if(e.originalTarget.getAttribute('state') == "1") {
+                        aios_countItems();
+                    }
+                }
+            }, true);
+        } catch(ex) { }
+    }
+    else {
+        // Zahl im Titel entfernen
+        // => nötig nur direkt nach der Deaktivierung der Option, weil im Broadcaster die Anzahl gespeichert ist
+        if(top.document.getElementById('sidebar-title')) {
+            var title = top.document.getElementById('sidebar-title').getAttribute("value");
+			
+            if(title.indexOf(" [") > 0) {
+                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(document.getElementById("searchbox")) window.setTimeout('document.getElementById("searchbox").focus()', 50);
+
+    // Tastaturkürzel entfernen, um nicht die des Hauptbrowsers zu blockieren
+    if(aios_inSidebar) aios_removeAccesskeys();
+
+    return true;
+}
+
+
+/*
+	aktiviert das an die Sidebar angepasste Layout
+		=> Aufruf durch aios_init()
+*/
+function aios_sidebarLayout() {
+    var cmdBar, i;
+
+    // CSS für Sidebar-Optimierungen aktivieren
+    aios_addCSS("downloads.css", aios_managerWindow);
+	
+    cmdBar = document.getElementById("search");
+
+    // Toolbar nach oben versetzen
+    aios_managerWindow.insertBefore(cmdBar, aios_posElem);
+	
+	
+    // Buttons durch Toolbarbuttons ersetzen
+    //if(aios_WIN.aios_appDefTheme) {
+    var tbChilds = cmdBar.childNodes;
+    var tbutton, tobserver;
+    for(i = 0; i < tbChilds.length; i++) {
+			
+        if(tbChilds[i].tagName == "button") {
+            tbutton = document.createElement("toolbarbutton");
+				
+            for(var j = 0; j < tbChilds[i].attributes.length; j++) {
+                tbutton.setAttribute(tbChilds[i].attributes[j].name, tbChilds[i].attributes[j].value);
+            }
+
+            tbChilds[i].parentNode.replaceChild(tbutton, tbChilds[i]);
+        }
+    }
+//}
+}
+
+
+/*
+	zählt und zeigt die aktivierten und deaktivierten Extensions im Sidebartitel an
+		=> Aufruf durch aios_init()
+*/
+function aios_countItems() {
+    if(!aios_WIN.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.");
+        li_count = li_gPrefBranch.getBoolPref("showManagerTotals");
+        if(li_count) return false;
+        else Local_Install.setWindowTitle = function(){};
+    }
+	
+    // bisherigen Titel feststellen
+    var newTitle;
+    var origTitle = "";
+    if(aios_WIN.document.getElementById("viewDownloadsSidebar")) origTitle = aios_WIN.document.getElementById("viewDownloadsSidebar").getAttribute('label');
+	
+    if(document.getElementById("viewGroup")) {
+        if(document.getElementById("viewGroup").selectedItem) {
+            var viewTitle = document.getElementById("viewGroup").selectedItem.getAttribute('label');
+            origTitle = origTitle + " - " + viewTitle;
+        }
+    }
+	
+    // Elemente zaehlen
+    //var exts = aios_filterItems(aios_boxElem.childNodes, function(c){ return c.nodeName == "richlistitem" });
+    var exts = aios_filterItems();
+	
+    var str_count = "";
+    
+    var list_downloading = 0;
+    var list_done = 0;
+    var list_failed = 0;
+
+    for(var i = 0; i < exts.length; i++) {
+        var state = exts[i].getAttribute('state');
+
+        // downloading => starting + downloading + paused + downloading
+        if(state == "-1" || state == "0" || state == "4" || state == "5") list_downloading++;
+        
+        // done => done
+        if(state == "1") list_done++;
+        
+        // failed => failed + canceled
+        if(state == "2" || state == "3") list_failed++;
+    }
+    
+    str_count = list_done;
+    if(list_downloading > 0 || list_failed > 0) str_count = str_count + "/" + list_downloading;
+    if(list_failed > 0) str_count = str_count + "/" + list_failed;
+
+    newTitle = origTitle + " [" + str_count + "]";
+	
+    // Titel und Label setzen
+    document.title = newTitle;
+	
+    if(top.document.getElementById('sidebar-title')) top.document.getElementById('sidebar-title').setAttribute("value", newTitle);
+	
+    // Sidebartitel im Broadcaster speichern, damit er beim Schließen/öffnen der Sidebar wiederhergestellt werden kann
+    if(aios_inSidebar) aios_WIN.document.getElementById("viewDownloadsSidebar").setAttribute('sidebartitle', newTitle);
+	
+    return true;
+}
+
+
+/*
+	Original-Code by Caio Chassot
+		Slim_Extension_List_0.1
+		http://v2studio.com/k/moz/
+
+		=> 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;
+}*/
+function aios_filterItems() {
+    var r = [];
+    var childs;
+	
+    childs = document.getElementById("downloadView").childNodes;
+   	
+    for (var i = 0; i < childs.length; i++) {
+        if (childs[i].nodeName == "richlistitem" && childs[i].getAttribute('hidden') != "true") {
+            r.push(childs[i]);
+        }
+    }
+	
+    return r;
+}
+
+
+/*
+	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;
+	
+    var newTitle;
+    var origTitle = aios_WIN.document.getElementById("viewDownloadsSidebar").getAttribute('label');
+	
+    var viewTitle;
+	
+    // Label des zukünftigen Panels (ausgelöst nur durch Klick auf Radio-Button)
+    if(typeof aObj == "object") viewTitle = aObj.getAttribute('label');
+    // Label des selektierten Radio-Buttons
+    else if(document.getElementById("viewGroup")) viewTitle = document.getElementById("viewGroup").selectedItem.getAttribute('label');
+	
+    newTitle = origTitle + " - " + viewTitle;
+	
+    // Titel und Label setzen
+    //document.title = newTitle;
+	
+    if(!top.document.getElementById('sidebar-title')) return false;
+    top.document.getElementById('sidebar-title').setAttribute("value", newTitle);
+	
+    // Sidebartitel im Broadcaster speichern, damit er beim Schließen/öffnen der Sidebar wiederhergestellt werden kann
+    if(aios_inSidebar) aios_WIN.document.getElementById("viewDownloadsSidebar").setAttribute('sidebartitle', newTitle);
+	
+    return true;
+}
\ No newline at end of file
diff --git a/content/downloads.xul b/content/downloads.xul
index 0af7408..75a4852 100644
--- a/content/downloads.xul
+++ b/content/downloads.xul
@@ -3,7 +3,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/addons_downloads.js" />
+    <script type="application/x-javascript" src="chrome://aios/content/downloads.js" />
     
     <window id="downloadManager">
         <hbox id="aios-search" insertbefore="downloadView" />
diff --git a/content/multipanel.js b/content/multipanel.js
index 43fa860..b3a767c 100644
--- a/content/multipanel.js
+++ b/content/multipanel.js
@@ -21,14 +21,8 @@ function aios_init() {
 
     window.setTimeout(aios_setSSR, 50);
     
-    // Listener für Browser => Quelltext aktualisieren
-    if(top.gBrowser && top.gBrowser.addProgressListener) top.gBrowser.addProgressListener(aiosProgListener, Components.interfaces.nsIWebProgress.NOTIFY_STATE_DOCUMENT);
-    
     // für CSS-Zwecke speichern
     aios_appInfo(document.getElementById('webpanels-window'));
-
-    // Fenster auf Fokus überwachen => unterschiedliche Farben für Darwin
-    if(aios_inSidebar && aios_appOS == "Darwin" && top.aios_notifyActive) top.aios_notifyActive();
 }
 
 
@@ -93,9 +87,8 @@ var panelProgressListener = {
 
 
 /*
-	Öffnet im MultiPanel die im Browser angezeigte Webseite oder den Quelltext
-		=> Aufruf durch Buttons, aios_panelTab() und
-			 aios_onLocationChange() wenn Quelltext autom. aktualisiert wird (aiosProgListener)
+	Öffnet im MultiPanel die im Browser angezeigte Webseite
+		=> Aufruf durch Buttons, aios_panelTab()
 */
 function aios_setMultiPanel(aMode) {
     var label, panelLoc;
@@ -210,7 +203,7 @@ function aios_setSBLabel() {
 function aios_setSSR() {
     //if(!aios_getBoolean("ssr-mitem", "checked")) return false;
     
-    var ssrURL = "chrome://aios/skin/multipanel_ssr.css";
+    var ssrURL = "chrome://aios/skin/css/multipanel_ssr.css";
 
     try {
         var doc = webPanel.contentDocument;
diff --git a/content/multipanel.xul b/content/multipanel.xul
index 2df3e3d..1e4a47a 100644
--- a/content/multipanel.xul
+++ b/content/multipanel.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!-- skin -->
-<?xml-stylesheet href="chrome://aios/skin/multipanel.css"?>
+<?xml-stylesheet href="chrome://aios/skin/css/multipanel.css"?>
 
 <!-- locale -->
 <!DOCTYPE overlay [ 
diff --git a/content/pageinfo.js b/content/pageinfo.js
index 9f26b1a..e21cd91 100644
--- a/content/pageinfo.js
+++ b/content/pageinfo.js
@@ -5,13 +5,14 @@ var aios_inTab = (aios_WIN.aiosLastSelTab) ? true : false;
 // Listener für automatische Aktualisierung hinzufügen u. entfernen
 if(aios_inSidebar) {
     window.addEventListener("load", function(e) {
-        top.gBrowser.addProgressListener(aiosProgListener, Components.interfaces.nsIWebProgress.NOTIFY_STATE_DOCUMENT);
+        top.gBrowser.addProgressListener(aiosProgListener);
     }, false);
 
     window.addEventListener("unload",function(e) {
         top.gBrowser.removeProgressListener(aiosProgListener);
     }, false);
 }
+
 
 
 function aios_init() {
@@ -20,10 +21,7 @@ function aios_init() {
     
     // für CSS-Zwecke speichern
     aios_appInfo(document.getElementById('main-window'));
-    
-    // Fenster auf Fokus überwachen => unterschiedliche Farben für Darwin
-    if(aios_inSidebar && aios_appOS == "Darwin" && top.aios_notifyActive) top.aios_notifyActive();
-	
+
     try {
         var enable_layout = aios_gPrefBranch.getBoolPref("pi.layout");
         var enable_layoutall = aios_gPrefBranch.getBoolPref("pi.layoutall");
@@ -32,7 +30,10 @@ function aios_init() {
     catch(e) { }
 
     // Tastaturkürzel entfernen, um nicht die des Hauptbrowsers zu blockieren
-    if(aios_inSidebar) aios_removeAccesskeys();
+    if(aios_inSidebar) aios_removeAccesskeys();
+    
+    //alert(document.getElementById('topBar').clientWidth);
+    //document.getElementById('metatree').getElementsByTagName('treechildren')[0].style.maxWidth = document.getElementById('topBar').clientWidth + "px";
 }
 
 
@@ -40,10 +41,9 @@ function aios_sidebarLayout() {
     var vbox;
 
     // CSS für Sidebar-Optimierungen aktivieren
-    document.getElementById('main-window').setAttribute('aiosLayout', true);
-    aios_addCSS("pageinfo_layout.css", "main-window");
+    aios_addCSS("pageinfo.css", "main-window");
 	
-    // Label der Radio-Buttons unsichtbar machen
+    // Label der Radio-Buttons unsichtbar machen => nur wenn es Icons gibt
     var cStyle = document.defaultView.getComputedStyle(document.getElementById('generalTab'), '');
     if(cStyle.listStyleImage && cStyle.listStyleImage != "none") {
         if(document.getElementById('viewGroup')) document.getElementById('viewGroup').setAttribute("hideLabel", true);
@@ -136,13 +136,10 @@ function onLoadPageInfo() {
     gStrings.mediaEmbed = gBundle.getString("mediaEmbed");
     gStrings.mediaLink = gBundle.getString("mediaLink");
     gStrings.mediaInput = gBundle.getString("mediaInput");
-  
-    if(parseInt(aios_appVersion) > 3) {
-        //@line 292 "e:\builds\moz2_slave\rel-cen-w32-bld\build\browser\base\content\pageinfo\pageInfo.js"
-        gStrings.mediaVideo = gBundle.getString("mediaVideo");
-        gStrings.mediaAudio = gBundle.getString("mediaAudio");
+    //@line 292 "e:\builds\moz2_slave\rel-cen-w32-bld\build\browser\base\content\pageinfo\pageInfo.js"
+    gStrings.mediaVideo = gBundle.getString("mediaVideo");
+    gStrings.mediaAudio = gBundle.getString("mediaAudio");
     //@line 295 "e:\builds\moz2_slave\rel-cen-w32-bld\build\browser\base\content\pageinfo\pageInfo.js"
-    }
 
     var args = "arguments" in window &&
     window.arguments.length >= 1 &&
diff --git a/content/pageinfo.xul b/content/pageinfo.xul
index fd0d788..d3baf1b 100644
--- a/content/pageinfo.xul
+++ b/content/pageinfo.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!-- skin -->
-<?xml-stylesheet href="chrome://aios/skin/pageinfo.css"?>
+<?xml-stylesheet href="chrome://aios/skin/css/pageinfo.css"?>
 
 <overlay id="pageInfoOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	
diff --git a/content/prefs/overlay_main.xul b/content/prefs/overlay_main.xul
index de873fd..c9a5052 100644
--- a/content/prefs/overlay_main.xul
+++ b/content/prefs/overlay_main.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!-- skin -->
-<?xml-stylesheet href="chrome://aios/skin/prefs.css"?>
+<?xml-stylesheet href="chrome://aios/skin/css/prefs.css"?>
 
 <!-- locale -->
 <!DOCTYPE prefwindow [
diff --git a/content/prefs/prefs.js b/content/prefs/prefs.js
index 97fce0e..92e5da3 100644
--- a/content/prefs/prefs.js
+++ b/content/prefs/prefs.js
@@ -31,7 +31,7 @@ function aios_initPrefs() {
         extra2.setAttribute('popup', 'aios-settings-popup');
         extra2.setAttribute('dir', 'reverse');
     }
-
+    
     // abhängige Elemente aktivieren oder deaktivieren
     aios_checkDependent();
 
@@ -56,11 +56,6 @@ function aios_initPrefs() {
 
     // alte Prefs löschen
     aios_deleteOldPrefs();
-
-    if(parseInt(aios_appVersion) > 3) {
-        document.getElementById("emlayout_fx4").setAttribute("hidden", true);
-        document.getElementById("emslimcolors_fx4").setAttribute("hidden", true);
-    }
 }
 
 
@@ -412,11 +407,6 @@ function aios_advancedMode(trigger) {
 		window.resizeTo(window.outerWidth, window.outerHeight - diff);
 	}*/
 
-    if(parseInt(aios_appVersion) > 3) {
-        document.getElementById("emlayout_fx4").setAttribute("hidden", true);
-        document.getElementById("emslimcolors_fx4").setAttribute("hidden", true);
-    }
-    
     window.sizeToContent();
 }
 
@@ -680,7 +670,7 @@ function aios_checkApply(aPref) {
 */
 function aios_deleteOldPrefs() {
 
-    var oldPrefs = new Array('stop_reload', 'toggle_findbar', 'sort_extensions', 'count_extensions', 'sidebar_extensions', 'sort_themes', 'count_themes', 'sidebar_themes', 'sort_downloads', 'count_downloads', 'sidebar_downloads', 'webpanel.remembersite', 'webpanel.rememberSite', 'lastBookmarkFolder', 'lastHistoryFolder', 'scrollToLastFolder', 'reselectLastFolder', 'showToolbar', 'jsconsolefilter', 'acbh.enable', 'acbh.rememberFolder', 'acbh.scrollToFolder', 'acbh.showButtons', 'em.link.cs-CZ', 'em.link.de-DE', 'em.link.en-US1', 'em.link.en-US2', 'em.link.en-US3', 'em.link.es-ES', 'em.link.fr-FR', 'em.link.hu-HU', 'em.link.it-IT', 'em.link.ja-JP', 'em.link.ko-KR', 'em.link.nl-NL', 'em.link.pl-PL', 'em.link.pt-BR', 'em.link.ru-RU', 'em.link.sv-SE', 'em.link.tr-TR', 'em.link.zh-CN', 'tm.link.en-US1', 'tm.link.en-US2', 'bookmarks.shift', 'em.link.moz', 'em.link.extroom', 'em.link.extmirror', 'em.link.brazil', 'em.link.chinese', 'em.link.czech', 'em.link.dutch', 'em.link.french', 'em.link.german', 'em.link.hungarian', 'em.link.italian', 'em.link.japanese', 'em.link.korean', 'em.link.polish', 'em.link.russian', 'em.link.spanish', 'em.link.swedish', 'tm.link.moz', 'tm.link.extmirror', 'menus.tools.options', 'scrollToLastFolder', 'jscon.filter', 'jscon.categories', 'spec.toggleFindbar', 'spec.stopReload', 'changelog.show', 'menus.context.gotop', 'menus.context.gobottom', 'menus.context.urltools', 'menus.context.dlembed', 'menus.context.gcache', 'menus.context.wayback', 'menus.context.whois', 'gen.switch.athin', 'menus.context.source', 'menus.context.submenu', 'menus.context.webpanel', 'menus.context.pageinfo', 'menus.sidebar.paneltab', 'bookmarks.paneltab', 'em.sort', 'tm.sidebar', 'tm.sort', 'tm.layout', 'tm.slim', 'tm.count', 'tm.colors', 'tm.tools', 'tm.link', 'tm.custom', 'menus.context.entries', 'menus.context.icons', 'menus.context.panels', 'menus.tools.entries', 'menus.tools.icons', 'menus.tools.prefs', 'tbx.tabbar', 'tbx.statusbar', 'dm.tools', 'dm.sort', 'em.tools', 'em.link', 'em.custom', 'do.sidebar', 'bm.tools', 'hi.tools', 'ps.sidebar');
+    var oldPrefs = new Array('em.layout', 'em.layoutall', 'em.slim', 'em.colors', 'dm.slim', 'dm.colors', 'co.slim', 'co.colors');
 
     for(var i = 0; i < oldPrefs.length; i++) {
         try {
diff --git a/content/prefs/prefs.xul b/content/prefs/prefs.xul
index 3b455a7..e8e89a9 100644
--- a/content/prefs/prefs.xul
+++ b/content/prefs/prefs.xul
@@ -3,7 +3,7 @@
 <!-- skin -->
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-<?xml-stylesheet href="chrome://aios/skin/prefs.css"?>
+<?xml-stylesheet href="chrome://aios/skin/css/prefs.css"?>
 
 <!-- locale -->
 <!DOCTYPE prefwindow [
@@ -61,7 +61,7 @@
         <script type="application/x-javascript" src="chrome://aios/content/prefs/general.js"/>
 
         <preferences>
-            <preference id="sidebarOrient"      type="int"          name="extensions.aios.gen.orient" />
+            <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" />
@@ -140,7 +140,7 @@
 
 <!-- Orientation -->
                         <groupbox>
-                            <caption label="&gen.orient.caption; *" />
+                            <caption label="&gen.orient.caption;" />
 
                             <grid flex="1">
                                 <columns>
@@ -249,9 +249,6 @@
                         </groupbox>
 
                     </vbox>
-                    
-                    <spacer flex="1" />
-                    <description value="* &restart;" style="margin-top: 10px;" />
 
                 </tabpanel>
 
@@ -569,14 +566,9 @@
             <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="DMColors" 		type="bool" 	name="extensions.aios.dm.colors" />
-            <preference id="DMSlim" 		type="bool" 	name="extensions.aios.dm.slim" />
             <preference id="DMCount" 		type="bool" 	name="extensions.aios.dm.count" />
 
             <preference id="EMOpen" 		type="bool" 	name="extensions.aios.em.sidebar" />
-            <preference id="EMLayout" 		type="bool" 	name="extensions.aios.em.layout" />
-            <preference id="EMColors" 		type="bool" 	name="extensions.aios.em.colors" />
-            <preference id="EMSlim" 		type="bool" 	name="extensions.aios.em.slim" />
             <preference id="EMCount" 		type="bool" 	name="extensions.aios.em.count" />
 
             <preference id="BMOpen" 		type="bool" 	name="extensions.aios.bm.sidebar" />
@@ -589,8 +581,6 @@
             <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="COColors" 		type="bool" 	name="extensions.aios.co.colors" />
-            <preference id="COSlim" 		type="bool" 	name="extensions.aios.co.slim" />
 
             <preference id="PanelTabReverse" 	type="bool" 	name="extensions.aios.paneltab.reverse" />
             <preference id="PanelTabBMM" 	type="bool" 	name="extensions.aios.paneltab.bm" />
@@ -673,11 +663,6 @@
                         <groupbox>
                             <caption label="&tab.gen.appearance;" />
                             <checkbox preference="DMCount" label="&misc.count.label;" />
-
-                            <vbox aiosAdvanced="true">
-                                <checkbox preference="DMSlim" label="&misc.slim.label;" />
-                                <checkbox preference="DMColors" label="&misc.colors.label;" />
-                            </vbox>
                         </groupbox>
 
                     </vbox>
@@ -695,23 +680,12 @@
 
                         <groupbox>
                             <caption label="&tab.gen.behavior;" />
-                            <checkbox preference="EMOpen" label="&misc.enablesidebar.label; *" aiosChilds="EMLayout" oncommand="aios_checkboxObserver(this);" />
-
-                            <vbox class="indent" aiosAdvanced="true" id="emlayout_fx4">
-                                <checkbox preference="EMLayout" label="&misc.layout.label;" />
-                            </vbox>
+                            <checkbox preference="EMOpen" label="&misc.enablesidebar.label; *" oncommand="aios_checkboxObserver(this);" />
                         </groupbox>
 
                         <groupbox>
                             <caption label="&tab.gen.appearance;" />
-
                             <checkbox preference="EMCount" label="&misc.count.label;" />
-
-                            <vbox aiosAdvanced="true" id="emslimcolors_fx4">
-                                <checkbox preference="EMSlim" label="&misc.slim.label;" />
-                                <checkbox preference="EMColors" label="&misc.colors.label;" />
-                            </vbox>
-
                         </groupbox>
 
                     </vbox>
@@ -761,9 +735,6 @@
                             <vbox class="indent" aiosAdvanced="true">
                                 <checkbox preference="COLayout" label="&misc.layout.label;" />
                             </vbox>
-
-                            <checkbox preference="COSlim" label="&misc.slim.label;" />
-                            <checkbox preference="COColors" label="&misc.colors.label;" aiosAdvanced="true" />
                         </groupbox>
 
                     </vbox>
@@ -865,4 +836,9 @@
 
     <prefpane id="aiosKeys" label="&tab.keys;" flex="1" src="chrome://aios/content/prefs/keys.xul" />
 
+
+<!-- A B O U T -->
+
+    <prefpane id="aiosAbout" label="&tab.about;" flex="1" src="chrome://aios/content/abouttabs.xul" />
+
 </prefwindow>
\ No newline at end of file
diff --git a/defaults/preferences/aios.js b/defaults/preferences/aios.js
index f879d1f..91605b8 100644
--- a/defaults/preferences/aios.js
+++ b/defaults/preferences/aios.js
@@ -1,12 +1,5 @@
 
 /*
- *  Fx
- **/
-pref("browser.download.manager.showWhenStarting", false); // because AiOS takes control over the downloads manager
-pref("browser.download.manager.closeWhenDone", false);    // - ^^ -
-
-
-/*
  *  AiOS
  **/
 pref("extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description", "chrome://aios/locale/lib.properties");
@@ -64,15 +57,9 @@ pref("extensions.aios.dm.layout", true);
 pref("extensions.aios.dm.layoutall", false);
 pref("extensions.aios.dm.autoopen", true);
 pref("extensions.aios.dm.autoclose", false);
-pref("extensions.aios.dm.colors", true);
-pref("extensions.aios.dm.slim", true);
 pref("extensions.aios.dm.count", true);
 
 pref("extensions.aios.em.sidebar", true);
-pref("extensions.aios.em.layout", true);
-pref("extensions.aios.em.layoutall", false);
-pref("extensions.aios.em.colors", true);
-pref("extensions.aios.em.slim", true);
 pref("extensions.aios.em.count", true);
 
 pref("extensions.aios.bm.sidebar", true);
@@ -92,8 +79,6 @@ pref("extensions.aios.pi.layoutall", false);
 pref("extensions.aios.co.sidebar", true);
 pref("extensions.aios.co.layout", true);
 pref("extensions.aios.co.layoutall", false);
-pref("extensions.aios.co.colors", true);
-pref("extensions.aios.co.slim", true);
 
 
 /*
diff --git a/icon.png b/icon.png
index 6e32b92..456ed9d 100644
Binary files a/icon.png and b/icon.png differ
diff --git a/install.rdf b/install.rdf
index 6e968bf..67069e7 100644
--- 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.13</em:version>
+        <em:version>0.7.15</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>3.6</em:minVersion>
-                <em:maxVersion>4.0.*</em:maxVersion>
+                <em:minVersion>11.0</em:minVersion>
+                <em:maxVersion>12.*</em:maxVersion>
             </Description>
             
         </em:targetApplication>
diff --git a/locale/ar-SA/about.dtd b/locale/ar-SA/about.dtd
index 0224808..84fcff4 100644
--- a/locale/ar-SA/about.dtd
+++ b/locale/ar-SA/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "إعدادات…">
 <!ENTITY close "إغلاق">
 <!ENTITY tab.about "حول">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "المساهمين">
 <!ENTITY tab.trans "المترجمين">
 <!ENTITY about.desc "The All-in-One Sidebar يمكنك من فتح نوافذ عدة كلوحة شريط جانبي, والتبديل بينهم بسرعة. بالإضافة إلى العلامات والتاريخ يمكنك من فتح نوافذ مثل التنزيلات الإضافات وأكثر في شريط جانبي.">
+<!ENTITY create.desc "created by Ingo Wennemaring, Hamburg [Germany]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "الصفحة الرئيسية - كثير من المعلومات في مكان واحد">
 <!ENTITY about2.name "المميزات - جميع مميزات All-in-One Sidebar">
 <!ENTITY about3.name "FAQ - الأسئلة والأجوبة الشائعة">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "المنتدى - مناقشة, إبلاغ عن أخطاء, وتعديل السمات للتطبيق">
 <!ENTITY about6.name "Changelog - التعديلات على التطبيق">
 <!ENTITY about7.name "To-do - تطويرات للبرنامج">
-<!ENTITY create.desc "created by Ingo Wennemaring, Hamburg [Germany]">
 <!ENTITY contrib.desc "أشكر المطورين التالين على مساعدتهم وإلهامهم [بالترتيب الأبجدي]:">
 <!ENTITY contrib.thanks "Last but not least I thank all users who helped by testing the development builds, reporting bugs in the forum, sharing their ideas and suggestions or who writes just a nice comment. :-) Thank you very much!">
 <!ENTITY trans.desc "المترجمين لـ All-in-One Sidebar [ترتيب أبجدي]:">
diff --git a/locale/ar-SA/prefs.dtd b/locale/ar-SA/prefs.dtd
index 54e98da..2bf12ff 100644
--- a/locale/ar-SA/prefs.dtd
+++ b/locale/ar-SA/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "القوائم">
 <!ENTITY tab.menus.sidebar "الشريط الجانبي">
 <!ENTITY tab.keys "اختصارات">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "التحويل">
 <!ENTITY gen.orient.label "اظهر شريط الأدوات على">
 <!ENTITY gen.orient.left "الجانب الأيسر">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "تأثير التغيرات في نافذة جديدة فقط">
 <!ENTITY keyconfig.onreset "إعادة تشغيل المتصغح مطلوبة">
 <!ENTITY keyconfig.unrecognized "غير معرف ($1)">
-<!ENTITY keyconfig.used "المفتاح مستقدم بالفعل من قبل: \n\n\t$1\n\nIt قد يعمل, بالرغم من ذلك.">
+<!ENTITY keyconfig.used "المفتاح مستقدم بالفعل من قبل: \\n\\n\\t$1\\n\\nIt قد يعمل, بالرغم من ذلك.">
 <!ENTITY menus.sidebar.desc "تخصيص المدخلات في القائمة “عرض > الشريط الجانبي” والقوائم المنسدلة في الشريط الجانبي للأزرار.">
 <!ENTITY menus.icons.label "اظهر الأيقونات">
 <!ENTITY menus.entries.label "عرض المدخلات">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "إظهار الشريط الجانبي للتحميل عند تنزيل ملف">
 <!ENTITY misc.dm.autoclose.label "إغلقه عند إنهاء جميع التنزيلات">
 <!ENTITY misc.colors.label "تمكن الخلفيات الملونة على أساس الوضع الحالي">
-<!ENTITY misc.slim.label "تمكين القائمة الرشيقة">
 <!ENTITY misc.count.label "عرض عدد الأصناف">
 <!ENTITY misc.enablelink.tooltip "إضغط هنا لمعلومات أكثر (رابط FAQs)">
 <!ENTITY misc.paneltab.reverse "بدل إجرائات Left-click و Middle-click">
diff --git a/locale/be-BY/about.dtd b/locale/be-BY/about.dtd
index e3ce4f0..037e828 100644
--- a/locale/be-BY/about.dtd
+++ b/locale/be-BY/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Налады…">
 <!ENTITY close "Зачыніць">
 <!ENTITY tab.about "Інфармацыя аб пашырэнні">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Удзельнікі праекту">
 <!ENTITY tab.trans "Перакладнікі">
 <!ENTITY about.desc "The All-in-One Sidebar lets you open various windows as sidebar panels, and quickly switch between them. So it put an end to the window chaos! In addition to bookmarks and history it opens dialogues such as downloads, add-ons and more in the sidebar.">
+<!ENTITY create.desc "Аўтар пашырэння: Ingo Wennemaring, Гамбург [Нямеччына]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Хатняя старонка, якая змяшчае вялікая колькасць інфармацыі аб пашырэнні">
 <!ENTITY about2.name "Спіс усіх магчымасцяў пашырэння All-in-One Sidebar">
 <!ENTITY about3.name "Часта зададзеныя пытанні (FAQ) і адказы">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Форум — абмеркаванні, паведамленні аб памылках, іншая інфармацыя">
 <!ENTITY about6.name "Спіс змен і гісторыя старых версій пашырэння">
 <!ENTITY about7.name "Планы на будучыню — спіс планаваных новых магчымасцяў і ўдасканаленняў">
-<!ENTITY create.desc "Аўтар пашырэння: Ingo Wennemaring, Гамбург [Нямеччына]">
 <!ENTITY contrib.desc "Я дзякую наступных распрацоўнікаў за натхняльныя ідэі і фрагменты зыходнага кода (у алфавітным парадку):">
 <!ENTITY contrib.thanks "Апошнімі, але не ў апошнюю чаргу я дзякую ўсіх карыстачоў, якія дапамагалі ў тэставанні якія распрацоўваюцца зборак, паведамлялі аб памылках на форуме, дзяліліся сваімі ідэямі і прапановамі або проста пісалі добрыя каментары. :-) Вялікае дзякуй!">
 <!ENTITY trans.desc "Перакладнікі All-in-One Sidebar:">
diff --git a/locale/be-BY/lib.dtd b/locale/be-BY/lib.dtd
index 6975a2c..32eabd8 100644
--- 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
index 8ca9d3a..9adccdd 100644
--- a/locale/be-BY/lib.properties
+++ b/locale/be-BY/lib.properties
@@ -1,7 +1,7 @@
 extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description=Sidebar control with award-winning user experience!
 bm_hi.search.blur=Search…
 prefs.confirm=Вы ўпэўненыя, што жадаеце аднавіць налады па змаўчанні?
-prefs.import=Вы ўпэўненыя, што жадаеце імпартаваць гэтыя налады?\n\n
+prefs.import=Вы ўпэўненыя, што жадаеце імпартаваць гэтыя налады?\\n\\n
 prefs.save=Экспарт налад
 prefs.open=Імпарт налад
 prefs.copy=Settings copied to Clipboard.
diff --git a/locale/be-BY/prefs.dtd b/locale/be-BY/prefs.dtd
index d066685..453af48 100644
--- a/locale/be-BY/prefs.dtd
+++ b/locale/be-BY/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Меню">
 <!ENTITY tab.menus.sidebar "Бакавая панэль">
 <!ENTITY tab.keys "Гарачыя клавішы">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Размяшчэнне бакавой панэлі">
 <!ENTITY gen.orient.label "Адчыняць бакавую панэль">
 <!ENTITY gen.orient.left "злева">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Змены закранаюць толькі новыя вокны">
 <!ENTITY keyconfig.onreset "Патрабуецца перазагрузка браўзэра">
 <!ENTITY keyconfig.unrecognized "Неапазнаны ($1)">
-<!ENTITY keyconfig.used "Гэты ключ ужо выкарыстоўваецца: \n\n\t$1\n\nХотя, гэта можа ўсё жа працаваць.">
+<!ENTITY keyconfig.used "Гэты ключ ужо выкарыстоўваецца: \\n\\n\\t$1\\n\\nХотя, гэта можа ўсё жа працаваць.">
 <!ENTITY menus.sidebar.desc "Налада складу меню &#8220;Выгляд > Бакавая панэль&#8221; і выпадальнага меню кнопак бакавой панэлі.">
 <!ENTITY menus.icons.label "Паказваць значкі">
 <!ENTITY menus.entries.label "Паказваць радкі">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Show the Downloads sidebar when downloading a file">
 <!ENTITY misc.dm.autoclose.label "Close it when all downloads are finished">
 <!ENTITY misc.colors.label "Выкарыстаць каляровыя фоны, заснаваныя на бягучым стане">
-<!ENTITY misc.slim.label "Выкарыстаць кампактны спіс">
 <!ENTITY misc.count.label "Паказваць лік элементаў">
 <!ENTITY misc.enablelink.tooltip "Націсніце тут, каб атрымаць больш інфармацыі (спасылка на FAQ)">
 <!ENTITY misc.paneltab.reverse "Змяняць месцамі дзеянне левай і сярэдняй кнопак мышы">
diff --git a/locale/cs-CZ/about.dtd b/locale/cs-CZ/about.dtd
index 71775e4..6104710 100644
--- a/locale/cs-CZ/about.dtd
+++ b/locale/cs-CZ/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Možnosti…">
 <!ENTITY close "Zavřít">
 <!ENTITY tab.about "Obecně">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Vývoj">
 <!ENTITY tab.trans "Lokalizace">
 <!ENTITY about.desc "The All-in-One Sidebar lets you open various windows as sidebar panels, and quickly switch between them. So it put an end to the window chaos! In addition to bookmarks and history it opens dialogues such as downloads, add-ons and more in the sidebar.">
+<!ENTITY create.desc "vytvořil Ingo Wennemaring v Hamburku [Německo]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Domovská stránkka - mnoho informací na jednom místě">
 <!ENTITY about2.name "Vlastnosti - popis vlastností rozšíření All-in-One Sidebar">
 <!ENTITY about3.name "FAQ - často kladené dotazy a odpovědi">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Fórum - diskuze, hlášení chyb, atd.">
 <!ENTITY about6.name "Přehled změn - co, kdy a jak se změnilo v průběhu vývoje">
 <!ENTITY about7.name "Úkolník - seznam plánovaných dovedností a vylepšení">
-<!ENTITY create.desc "vytvořil Ingo Wennemaring v Hamburku [Německo]">
 <!ENTITY contrib.desc "Děkuji těmto vývojářům za inspiraci a ústřižky kódu (abecední řazení):">
 <!ENTITY contrib.thanks "Děkuji i všem uživatelům, kteří pomáhali s testováním vývojových verzí, odhalovali jejich chyby, sdíleli své nápady či jen do fóra psali komentáře :-). Děkuji vám všem!">
 <!ENTITY trans.desc "Děkuji těmto lokalizátorům (abecední řazení dle zkráceného značení jazyka):">
diff --git a/locale/cs-CZ/lib.dtd b/locale/cs-CZ/lib.dtd
index 8b2262e..e44496c 100644
--- 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
index fb04b48..0586933 100644
--- a/locale/cs-CZ/lib.properties
+++ b/locale/cs-CZ/lib.properties
@@ -1,7 +1,7 @@
 extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description=Sidebar control with award-winning user experience!
 bm_hi.search.blur=Search…
-prefs.confirm=Skutečně si přejete obnovit výchozí nastavení rozšíření "All-in-One Sidebar" ?
-prefs.import=Skutečně si přejete importovat tato nastavení rozšíření "All-in-One Sidebar"
+prefs.confirm=Skutečně si přejete obnovit výchozí nastavení rozšíření \"All-in-One Sidebar\" ?
+prefs.import=Skutečně si přejete importovat tato nastavení rozšíření \"All-in-One Sidebar\"
 prefs.save=Exportovat nastavené
 prefs.open=Importovat nastavení
 prefs.copy=Settings copied to Clipboard.
diff --git a/locale/cs-CZ/prefs.dtd b/locale/cs-CZ/prefs.dtd
index db0a165..e0b3241 100644
--- a/locale/cs-CZ/prefs.dtd
+++ b/locale/cs-CZ/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Nabídky">
 <!ENTITY tab.menus.sidebar "Nabídky nástrojových lišt">
 <!ENTITY tab.keys "Klávesové zkratky">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Umístění">
 <!ENTITY gen.orient.label "Zobrazovat postranní lišty">
 <!ENTITY gen.orient.left "vlevo">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Změny se projeví až v nově otevřených oknech">
 <!ENTITY keyconfig.onreset "Vyžaduje restart prohlížeče">
 <!ENTITY keyconfig.unrecognized "Nerozpoznáno ($1)">
-<!ENTITY keyconfig.used "Tato klávesová zkratka je už použita pro: \n\n\t$1">
+<!ENTITY keyconfig.used "Tato klávesová zkratka je už použita pro: \\n\\n\\t$1">
 <!ENTITY menus.sidebar.desc "Nastavení položek v nabídce „Zobrazit > Nástrojové lišty“ a v místních nabídkách nástrojových lišt.">
 <!ENTITY menus.icons.label "Zobrazit ikony">
 <!ENTITY menus.entries.label "Zobrazit položky">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Show the Downloads sidebar when downloading a file">
 <!ENTITY misc.dm.autoclose.label "Close it when all downloads are finished">
 <!ENTITY misc.colors.label "Povolit barevné pozadí odpovídající současnému stavu">
-<!ENTITY misc.slim.label "Šetřit mísem zúžením položek">
 <!ENTITY misc.count.label "Zobrazit počet položek">
 <!ENTITY misc.enablelink.tooltip "Pro zobrazení dalších informací klepněte zde (odkaz na FAQ)">
 <!ENTITY misc.paneltab.reverse "Zaměnit akce pro levé a pravé tlačítko myši">
diff --git a/locale/da/about.dtd b/locale/da/about.dtd
index 5a0c847..cbc5bb2 100644
--- a/locale/da/about.dtd
+++ b/locale/da/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Indstillinger…">
 <!ENTITY close "Luk">
 <!ENTITY tab.about "Om">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Bidragydere">
 <!ENTITY tab.trans "Oversættere">
 <!ENTITY about.desc "The All-in-One Sidebar lets you open various windows as sidebar panels, and quickly switch between them. So it put an end to the window chaos! In addition to bookmarks and history it opens dialogues such as downloads, add-ons and more in the sidebar.">
+<!ENTITY create.desc "skabt af Ingo Wennemaring, Hamburg [Tyskland]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Hjemmeside - mange informationer i en side">
 <!ENTITY about2.name "Faciliteter - alle Alt-I-En Sidebjælkens faciliteter">
 <!ENTITY about3.name "OSS - Ofte stillede spørgsmål og svar">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Forum - diskussioner, fejlrapporter og tema-rettelser blandt andre ting">
 <!ENTITY about6.name "Ændringslog - historik og ændringer">
 <!ENTITY about7.name "Skal-gøres - planlagte features og forbedringer">
-<!ENTITY create.desc "skabt af Ingo Wennemaring, Hamburg [Tyskland]">
 <!ENTITY contrib.desc "Tak til følgende udviklere for inspiration og kodestumper (alfabetisk orden):">
 <!ENTITY contrib.thanks "Sidst men ikke mindst, en stor tak til alle brugere der har hjulpet med test af udviklingsversioner, fejlrapporteret i forummet, delt deres idéer og forslag eller blot skrevet en venlig hilsen. :-) Mange tak!">
 <!ENTITY trans.desc "Oversætterne af Alt-I-En Sidebjælke (alfabetisk orden efter sprogakronym):">
diff --git a/locale/da/lib.dtd b/locale/da/lib.dtd
index 7f3b134..0946ffa 100644
--- 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
index 5744e75..bd28e53 100644
--- a/locale/da/lib.properties
+++ b/locale/da/lib.properties
@@ -1,7 +1,7 @@
 extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description=Sidebjælke-kontrol med prisvindende brugeroplevelse!
 bm_hi.search.blur=Søg…
 prefs.confirm=Er du sikker på at du vil genetablere standardindstillingerne for Alt-i-En sidebjælken?
-prefs.import=Er du sikker på at du vil importere disse indstillinger for Alt-i-En sidebjælken?\n\n
+prefs.import=Er du sikker på at du vil importere disse indstillinger for Alt-i-En sidebjælken?\\n\\n
 prefs.save=Eksportindstillinger
 prefs.open=Importindstillinger
 prefs.copy=Settings copied to Clipboard.
diff --git a/locale/da/prefs.dtd b/locale/da/prefs.dtd
index e8736bd..752847c 100644
--- a/locale/da/prefs.dtd
+++ b/locale/da/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menuer">
 <!ENTITY tab.menus.sidebar "Sidebjælke">
 <!ENTITY tab.keys "Genveje">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Orientering">
 <!ENTITY gen.orient.label "Vis sidebjælke på">
 <!ENTITY gen.orient.left "venstre side">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Ændringer påvirker kun nye vinduer">
 <!ENTITY keyconfig.onreset "Browsergenstart påkrævet">
 <!ENTITY keyconfig.unrecognized "Ikke genkendt ($1)">
-<!ENTITY keyconfig.used "Denne tast bruges allerede af: \n\n\t$1\n\nDet kan dog godt være den virker alligevel.">
+<!ENTITY keyconfig.used "Denne tast bruges allerede af: \\n\\n\\t$1\\n\\nDet kan dog godt være den virker alligevel.">
 <!ENTITY menus.sidebar.desc "Tilpas elementerne i menuen &#8220;Vis > Sidebjælke&#8221; og i rullegardin-menuer for sidebjælke-knapperne.">
 <!ENTITY menus.icons.label "Vis ikoner">
 <!ENTITY menus.entries.label "Vis elementer">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Show the Downloads sidebar when downloading a file">
 <!ENTITY misc.dm.autoclose.label "Close it when all downloads are finished">
 <!ENTITY misc.colors.label "Slå farvede baggrunde til baseret på nuværende tilstand">
-<!ENTITY misc.slim.label "Slå slank liste til">
 <!ENTITY misc.count.label "Vis antal emner">
 <!ENTITY misc.enablelink.tooltip "Klik her for mere information (link til FAQ's)">
 <!ENTITY misc.paneltab.reverse "Ombyt venstreklik- og midterklik-handlinger">
diff --git a/locale/de/about.dtd b/locale/de/about.dtd
index 3f19788..4badc90 100644
--- a/locale/de/about.dtd
+++ b/locale/de/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Einstellungen…">
 <!ENTITY close "Schließen">
 <!ENTITY tab.about "Über">
+<!ENTITY tab.help "Hilfe">
 <!ENTITY tab.contrib "Mitwirkende">
 <!ENTITY tab.trans "Übersetzer">
 <!ENTITY about.desc "Die All-in-One Sidebar ermöglicht die Anzeige diverser Fenster als Paneele in der Sidebar und macht so Schluss mit dem Chaos! Zusätzlich zu den Lesezeichen und der Chronik lassen sich nun z.B. auch die Downloads und Add-ons (Erweiterungen) in der Sidebar anzeigen.">
+<!ENTITY create.desc "Idee und Umsetzung von Ingo Wennemaring, Hamburg [DE]">
+<!ENTITY help.desc "Auf der Webseite dieser Erweiterung finden Sie viele Informationen, die Ihnen weiterhelfen können:">
 <!ENTITY about1.name "Startseite - viele Informationen auf einen Blick (engl.)">
 <!ENTITY about2.name "Funktionen - alle Funktionen der All-in-One Sidebar (engl.)">
 <!ENTITY about3.name "FAQ - häufig gestellte Fragen und Antworten (engl.)">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Forum - Diskussionen, Meldung von Fehlern, Theme-Kompatibilität u.a. (engl.)">
 <!ENTITY about6.name "Vergangenheit - Historie und Veränderungen (engl.)">
 <!ENTITY about7.name "Zukunft - geplante Funktionen und Verbesserungen (engl.)">
-<!ENTITY create.desc "Idee und Umsetzung von Ingo Wennemaring, Hamburg [DE]">
 <!ENTITY contrib.desc "Für Inspirationen und Codeschnipsel bedanke ich mich bei folgenden Entwicklern (alphabetische Reihenfolge):">
 <!ENTITY contrib.thanks "Ich möchte mich nicht zuletzt bei allen Benutzern bedanken, die die Beta-Versionen testen, die Fehler im Forum melden, mir ihre Ideen und Vorschläge mitteilen oder einfach einen netten Kommentar schreiben. :-) Vielen Dank!">
 <!ENTITY trans.desc "Die Übersetzer der All-in-One Sidebar (alphabetische Reihenfolge der Sprachkennung):">
diff --git a/locale/de/prefs.dtd b/locale/de/prefs.dtd
index 7dcc57f..d36fd47 100644
--- a/locale/de/prefs.dtd
+++ b/locale/de/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menüs">
 <!ENTITY tab.menus.sidebar "Sidebarmenüs">
 <!ENTITY tab.keys "Tastaturkürzel">
+<!ENTITY tab.about "Über/Hilfe">
 <!ENTITY gen.orient.caption "Ausrichtung">
 <!ENTITY gen.orient.label "Sidebar auf der">
 <!ENTITY gen.orient.left "linken Seite">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Die Download-Sidebar anzeigen, wenn ein Download startet">
 <!ENTITY misc.dm.autoclose.label "Die Download-Sidebar schließen, wenn alle Downloads abgeschlossen sind">
 <!ENTITY misc.colors.label "Einträge gemäß Status farblich markieren">
-<!ENTITY misc.slim.label "Kompakte Liste">
 <!ENTITY misc.count.label "Anzahl der Elemente anzeigen">
 <!ENTITY misc.enablelink.tooltip "Klicken Sie hier um mehr Informationen zu erhalten (Link zu den FAQs)">
 <!ENTITY misc.paneltab.reverse "Funktionen für Links- und Mittelklick vertauschen">
diff --git a/locale/el/about.dtd b/locale/el/about.dtd
index 4807291..4bfc513 100644
--- a/locale/el/about.dtd
+++ b/locale/el/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Ρυθμίσεις…">
 <!ENTITY close "Κλείσιμο">
 <!ENTITY tab.about "Περί">
+<!ENTITY tab.help "Βοήθεια">
 <!ENTITY tab.contrib "Συντελεστές">
 <!ENTITY tab.trans "Μεταφραστές">
 <!ENTITY about.desc "Το All-in-One Sidebar σας επιτρέπει να ανοίξετε διαλόγους σε πλευρικές στήλες και να τις εναλλάσσετε γρήγορα. Βάζει έτσι τέλος στο χάος διαφόρων διαλόγων αφού ανοίγει σε πλευρική στήλη εκτός από σελιδοδείκτες και ιστορικό και διαλόγους όπως των λήψεων, των πρόσθετων και πολλών άλλων.">
+<!ENTITY create.desc "δημιουργήθηκε από τον Ingo Wennemaring, Αμβούργο (Γερμανία)">
+<!ENTITY help.desc "Θα βρείτε πολλές πληροφορίες για αυτό το πρόσθετο στη σελίδα:">
 <!ENTITY about1.name "Αρχική σελίδα - όλες οι πληροφορίες με μια ματιά">
 <!ENTITY about2.name "Χαρακτηριστικά - όλα τα χαρακτηριστικά του All-in-One Sidebar">
 <!ENTITY about3.name "Συχνές ερωτήσεις - συχνές ερωτήσεις και οι απαντήσεις τους">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Φόρουμ -συζητήσεις, αναφορές προβλημάτων, διορθώσεις θεμάτων κ.α.">
 <!ENTITY about6.name "Ιστορικό αλλαγών - καταγραφή ιστορικού και αλλαγών">
 <!ENTITY about7.name "Υπόψη - βελτιώσεις και χαρακτηριστικά μελλοντικών εκδόσεων">
-<!ENTITY create.desc "δημιουργήθηκε από τον Ingo Wennemaring, Αμβούργο (Γερμανία)">
 <!ENTITY contrib.desc "Ευχαριστώ τους ακόλουθους δημιουργούς για την έμπνευση και τμήματα κώδικα (αλφαβητική σειρά)">
 <!ENTITY contrib.thanks "Τέλος, ευχαριστώ όλους τους χρήστες που βοήθησαν στον έλεγχο των υπό ανάπτυξη εκδόσεων, ανέφεραν προβλήματα στο φόρουμ, κατέθεσαν τις ιδέες και τις προτάσεις τους, ή απλά έγραψαν ένα καλό σχόλιο.:-) Σας ευχαριστώ πολύ!">
 <!ENTITY trans.desc "Οι μεταφραστές του All-in-One Sidebar (σε αλφαβητική σειρά γλώσσας):">
diff --git a/locale/el/prefs.dtd b/locale/el/prefs.dtd
index fde8d1d..061d563 100644
--- a/locale/el/prefs.dtd
+++ b/locale/el/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Μενού">
 <!ENTITY tab.menus.sidebar "Μενού πλευρικής στήλης">
 <!ENTITY tab.keys "Συντομεύσεις">
+<!ENTITY tab.about "Περί/Βοήθεια">
 <!ENTITY gen.orient.caption "Προσανατολισμός">
 <!ENTITY gen.orient.label "Προβολή πλευρικής στήλης σε">
 <!ENTITY gen.orient.left "Αριστερή πλευρά">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Οι αλλαγές αφορούν μόνο  νέα παράθυρα">
 <!ENTITY keyconfig.onreset "Απαιτείται επανεκκίνηση του περιηγητή">
 <!ENTITY keyconfig.unrecognized "Δεν αναγνωρίζεται">
-<!ENTITY keyconfig.used "Αυτό το πλήκτρο χρησιμοποιείται ήδη από το: \n\n\t$1\n\n ίσως όμως να λειτουργήσει.">
+<!ENTITY keyconfig.used "Αυτό το πλήκτρο χρησιμοποιείται ήδη από το: \\n\\n\\t$1\\n\\n ίσως όμως να λειτουργήσει.">
 <!ENTITY menus.sidebar.desc "Προσαρμόστε το μενού «Προβολή>Πλευρική στήλη» και τα αναδυόμενα μενού των κουμπιών πλευρικών στηλών.">
 <!ENTITY menus.icons.label "Προβολή εικόνων">
 <!ENTITY menus.entries.label "Προβολή εγγραφών">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Προβολή της πλευρικής στήλης λήψεων κατά τη λήψη αρχείων">
 <!ENTITY misc.dm.autoclose.label "Κλείσιμο όταν ολοκληρωθούν οι λήψεις">
 <!ENTITY misc.colors.label "Ενεργοποίηση έγχρωμου φόντου με βάση την τρέχουσα κατάσταση">
-<!ENTITY misc.slim.label "Ενεργοποίηση κομψής λίστας">
 <!ENTITY misc.count.label "Προβολή αριθμού στοιχείων">
 <!ENTITY misc.enablelink.tooltip "κάντε κλικ εδώ για περισσότερες πληροφορίες (δεσμός προς τις «Συχνές Ερωτήσεις»)">
 <!ENTITY misc.paneltab.reverse "Εναλλαγή ενεργειών για αριστερό και κεντρικό κλικ">
diff --git a/locale/en-GB/about.dtd b/locale/en-GB/about.dtd
index ebd8251..e1155d2 100644
--- a/locale/en-GB/about.dtd
+++ b/locale/en-GB/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Settings…">
 <!ENTITY close "Close">
 <!ENTITY tab.about "About">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Contributors">
 <!ENTITY tab.trans "Translators">
 <!ENTITY about.desc "The All-in-One Sidebar lets you open various windows as sidebar panels, and quickly switch between them. So it puts an end to the window chaos! In addition to bookmarks and history it opens dialogues such as downloads, add-ons and more in the sidebar.">
+<!ENTITY create.desc "created by Ingo Wennemaring, Hamburg [Germany]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Homepage - plenty of information in one place">
 <!ENTITY about2.name "Features - all the features of All-in-One Sidebar">
 <!ENTITY about3.name "FAQ - frequently asked questions and answers">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Forum - discussions, bug reports, and theme fixes among other things">
 <!ENTITY about6.name "Changelog - history and changes">
 <!ENTITY about7.name "To-do - planned features and improvements">
-<!ENTITY create.desc "created by Ingo Wennemaring, Hamburg [Germany]">
 <!ENTITY contrib.desc "I thank the following developers for inspiration and snippets [alphabetical order]:">
 <!ENTITY contrib.thanks "Last but not least I thank all users who helped by testing the development builds, reporting bugs in the forum, sharing their ideas and suggestions or who writes just a nice comment. :-) Thank you very much!">
 <!ENTITY trans.desc "The translators of the All-in-One Sidebar [alphabetically by language code]:">
diff --git a/locale/en-GB/lib.properties b/locale/en-GB/lib.properties
index 84655d2..e396b22 100644
--- a/locale/en-GB/lib.properties
+++ b/locale/en-GB/lib.properties
@@ -5,6 +5,6 @@ prefs.import=Are you sure you want to import these settings for All-in-One Sideb
 prefs.save=Export Settings
 prefs.open=Import Settings
 prefs.copy=Settings copied to Clipboard.
-prefs.invalid=Can\'t import settings because it\'s not a valid file.
+prefs.invalid=Can\\\'t import settings because it\\\'s not a valid file.
 prefs.failed=Failed to import settings.
 prefs.openpanel=Open
diff --git a/locale/en-GB/prefs.dtd b/locale/en-GB/prefs.dtd
index 13bc819..f0cdafc 100644
--- a/locale/en-GB/prefs.dtd
+++ b/locale/en-GB/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menus">
 <!ENTITY tab.menus.sidebar "Sidebar">
 <!ENTITY tab.keys "Shortcuts">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Orientation">
 <!ENTITY gen.orient.label "Show sidebar on">
 <!ENTITY gen.orient.left "left side">
@@ -61,7 +62,7 @@
 <!ENTITY cmode.mode1.label "Only the Sidebar">
 <!ENTITY cmode.mode2.label "The Sidebar and the Toolbar">
 <!ENTITY cmode.mode3.label "The Sidebar, the Toolbar, and the Sidebar Switch">
-<!ENTITY cmode.mode4.label "Opera's Behaviour">
+<!ENTITY cmode.mode4.label "Opera\'s Behaviour">
 <!ENTITY gen.fs.off "Restore the State if Quitting the Full Screen Mode">
 <!ENTITY keyconfig.keyid "Name">
 <!ENTITY keyconfig.id "ID">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Changes affect only new windows">
 <!ENTITY keyconfig.onreset "Browser restart required">
 <!ENTITY keyconfig.unrecognized "Unrecognised ($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 "Customise the entries in the menu “View > Sidebar” and in the dropdown menus of the sidebar buttons.">
 <!ENTITY menus.icons.label "Show Icons">
 <!ENTITY menus.entries.label "Show Entries">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Show the Downloads sidebar when downloading a file">
 <!ENTITY misc.dm.autoclose.label "Close it when all downloads are finished">
 <!ENTITY misc.colors.label "Enable coloured backgrounds based on current state">
-<!ENTITY misc.slim.label "Enable Slim List">
 <!ENTITY misc.count.label "Show Number of Items">
 <!ENTITY misc.enablelink.tooltip "Click here for more information (link to the FAQs)">
 <!ENTITY misc.paneltab.reverse "Swap Left-click and Middle-click Actions">
@@ -90,4 +90,4 @@
 <!ENTITY misc.bm.paneltab "Enable Bookmark Manager in New Tab">
 <!ENTITY special.collapsing.caption "Sidebar Collapsing">
 <!ENTITY special.collapsing.label "Enable Sidebar Collapsing">
-<!ENTITY special.collapsing.desc "The sidebar can collapse instead of closing. The advantage is that the sidebar content doesn't have to reload after re-opening so it responds faster.">
+<!ENTITY special.collapsing.desc "The sidebar can collapse instead of closing. The advantage is that the sidebar content doesn\'t have to reload after re-opening so it responds faster.">
diff --git a/locale/en-US/about.dtd b/locale/en-US/about.dtd
index c3a4024..9976518 100644
--- a/locale/en-US/about.dtd
+++ b/locale/en-US/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Settings…">
 <!ENTITY close "Close">
 <!ENTITY tab.about "About">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Contributors">
 <!ENTITY tab.trans "Translators">
 <!ENTITY about.desc "The All-in-One Sidebar lets you open various windows as sidebar panels, and quickly switch between them. So it put an end to the window chaos! In addition to bookmarks and history it opens dialogues such as downloads, add-ons and more in the sidebar.">
+<!ENTITY create.desc "created by Ingo Wennemaring, Hamburg [Germany]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Homepage - plenty of information in one place">
 <!ENTITY about2.name "Features - all the features of All-in-One Sidebar">
 <!ENTITY about3.name "FAQ - frequently asked questions and answers">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Forum - discussions, bug reports, and theme fixes among other things">
 <!ENTITY about6.name "Changelog - history and changes">
 <!ENTITY about7.name "To-do - planned features and improvements">
-<!ENTITY create.desc "created by Ingo Wennemaring, Hamburg [Germany]">
 <!ENTITY contrib.desc "I thank the following developers for inspiration and snippets [alphabetical order]:">
 <!ENTITY contrib.thanks "Last but not least I thank all users who helped by testing the development builds, reporting bugs in the forum, sharing their ideas and suggestions or who writes just a nice comment. :-) Thank you very much!">
 <!ENTITY trans.desc "The translators of the All-in-One Sidebar [alphabetically by language code]:">
diff --git a/locale/en-US/prefs.dtd b/locale/en-US/prefs.dtd
index 8a3de1b..5357dee 100644
--- a/locale/en-US/prefs.dtd
+++ b/locale/en-US/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menus">
 <!ENTITY tab.menus.sidebar "Sidebar">
 <!ENTITY tab.keys "Shortcuts">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Orientation">
 <!ENTITY gen.orient.label "Show sidebar on">
 <!ENTITY gen.orient.left "left side">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Show the Downloads sidebar when downloading a file">
 <!ENTITY misc.dm.autoclose.label "Close it when all downloads are finished">
 <!ENTITY misc.colors.label "Enable colored backgrounds based on current state">
-<!ENTITY misc.slim.label "Enable Slim List">
 <!ENTITY misc.count.label "Show Number of Items">
 <!ENTITY misc.enablelink.tooltip "Click here for more information (link to the FAQs)">
 <!ENTITY misc.paneltab.reverse "Swap Left-click and Middle-click Actions">
diff --git a/locale/es-AR/about.dtd b/locale/es-AR/about.dtd
index c0bea59..4bab103 100644
--- a/locale/es-AR/about.dtd
+++ b/locale/es-AR/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Configuración…">
 <!ENTITY close "Cerrar">
 <!ENTITY tab.about "Acerca de">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Contribuyeron">
 <!ENTITY tab.trans "Traductores">
 <!ENTITY about.desc "La barra lateral de All-in-One le permite abrir varias ventanas como paneles laterales, y rápidamente alternar entre ellos. Así le ponemos fin al caos de ventanas! Adicionalmente a los marcadores y al historial, puede abrir dialogos como ser descargas, agregados y mucho mas en la barra lateral.">
+<!ENTITY create.desc "creado por Ingo Wennemaring, Hamburgo [Alemania]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Página Principal - mucha información de un vistazo">
 <!ENTITY about2.name "Características - todas las características de All-in-One Sidebar">
 <!ENTITY about3.name "FAQ - Preguntas más frecuentes y sus respuestas">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Foros - discusiones, reporte de fallas, ajustes entre otras cosas">
 <!ENTITY about6.name "Registro de Cambios - Historial de modificaciones">
 <!ENTITY about7.name "To-do - Características y mejoras planeadas">
-<!ENTITY create.desc "creado por Ingo Wennemaring, Hamburgo [Alemania]">
 <!ENTITY contrib.desc "Quiero agradecer a los siguientes desarrolladores por su inspiración y contribución de porciones de código (en orden alfabético):">
 <!ENTITY contrib.thanks "Por último, pero no menos, doy las gracias a todos aquellos usuarios que ayudaron probando las versiones de desarrollo, informando de fallas en el foro, compartiendo sus ideas y sugerencias o a quienes escribieron al menos un comentario agradable. :-) Muchísimas Gracias!">
 <!ENTITY trans.desc "Los traductores de All-in-One Sidebar (en orden alfabético de los acronismos de idioma):">
diff --git a/locale/es-AR/prefs.dtd b/locale/es-AR/prefs.dtd
index b71e61d..d9ddffb 100644
--- a/locale/es-AR/prefs.dtd
+++ b/locale/es-AR/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menues">
 <!ENTITY tab.menus.sidebar "Barra Lateral">
 <!ENTITY tab.keys "Atajos">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Orientación">
 <!ENTITY gen.orient.label "Mostrar barra lateral">
 <!ENTITY gen.orient.left "a la izquerda">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Los cambios sólo afectarán a las nuevas ventanas">
 <!ENTITY keyconfig.onreset "Se requiere reiniciar el navegador">
 <!ENTITY keyconfig.unrecognized "Desconocido($1)">
-<!ENTITY keyconfig.used "Ésta tecla ya está en uso por:\n\n\t$1\n\nPodría estar activo aún.">
+<!ENTITY keyconfig.used "Ésta tecla ya está en uso por:\\n\\n\\t$1\\n\\nPodría estar activo aún.">
 <!ENTITY menus.sidebar.desc "Personalizar las entradas en el menú "Ver>Barra Lateral"y en los menues desplegables de los botoner de la barra lateral.">
 <!ENTITY menus.icons.label "Mostrar Íconos">
 <!ENTITY menus.entries.label "Mostrar Entradas">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Mostrat la barra lateral de Descargas al descargar un archivo">
 <!ENTITY misc.dm.autoclose.label "Cerrarla cuando todas las descargas hayan finalizado">
 <!ENTITY misc.colors.label "Habilitar fondos coloreados en el estado actual">
-<!ENTITY misc.slim.label "Habilitar Lista Delgada">
 <!ENTITY misc.count.label "Mostrar la Cantidad de Elementos">
 <!ENTITY misc.enablelink.tooltip "Haga Click aquí por más información (enlace a FAQ)">
 <!ENTITY misc.paneltab.reverse "Intercambiar Acciones entre Click-Izquierdo y Click-Central">
diff --git a/locale/es-ES/about.dtd b/locale/es-ES/about.dtd
index 8547e7e..28a4423 100644
--- a/locale/es-ES/about.dtd
+++ b/locale/es-ES/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Opciones">
 <!ENTITY close "Cerrar">
 <!ENTITY tab.about "Acerca de">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Colaboradores">
 <!ENTITY tab.trans "Traductores">
 <!ENTITY about.desc "All-in-One Sidebar le permite abrir varias ventanas como paneles laterales, y cambiar rápidamente entre ellos. De este modo acaba con el caos de las ventanas. Además de marcadores o historial, abre otras ventanas como descargas, complementos y más en el panel lateral.">
+<!ENTITY create.desc "creada por Ingo Wennemaring, Hamburgo [Alemania]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Página web - Información completa general">
 <!ENTITY about2.name "Opciones - Todas las opciones de All-in-One Sidebar">
 <!ENTITY about3.name "FAQ - Las respuestas a las preguntas más frecuentes">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Foro - opiniones, informe de fallos, arreglo de temas y otros">
 <!ENTITY about6.name "Changelog - Historial y cambios">
 <!ENTITY about7.name "To-do - Opciones y mejoras previstas">
-<!ENTITY create.desc "creada por Ingo Wennemaring, Hamburgo [Alemania]">
 <!ENTITY contrib.desc "Agradezco a los siguientes desarrolladores por la inspiración y ayuda (orden alfabético):">
 <!ENTITY contrib.thanks "Agradecer por último a todos los usuarios que han colaborado en las pruebas de las versiones de desarrollo, informando de errores en los foros, compartiendo sus ideas y sugerencias, y a todos aquellos que han escrito comentarios :-) Muchas gracias a todos.">
 <!ENTITY trans.desc "Agradezco a los siguientes traductores:">
diff --git a/locale/es-ES/prefs.dtd b/locale/es-ES/prefs.dtd
index 054e934..7f9d922 100644
--- a/locale/es-ES/prefs.dtd
+++ b/locale/es-ES/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menús">
 <!ENTITY tab.menus.sidebar "Panel lateral">
 <!ENTITY tab.keys "Combinaciones de teclas">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Orientación">
 <!ENTITY gen.orient.label "Mostrar el panel en">
 <!ENTITY gen.orient.left "parte izquierda">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Los cambios afectan sólo a las ventanas nuevas">
 <!ENTITY keyconfig.onreset "Es necesario reiniciar el navegador">
 <!ENTITY keyconfig.unrecognized "No reconocido ($1)">
-<!ENTITY keyconfig.used "La tecla ya está siendo usada por: \n\n\t$1\n\naunque debe funcionar igualmente.">
+<!ENTITY keyconfig.used "La tecla ya está siendo usada por: \\n\\n\\t$1\\n\\naunque debe funcionar igualmente.">
 <!ENTITY menus.sidebar.desc "Permite personalizar las entradas del menú “Ver > Panel lateral” y los menús de los botones del panel lateral.">
 <!ENTITY menus.icons.label "Ver iconos">
 <!ENTITY menus.entries.label "Ver entradas">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Mostrar el panel lateral de descargas al descargar un archivo">
 <!ENTITY misc.dm.autoclose.label "Cerrarlo cuando todas las descargas hayan terminado">
 <!ENTITY misc.colors.label "Habilitar los fondos de colores basados en el estado actual">
-<!ENTITY misc.slim.label "Habilitar lista fina">
 <!ENTITY misc.count.label "Mostrar número de elementos">
 <!ENTITY misc.enablelink.tooltip "Pulse aquí para más información (enlace a las FAQs)">
 <!ENTITY misc.paneltab.reverse "Intercambiar las acciones de los botones izquierdo y central">
diff --git a/locale/et-EE/about.dtd b/locale/et-EE/about.dtd
index 9cc9ff6..a72a011 100644
--- a/locale/et-EE/about.dtd
+++ b/locale/et-EE/about.dtd
@@ -1,22 +1,24 @@
-<!ENTITY title "Teave All-in-One-Sidebar'i kohta">
+<!ENTITY title "Teave All-in-One-Sidebar\'i kohta">
 <!ENTITY version "versioon">
 <!ENTITY settings "Seaded…">
 <!ENTITY close "Sule">
 <!ENTITY tab.about "Teave">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Panustanud isikud">
 <!ENTITY tab.trans "Tõlkijad">
 <!ENTITY about.desc "All-in-One-Sidebar võimaldab avada erinevaid aknaid külgpaanis ning nende vahel kiiresti vahetada. See tegi lõpu akende kaosele! Lisaks järjehoidjatele ja ajaloole saab külgpaanis avada näiteks allalaadimise dialooge, programmi lisasid ja muud.">
+<!ENTITY create.desc "loodud Ingo Wennenmaring\'u poolt [Hamburg, Saksamaa]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Koduleht - hulka infot ühes kohas">
-<!ENTITY about2.name "Võimalused - kõik All-in-One-Sidebar'i võimalused">
+<!ENTITY about2.name "Võimalused - kõik All-in-One-Sidebar\'i võimalused">
 <!ENTITY about3.name "KKK - korduma kippuvad küsimused ja vastused">
 <!ENTITY about4.name "Teadaolevad probleemid - kirjeldused ja lahendused">
 <!ENTITY about5.name "Foorum - arutelud, veateated ja teemade parandused lisaks muudele asjadele">
 <!ENTITY about6.name "Muudatuste logi - ajalugu ja muudatused">
 <!ENTITY about7.name "Plaanid - plaanitavad parandused ja täiendused">
-<!ENTITY create.desc "loodud Ingo Wennenmaring'u poolt [Hamburg, Saksamaa]">
 <!ENTITY contrib.desc "Ma tänan järgnevaid arendajaid inspiratsiooni ja koodikatkete eest [tähestikulises järjekorras]:">
 <!ENTITY contrib.thanks "Tänan ka kõiki kasutajaid, kes testisid arendusversiooni, teavitasid vigadest, jagasid oma ideid ja soovitusi või kes lihtsalt kirjutasid kenasid kommentaare. :-) Suur tänu kõigile!">
-<!ENTITY trans.desc "All-in-One-Sidebar'i tõlked valmistasid [keelekoodi tähestikulises järjekorras]:">
+<!ENTITY trans.desc "All-in-One-Sidebar\'i tõlked valmistasid [keelekoodi tähestikulises järjekorras]:">
 <!ENTITY trans.ar-SA.lang "Araabia">
 <!ENTITY trans.be-BY.lang "Valgevene">
 <!ENTITY trans.cs-CZ.lang "Tšehhi">
diff --git a/locale/et-EE/lib.properties b/locale/et-EE/lib.properties
index 8fa9b89..4c8213b 100644
--- a/locale/et-EE/lib.properties
+++ b/locale/et-EE/lib.properties
@@ -1,7 +1,7 @@
 extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description=Külgpaani seadistamine tunnustatud kasutusmugavusega!
 bm_hi.search.blur=Otsi…
-prefs.confirm=Kas soovid kindlasti All-in-One-Sidebar'i vaikeseadistuse taastada?
-prefs.import=Kas soovid kindlasti need All-in-One-Sidebar'i seadistused importida?
+prefs.confirm=Kas soovid kindlasti All-in-One-Sidebar\'i vaikeseadistuse taastada?
+prefs.import=Kas soovid kindlasti need All-in-One-Sidebar\'i seadistused importida?
 prefs.save=Ekspordi seadistused
 prefs.open=Impordi seadistused
 prefs.copy=Seaded kopeeriti lõikepuhvrisse.
diff --git a/locale/et-EE/prefs.dtd b/locale/et-EE/prefs.dtd
index 640b64f..dd9985f 100644
--- a/locale/et-EE/prefs.dtd
+++ b/locale/et-EE/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menüüd">
 <!ENTITY tab.menus.sidebar "Külgpaan">
 <!ENTITY tab.keys "Otseteed">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Orientatsioon">
 <!ENTITY gen.orient.label "Näita külgpaani">
 <!ENTITY gen.orient.left "vasakul">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Muudatused puudutavad ainult uusi aknaid">
 <!ENTITY keyconfig.onreset "Vajalik brauseri taaskäivitamine">
 <!ENTITY keyconfig.unrecognized "Tundamutu ($1)">
-<!ENTITY keyconfig.used "Seda klahvi kasutab juba: \n\n\t$1\n\nIt aga võib siiski töötada">
+<!ENTITY keyconfig.used "Seda klahvi kasutab juba: \\n\\n\\t$1\\n\\nIt aga võib siiski töötada">
 <!ENTITY menus.sidebar.desc "Kohanda “Vaata > Külgpaan” menüü kirjeid ja külgpaani nuppude kontekstmenüüsid.">
 <!ENTITY menus.icons.label "Näita ikoone">
 <!ENTITY menus.entries.label "Näita kirjeid">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Näita tõmbamiste külgpaani kui faili tõmmatakse">
 <!ENTITY misc.dm.autoclose.label "Sulge see, kui kõik tõmbamised on lõpetatud">
 <!ENTITY misc.colors.label "Luba hetkeseisundil põhinevad värvilised taustad">
-<!ENTITY misc.slim.label "Luba õhuke nimekiri">
 <!ENTITY misc.count.label "Näita kirjete arvu">
 <!ENTITY misc.enablelink.tooltip "Lisateabeks klõpsa siia (link KKK juurde)">
 <!ENTITY misc.paneltab.reverse "Vaheta vasak- ja keskklõpsu tegevused">
diff --git a/locale/fi-FI/about.dtd b/locale/fi/about.dtd
similarity index 96%
rename from locale/fi-FI/about.dtd
rename to locale/fi/about.dtd
index 8b3ff9a..9454745 100644
--- a/locale/fi-FI/about.dtd
+++ b/locale/fi/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Asetukset…">
 <!ENTITY close "Sulje">
 <!ENTITY tab.about "Tietoa">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Kehittäjät">
 <!ENTITY tab.trans "Kääntäjät">
 <!ENTITY about.desc "AIOS -sivupalkki mahdollistaa erinäisten ikkunoitten avaamisen paneeleina sivupalkissa ja nopean siirtymisen niiden välillä. Se on siis piste ikkunakaaokselle! Kirjanmerkkien ja sivuhistorian lisäksi voidaan avata esimerkiksi lataukset ja laajennukset ikkuna.">
+<!ENTITY create.desc "luonut Ingo Wennemaring, Hampuri [Saksa]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Kotisivu - paljon tietoa yhdessä paikassa">
 <!ENTITY about2.name "Ominaisuudet - kaikki All-in-One Sidebarin ominaisuudet">
 <!ENTITY about3.name "UKK - usein kysyttyjä kysymyksiä ja vastauksia">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Foorumi - keskusteluja, vika raportteja, ja teema korjauksia muitten asioiden lisäksi">
 <!ENTITY about6.name "Muutosloki - historia ja muutokset">
 <!ENTITY about7.name "Tehtävänä - suunnitellut ominaisuudet ja parannukset">
-<!ENTITY create.desc "luonut Ingo Wennemaring, Hampuri [Saksa]">
 <!ENTITY contrib.desc "Kiitän seuraavia ohjemoijia innoituksesta ja tilkuista [aakkos järjestys]:">
 <!ENTITY contrib.thanks "Viimeisenä muttei vähäisimpinä kiitän kaikkia käyttäjiä jotka auttoivat testaamalla kehitysversioita, vikojen raportoinnista foorumilla, ideoittensa jakamisesta tai mukavien kommenttien kirjoittamisesta :-) Kiitos paljon teille!">
 <!ENTITY trans.desc "All-in-One Sidebarin kääntäjät [aakkosjärjestyksessä kieli koodin mukaan]">
diff --git a/locale/fi-FI/aios.dtd b/locale/fi/aios.dtd
similarity index 100%
rename from locale/fi-FI/aios.dtd
rename to locale/fi/aios.dtd
diff --git a/locale/fi-FI/lib.dtd b/locale/fi/lib.dtd
similarity index 100%
rename from locale/fi-FI/lib.dtd
rename to locale/fi/lib.dtd
diff --git a/locale/fi-FI/lib.properties b/locale/fi/lib.properties
similarity index 100%
rename from locale/fi-FI/lib.properties
rename to locale/fi/lib.properties
diff --git a/locale/fi-FI/multipanel.dtd b/locale/fi/multipanel.dtd
similarity index 100%
rename from locale/fi-FI/multipanel.dtd
rename to locale/fi/multipanel.dtd
diff --git a/locale/fi-FI/prefs.dtd b/locale/fi/prefs.dtd
similarity index 97%
rename from locale/fi-FI/prefs.dtd
rename to locale/fi/prefs.dtd
index 8b9c4d9..55cb860 100644
--- a/locale/fi-FI/prefs.dtd
+++ b/locale/fi/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Valikot">
 <!ENTITY tab.menus.sidebar "Sivupaneeli">
 <!ENTITY tab.keys "Oikotiet">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Paikoitus">
 <!ENTITY gen.orient.label "Näytä sivupaneeli">
 <!ENTITY gen.orient.left "vasemmalla puolella">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Muutokset vaikuttavat ainoastaan uusiin ikkunoihin">
 <!ENTITY keyconfig.onreset "Tarvitaan selaimen uudelleenkäynnistys">
 <!ENTITY keyconfig.unrecognized "ei tunnisteta ($1)">
-<!ENTITY keyconfig.used "Tätä näppäintä käyttää jo: \n\n\t$1\n\nIt saattaa silti tomia, ehkä.">
+<!ENTITY keyconfig.used "Tätä näppäintä käyttää jo: \\n\\n\\t$1\\n\\nIt saattaa silti tomia, ehkä.">
 <!ENTITY menus.sidebar.desc "Muokkaa valikon kohteita “Näytä > Sivupaneeli” ja sivupaneelin painikkeiden pudotusvalikoissa.">
 <!ENTITY menus.icons.label "Näytä kuvakkeet">
 <!ENTITY menus.entries.label "Näytä valinnat">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Näytä lataussivupaneeli kun ladataan tiedostoa">
 <!ENTITY misc.dm.autoclose.label "Sulje kun lataukset ovat valmistuneet">
 <!ENTITY misc.colors.label "Ota käyttöön värilliset taustat perustuen nykyiseen tilaan">
-<!ENTITY misc.slim.label "Ota käyttöön ohut lista">
 <!ENTITY misc.count.label "Näytä merkintöjen määrä">
 <!ENTITY misc.enablelink.tooltip "Napsauta täältä saadaksesi lisätietoja (linkki UKK:hon's)">
 <!ENTITY misc.paneltab.reverse "Vaihda napsautuksen ja keskinapsautuksen toiminnot keskenään">
diff --git a/locale/fr/about.dtd b/locale/fr/about.dtd
index 9008faf..966acca 100644
--- a/locale/fr/about.dtd
+++ b/locale/fr/about.dtd
@@ -1,22 +1,24 @@
-<!ENTITY title "À propos d'All-in-One Sidebar">
+<!ENTITY title "À propos d\'All-in-One Sidebar">
 <!ENTITY version "Version">
 <!ENTITY settings "Paramètres…">
 <!ENTITY close "Fermer">
 <!ENTITY tab.about "À propos">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Contributeurs">
 <!ENTITY tab.trans "Traducteurs">
-<!ENTITY about.desc "L'extension All-in-One Sidebar vous permet d'ouvrir diverses fenêtres dans des panneaux latéraux et de basculer rapidement de l'une à l'autre. C'est donc la fin des fenêtres en vrac ! Outre les marque-pages et l'historique, l'extension ouvre des fenêtres comme celle des téléchargements, des modules complémentaires et d'autres encore dans un panneau latéral.">
-<!ENTITY about1.name "Site Web - des tonnes d'informations d'un coup d'œil.">
-<!ENTITY about2.name "Fonctionnalités - toutes celles d' All-in-One Sidebar.">
+<!ENTITY about.desc "L\'extension All-in-One Sidebar vous permet d\'ouvrir diverses fenêtres dans des panneaux latéraux et de basculer rapidement de l\'une à l\'autre. C\'est donc la fin des fenêtres en vrac ! Outre les marque-pages et l\'historique, l\'extension ouvre des fenêtres comme celle des téléchargements, des modules complémentaires et d\'autres encore dans un panneau latéral.">
+<!ENTITY create.desc "créée par Ingo Wennemaring, Hambourg [Allemagne]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
+<!ENTITY about1.name "Site Web - des tonnes d\'informations d\'un coup d\'œil.">
+<!ENTITY about2.name "Fonctionnalités - toutes celles d\' All-in-One Sidebar.">
 <!ENTITY about3.name "FAQ - Foire Aux Questions… et réponses.">
 <!ENTITY about4.name "Problèmes signalés - descriptions et résolutions.">
 <!ENTITY about5.name "Forum - discussions, rapports de bogue, comment installer un thème, entre autres.">
 <!ENTITY about6.name "Journal des changements - historique et modifications">
 <!ENTITY about7.name "Tâches - fonctionnalités à venir et améliorations.">
-<!ENTITY create.desc "créée par Ingo Wennemaring, Hambourg [Allemagne]">
-<!ENTITY contrib.desc "Je remercie les développeurs qui suivent de m'avoir inspiré et prêté leur code :">
+<!ENTITY contrib.desc "Je remercie les développeurs qui suivent de m\'avoir inspiré et prêté leur code :">
 <!ENTITY contrib.thanks "Et enfin, je remercie tous les utilisateurs qui ont aidé à tester les versions en développement, rapporté des bogues, partagé idées et suggestions, ou qui ont un écrit un commentaire sympa :-). Merci beaucoup !">
-<!ENTITY trans.desc "Les traducteurs d'All-in-One Sidebar (par ordre alphabétique d'acronyme de langue) :">
+<!ENTITY trans.desc "Les traducteurs d\'All-in-One Sidebar (par ordre alphabétique d\'acronyme de langue) :">
 <!ENTITY trans.ar-SA.lang "Arabe">
 <!ENTITY trans.be-BY.lang "Biélorusse">
 <!ENTITY trans.cs-CZ.lang "Tchèque">
diff --git a/locale/fr/aios.dtd b/locale/fr/aios.dtd
index dd7493b..8f8a7d7 100644
--- a/locale/fr/aios.dtd
+++ b/locale/fr/aios.dtd
@@ -1,13 +1,13 @@
 <!ENTITY loading.label "chargement du panneau…">
 <!ENTITY menu.prefs.label "Options de All-in-One Sidebar…">
 <!ENTITY menu.togglebar.label "Activer/désactiver le panneau latéral">
-<!ENTITY menu.grippy.label "'Grippy' pour le panneau latéral">
-<!ENTITY toolbar.name "Barre d'outils d'All-in-One Sidebar">
-<!ENTITY sbhtoolbar.name "En-tête de la barre d'outils All-in-One Sidebar">
+<!ENTITY menu.grippy.label "\'Grippy\' pour le panneau latéral">
+<!ENTITY toolbar.name "Barre d\'outils d\'All-in-One Sidebar">
+<!ENTITY sbhtoolbar.name "En-tête de la barre d\'outils All-in-One Sidebar">
 <!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">
-<!ENTITY button.switch.tooltip2 "Afficher/cacher la barre d'outils">
+<!ENTITY button.switch.tooltip1 "Permuter panneau latéral et barre d\'outils">
+<!ENTITY button.switch.tooltip2 "Afficher/cacher la barre d\'outils">
 <!ENTITY button.switch.tooltip3 "Afficher/cacher le panneau latéral">
 <!ENTITY sidebar.open.label "Ouvrir le panneau latéral">
 <!ENTITY sidebar.close.label "Fermer le panneau latéral">
@@ -16,13 +16,13 @@
 <!ENTITY sidebar.width.max "Largeur maximum">
 <!ENTITY button.menu.label "Panneaux latéraux">
 <!ENTITY button.menu.tooltip "Tous les panneaux latéraux disponibles">
-<!ENTITY button.toolbar.label "Barre d'AIOS">
-<!ENTITY button.toolbar.tooltip "Afficher/cacher la barre d'AIOS">
+<!ENTITY button.toolbar.label "Barre d\'AIOS">
+<!ENTITY button.toolbar.tooltip "Afficher/cacher la barre d\'AIOS">
 <!ENTITY button.paneltab.label "Onglet du panneau">
-<!ENTITY button.paneltab.tooltip1 "Ouvre le contenu de l'onglet dans le panneau latéral">
+<!ENTITY button.paneltab.tooltip1 "Ouvre le contenu de l\'onglet dans le panneau latéral">
 <!ENTITY button.paneltab.tooltip2 "Ouvre le contenu du panneau latéral dans un nouvel onglet">
 <!ENTITY button.paneltab.tooltip3 "Ouvre le contenu du panneau latéral dans une fenêtre">
-<!ENTITY button.paneltab.menu1.label "Ouvrir l'onglet dans le panneau latéral">
+<!ENTITY button.paneltab.menu1.label "Ouvrir l\'onglet dans le panneau latéral">
 <!ENTITY button.paneltab.menu2.label "Ouvrir le panneau latéral dans un onglet">
 <!ENTITY button.autohide.label "PanneauAutoContrôle">
 <!ENTITY button.autohide.tooltip "Montrer/cacher automatiquement le panneau latéral">
@@ -34,8 +34,8 @@
 <!ENTITY button.multipanel.label "MultiPanneau">
 <!ENTITY button.multipanel.tooltip "Affiche des infos sur les sites Web et le navigateur">
 <!ENTITY button.pageinfo.tooltip "Affiche des informations étendues sur la page Web">
-<!ENTITY button.console.label "Console d'erreur">
-<!ENTITY button.console.tooltip "Ouvre la console d'erreur, montrant les problèmes et le code source">
+<!ENTITY button.console.label "Console d\'erreur">
+<!ENTITY button.console.tooltip "Ouvre la console d\'erreur, montrant les problèmes et le code source">
 <!ENTITY keys.modifiers "accel shift">
 <!ENTITY keys.sidebar "VK_F4">
 <!ENTITY keys.options "VK_F4">
diff --git a/locale/fr/lib.properties b/locale/fr/lib.properties
index 93cafec..34d984a 100644
--- a/locale/fr/lib.properties
+++ b/locale/fr/lib.properties
@@ -1,10 +1,10 @@
-extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description=Tout contrôler dans le panneau latéral avec l'aisance d'un pro !
+extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description=Tout contrôler dans le panneau latéral avec l\'aisance d\'un pro !
 bm_hi.search.blur=Rechercher…
 prefs.confirm=Voulez-vous vraiment rétablir les préférences par défaut de All-in-One Sidebar ?
-prefs.import=Voulez-vous vraiment importer ces préférences d'All-in-One Sidebar ?\nn
+prefs.import=Voulez-vous vraiment importer ces préférences d\'All-in-One Sidebar ?\\nn
 prefs.save=Exporter les préférences
 prefs.open=Importer les préférences
 prefs.copy=Paramètres copiés dans le presse-papiers.
-prefs.invalid=Importation des préférences impossible : le fichier n\'est pas valide.
-prefs.failed=Échec de l'importation des préférences.
+prefs.invalid=Importation des préférences impossible : le fichier n\\\'est pas valide.
+prefs.failed=Échec de l\'importation des préférences.
 prefs.openpanel=Ouvrir
diff --git a/locale/fr/multipanel.dtd b/locale/fr/multipanel.dtd
index e6fb6bb..725b508 100644
--- a/locale/fr/multipanel.dtd
+++ b/locale/fr/multipanel.dtd
@@ -6,7 +6,7 @@
 <!ENTITY about.tooltip "Affiche diverses informations à propos du navigateur">
 <!ENTITY about.config.tooltip "Affiche une interface d'édition et configuration pour un grand nombre de variables paramétrables">
 <!ENTITY about.plugins.tooltip "Affiche des informations relatives à tous les plugins installés">
-<!ENTITY about.support.tooltip "Affiche les informations de base sur l'application, les extensions et les préférences modifiées.">
+<!ENTITY about.support.tooltip "Affiche les informations de base sur l\'application, les extensions et les préférences modifiées.">
 <!ENTITY about.cache.tooltip "Affiche des informations relatives au cache, à la fois en mémoire et sur le disque.">
 <!ENTITY about.cache.disk.tooltip "Affiche les entrées individuelles sur le disque">
 <!ENTITY about.cache.memory.tooltip "Affiche les entrées individuelles en mémoire">
diff --git a/locale/fr/prefs.dtd b/locale/fr/prefs.dtd
index 5ca2064..53cda70 100644
--- a/locale/fr/prefs.dtd
+++ b/locale/fr/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menus">
 <!ENTITY tab.menus.sidebar "Panneau latéral">
 <!ENTITY tab.keys "Raccourcis">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Orientation">
 <!ENTITY gen.orient.label "Montrer le panneau latéral">
 <!ENTITY gen.orient.left "côté gauche">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Les changements ne concernent que les nouvelles fenêtres.">
 <!ENTITY keyconfig.onreset "Il est nécessaire de redémarrer le navigateur">
 <!ENTITY keyconfig.unrecognized "Non reconnu ($1)">
-<!ENTITY keyconfig.used "Cette touche est déjà utilisée par : \nt$1\n mais il est possible qu'elle fonctionne tout de même.">
+<!ENTITY keyconfig.used "Cette touche est déjà utilisée par : \\nt$1\\n mais il est possible qu'elle fonctionne tout de même.">
 <!ENTITY menus.sidebar.desc "Personnaliser les entrées dans le menu “Affichage > Panneau latéral” et dans les menus déroulants des boutons du panneau latéral.">
 <!ENTITY menus.icons.label "Afficher les icônes">
 <!ENTITY menus.entries.label "Afficher les entrées">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Afficher le panneau latéral de téléchargements pendant le téléchargement d'un fichier">
 <!ENTITY misc.dm.autoclose.label "Le fermer quand tous les téléchargements sont terminés">
 <!ENTITY misc.colors.label "Autorise les fonds en couleur selon l'état courant">
-<!ENTITY misc.slim.label "Activer la liste compacte">
 <!ENTITY misc.count.label "Afficher le nombre d'éléments">
 <!ENTITY misc.enablelink.tooltip "Cliquer ici pour en savoir plus (lien vers la FAQ)">
 <!ENTITY misc.paneltab.reverse "Intervertir les comportements du clic gauche et du clic-milieu (molette)">
diff --git a/locale/he/about.dtd b/locale/he/about.dtd
index ca08a72..0ecb806 100644
--- a/locale/he/about.dtd
+++ b/locale/he/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "אפשרויות…">
 <!ENTITY close "סגירה">
 <!ENTITY tab.about "אודות">
+<!ENTITY tab.help "עזרה">
 <!ENTITY tab.contrib "תורמים">
 <!ENTITY tab.trans "מתרגמים">
 <!ENTITY about.desc "All-in-One Sidebar מאפשר פתיחת מגוון חלונות כלוח בסרגל-הצד ומעבר מהיר ביניהם. כך שנגמר הבלגן עם החלונות. בנוסף לסימניות וההיסטוריה ניתן לפתוח בסרגל-הצד דיאלוגים כמו ההורדות, ההרחבות ועוד.">
+<!ENTITY create.desc "נוצר על ידי: Ingo Wennemaring, המבורג  [גרמניה]">
+<!ENTITY help.desc "ניתן למצוא מידע רב אודות הרחבה זו באתר:">
 <!ENTITY about1.name "דף הבית - מידע רב במקום אחד">
 <!ENTITY about2.name "מאפיינים - כל המאפיינים של All-in-One Sidebar">
 <!ENTITY about3.name "שאלות ותשובות נפוצות אודות ההרחבה">
@@ -13,18 +16,17 @@
 <!ENTITY about5.name "פורום - דיונים, דיווח באגים, ותיקון ערכות נושא ונושאים רבים אחרים">
 <!ENTITY about6.name "שינויים - ההיסטוריה של השינויים">
 <!ENTITY about7.name "לעשות - אפשרויות ושיפורים מתוכננים">
-<!ENTITY create.desc "נוצר על ידי: Ingo Wennemaring, המבורג  [גרמניה]">
 <!ENTITY contrib.desc "אני מודה למפתחים הבאים על ההשראה ועל פיסות הקוד  [לפי סדר אלפביתי]:">
 <!ENTITY contrib.thanks "דבר אחרון חביב, אני מודה לכל המשתמשים שעזרו ובדקו את גרסאות הניסיון והפיתוח, שדיווחו על באגים  בפורום, וחלקו את רעיונותיהם ועצותיהם או סתם כתבו תגובה חביבה . תודה רבה לכם! (-:">
 <!ENTITY trans.desc "המתרגמים של All-in-One Sidebar  [בסדר אלפביתי, לפי קוד השפה]:">
 <!ENTITY trans.ar-SA.lang "ערבית">
 <!ENTITY trans.be-BY.lang "בלרוסית">
-<!ENTITY trans.cs-CZ.lang "צ'כית">
+<!ENTITY trans.cs-CZ.lang "צ\'כית">
 <!ENTITY trans.da-DK.lang "דנית">
 <!ENTITY trans.de-DE.lang "גרמנית">
 <!ENTITY trans.el-GR.lang "יוונית">
 <!ENTITY trans.en-GB.lang "אנגלית (בריטניה-אנגליה)">
-<!ENTITY trans.en-US.lang "אנגלית (ארה"ב)">
+<!ENTITY trans.en-US.lang "אנגלית (ארה\"ב)">
 <!ENTITY trans.es-AR.lang "ספרדית (ארגנטינה)">
 <!ENTITY trans.es-ES.lang "ספרדית (ספרד)">
 <!ENTITY trans.et-EE.lang "אסטונית">
diff --git a/locale/he/lib.dtd b/locale/he/lib.dtd
index 37f5f12..c91ed5a 100644
--- a/locale/he/lib.dtd
+++ b/locale/he/lib.dtd
@@ -7,7 +7,7 @@
 <!ENTITY key.shift "Shift">
 <!ENTITY menu.tools.label "כלים">
 <!ENTITY closeFolder.label "סגירת כל התיקיות">
-<!ENTITY show.closeFolder.label "כפתור 'סגירת כל התיקיות'">
+<!ENTITY show.closeFolder.label "כפתור \'סגירת כל התיקיות\'">
 <!ENTITY enable.autoClose.label "סגירה אוטומטית של תיקיות אחרות">
 <!ENTITY enable.scrollToFolder.label "גלילה אוטומטית לתיקייה הנבחרת">
 <!ENTITY enable.rememberFolder.label "זכור והתמקד בתיקייה שנבחרה אחרונה">
diff --git a/locale/he/prefs.dtd b/locale/he/prefs.dtd
index 43c9a1a..a9f1bac 100644
--- a/locale/he/prefs.dtd
+++ b/locale/he/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "תפריטים">
 <!ENTITY tab.menus.sidebar "סרגל-הצד">
 <!ENTITY tab.keys "קיצורי דרך">
+<!ENTITY tab.about "אודות\\עזרה">
 <!ENTITY gen.orient.caption "מיקום">
 <!ENTITY gen.orient.label "הצגת סרגל-הצד בצד">
 <!ENTITY gen.orient.left "שמאל">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "השינויים משפיעים רק על חלונות חדשים">
 <!ENTITY keyconfig.onreset "דורש אתחול הדפדפן">
 <!ENTITY keyconfig.unrecognized "לא מזוהה ($1)">
-<!ENTITY keyconfig.used "מפתח זה כבר בשימוש על ידי \n\n\t$1\n\n  אולי יעבוד">
+<!ENTITY keyconfig.used "מפתח זה כבר בשימוש על ידי \\n\\n\\t$1\\n\\n  אולי יעבוד">
 <!ENTITY menus.sidebar.desc "התאמה אישית של הערכים בתפריט “תצוגה > סרגל-הצד” ובתפריט הגלילה של סרגל-הצד">
 <!ENTITY menus.icons.label "הצגת אייקונים">
 <!ENTITY menus.entries.label "הצגת ערכים">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "הצגת סרגל-הצד של ההורדות כאשר מורד קובץ">
 <!ENTITY misc.dm.autoclose.label "סגירת (סרגל-הצד) כאשר כל ההורדות מסתיימות">
 <!ENTITY misc.colors.label "אפשור צבעי רקע המבוססים על המצב הנוכחי">
-<!ENTITY misc.slim.label "אפשור רשימה רזה">
 <!ENTITY misc.count.label "הצגת מספר הפריטים">
 <!ENTITY misc.enablelink.tooltip "לחיצה כאן למידע נוסף (קישור לשאלות נפוצות)">
 <!ENTITY misc.paneltab.reverse "החלפת התפקוד בין לחצן שמאלי ולחצן אמצעי">
diff --git a/locale/hr-HR/about.dtd b/locale/hr-HR/about.dtd
index e67073d..03ce127 100644
--- a/locale/hr-HR/about.dtd
+++ b/locale/hr-HR/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Postavke…">
 <!ENTITY close "Zatvori">
 <!ENTITY tab.about "O">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Oni koji su pridonijeli">
 <!ENTITY tab.trans "Prevoditelji">
 <!ENTITY about.desc "The All-in-One Sidebar lets you open various windows as sidebar panels, and quickly switch between them. So it put an end to the window chaos! In addition to bookmarks and history it opens dialogues such as downloads, add-ons and more in the sidebar.">
+<!ENTITY create.desc "kreirao Ingo Wennemaring, Hamburg [Njemačka]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Početna stranica">
 <!ENTITY about2.name "Osobine - sve osobine proširenja All-in-One Sidebar">
 <!ENTITY about3.name "FAQ - učestalo postavljena pitanja i odgovori">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Forum - rasprave, prijave greški i popravke tema između ostalih stvari">
 <!ENTITY about6.name "Popis promjena - povijest i promjene">
 <!ENTITY about7.name "Za napraviti - planirane osobine i unaprijeđenja">
-<!ENTITY create.desc "kreirao Ingo Wennemaring, Hamburg [Njemačka]">
 <!ENTITY contrib.desc "Zahvaljujem se slijedećim programerima za inspiraciju i odlomke [abecednim redom]:">
 <!ENTITY contrib.thanks "Zadnje, ali ne manje važno, zahvaljujem svim korisnicima koji su pomogli testiranjem razvojnih izdanja, prijavljivanjem greški na forumu, dijeljenjem njihovih ideja i prijedloga ili jednostavo pisanjem lijepog komentara :-) Puno vam hvala!">
 <!ENTITY trans.desc "All-in-One Sidebar prevoditelji [abecedno prema jezičnom kodu]:">
diff --git a/locale/hr-HR/lib.dtd b/locale/hr-HR/lib.dtd
index 618ba95..3433967 100644
--- 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/prefs.dtd b/locale/hr-HR/prefs.dtd
index 45930ec..32e5210 100644
--- a/locale/hr-HR/prefs.dtd
+++ b/locale/hr-HR/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Izbornici">
 <!ENTITY tab.menus.sidebar "Rubni stupac">
 <!ENTITY tab.keys "Kratice">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Orijentacija">
 <!ENTITY gen.orient.label "Prikaži rubni stupac na">
 <!ENTITY gen.orient.left "lijevoj strani">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Promjene obuhvaćaju samo nove prozore">
 <!ENTITY keyconfig.onreset "Potrebno je ponovno pokretanje preglednika">
 <!ENTITY keyconfig.unrecognized "Neprepoznatljivo ($1)">
-<!ENTITY keyconfig.used "Ova tipka se već koristi od strane: \n\n\t$1\n\nMoguće je da će raditi, iako…">
+<!ENTITY keyconfig.used "Ova tipka se već koristi od strane: \\n\\n\\t$1\\n\\nMoguće je da će raditi, iako…">
 <!ENTITY menus.sidebar.desc "Prilagodi unose u izborniku “Pogled > Rubni stupac” i padajućim izbornicima gumba rubnog stupca">
 <!ENTITY menus.icons.label "Prikaži ikone">
 <!ENTITY menus.entries.label "Prikaži unose">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Show the Downloads sidebar when downloading a file">
 <!ENTITY misc.dm.autoclose.label "Close it when all downloads are finished">
 <!ENTITY misc.colors.label "Omogući pozadine u boji zasnovane na trenutnom stanju">
-<!ENTITY misc.slim.label "Omogući tanak popis">
 <!ENTITY misc.count.label "Prikaži brojeve stavki">
 <!ENTITY misc.enablelink.tooltip "Kliknite ovdje za više informacija (poveznica na FAQ)">
 <!ENTITY misc.paneltab.reverse "Promijeni akcije lijevog i desnog klika">
diff --git a/locale/hu-HU/about.dtd b/locale/hu-HU/about.dtd
index b883524..81bda17 100644
--- a/locale/hu-HU/about.dtd
+++ b/locale/hu-HU/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Beállítások…">
 <!ENTITY close "Bezárás">
 <!ENTITY tab.about "Névjegy">
+<!ENTITY tab.help "Súgó">
 <!ENTITY tab.contrib "Hozzájárulók">
 <!ENTITY tab.trans "Fordítók">
 <!ENTITY about.desc "Az All-in-One Sidebar számos ablakot oldalsávként nyit meg és lehetőséget biztosít a gyors váltásra. Ezzel vet véget az ablakok káoszának. A könyvjelzők és az előzmények továbbra is ablakban jelenhet meg, míg a letöltések, a bővítmények és a további ablakok oldalsávként.">
+<!ENTITY create.desc "Készítette: Ingo Wennemaring, Hamburg [Németország]">
+<!ENTITY help.desc "Erről a kiterjesztésről további információkat a következő weboldalon találhat:">
 <!ENTITY about1.name "Honlap - rengeteg információ">
 <!ENTITY about2.name "Szolgáltatások - az All-in-One Sidebar összes szolgáltatása">
 <!ENTITY about3.name "GYIK - Gyakran Ismételt Kérdések és a válaszok">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Fórum - eszmecserék, hibajelentések valamint beszélgetések egyéb témákról is">
 <!ENTITY about6.name "Változások - verziótörténet és változások">
 <!ENTITY about7.name "Tennivalók - tervezett szolgáltatások és fejlesztések">
-<!ENTITY create.desc "Készítette: Ingo Wennemaring, Hamburg [Németország]">
 <!ENTITY contrib.desc "Köszönöm a következő fejlesztőknek az ötletekért és a forráskódokért (ábécé sorrendben):">
 <!ENTITY contrib.thanks "Végül, de nem utolsósorban szeretném megköszönni az összes felhasználónak a tesztelési munkát, akik tesztelték a fejlesztői változatokat, hibákat jelentettek be a fórumban, megosztották ötleteiket és javaslataikat és azoknak is akik remek hozzászólásokat írtak. :o) Nagyon szépen köszönöm!">
 <!ENTITY trans.desc "Az All-in-One Sidebar fordítói (nyelvkód szerinti ábécé sorrendben):">
diff --git a/locale/hu-HU/prefs.dtd b/locale/hu-HU/prefs.dtd
index 098f03f..6badcbe 100644
--- a/locale/hu-HU/prefs.dtd
+++ b/locale/hu-HU/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menük">
 <!ENTITY tab.menus.sidebar "Oldalsáv">
 <!ENTITY tab.keys "Gyorsbillentyűk">
+<!ENTITY tab.about "Névjegy/Súgó">
 <!ENTITY gen.orient.caption "Elhelyezkedés">
 <!ENTITY gen.orient.label "Az oldalsáv megjelenítése a">
 <!ENTITY gen.orient.left "bal oldalon">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "A változtatások csak az új ablakokat érintik">
 <!ENTITY keyconfig.onreset "A böngésző újraindítását igényli">
 <!ENTITY keyconfig.unrecognized "Ismeretlen ($1)">
-<!ENTITY keyconfig.used "Ezt a billentyűkombinációt már használja a következő: \n\n\t$1\n\nBár ettől még működhet.">
+<!ENTITY keyconfig.used "Ezt a billentyűkombinációt már használja a következő: \\n\\n\\t$1\\n\\nBár ettől még működhet.">
 <!ENTITY menus.sidebar.desc "Testreszabhatja az elemeket a böngésző “Nézet > Oldalsáv” menüjében és az Oldalsáv gombok legördülő menüiben is.">
 <!ENTITY menus.icons.label "Ikonok megjelenítése">
 <!ENTITY menus.entries.label "Menüelemek megjelenítése">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Fájl letöltésekor a Letöltések oldalsáv megjelenítése">
 <!ENTITY misc.dm.autoclose.label "Letöltések befejezése után zárja be az ablakot">
 <!ENTITY misc.colors.label "Színezett hátterek engedélyezése a jelenlegi állapot alapján">
-<!ENTITY misc.slim.label "Lapos lista engedélyezése">
 <!ENTITY misc.count.label "Elemek számának megjelenítése">
 <!ENTITY misc.enablelink.tooltip "További információkért kattintson ide (Gyakran Ismételt Kérdések)">
 <!ENTITY misc.paneltab.reverse "Bal- és jobbkattintás műveleteinek felcserélése">
diff --git a/locale/hy-AM/about.dtd b/locale/hy-AM/about.dtd
index 2fda562..f6efa3f 100644
--- a/locale/hy-AM/about.dtd
+++ b/locale/hy-AM/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Նախընտրանքներ…">
 <!ENTITY close "Փակել">
 <!ENTITY tab.about "Մասին">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Մասնակիցներ">
 <!ENTITY tab.trans "Թարգմանիչներ">
 <!ENTITY about.desc "All-in-One Sidebar-ը թույլ է տալիս բացել բազմապիսի պատուհաններ կողավահանակում եւ փոխանջատվել դրանց մեջ: Այսպիսով այն վերջ է տալիս պատուհանների քաոսին:Բացի ՛Պատմություն՛ եւ ՛Էջադիրներ՛ պատուհաններից այն բացում է նաեւ այնպիսի պատուհաններ ինչպիսիք են ՛Քաշելիքներ՛, ՛Ավելացումներ՛ եւ շատ ավելին:">
+<!ENTITY create.desc "Ստեղծող` Ingo Wennemaring, Համբուրգ [Գերմանիա]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Գլխավոր կայք - մեծ քանակությամբ տեղեկություն մեկ տեղում">
 <!ENTITY about2.name "Հնարավորությունները -«All-in-One Sidebar»-ի բոլոր հնարավորությունները">
 <!ENTITY about3.name "ՀՏՀ ` հաճախ տրվող հարցեր և պատասխաններ">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Ֆորում ` քննարկումներ, սխալների հայտնում և այլն">
 <!ENTITY about6.name "Changelog ` պատմությունը և փոփոխությունները">
 <!ENTITY about7.name "Todo ` պլանավորված ողղումներ և ընդլայնումներ">
-<!ENTITY create.desc "Ստեղծող` Ingo Wennemaring, Համբուրգ [Գերմանիա]">
 <!ENTITY contrib.desc "Ես շնորհակալեմ այս նախագծողներին ոգեշնչման և կոդի կտորների համար  [այբենական կարգով]:">
 <!ENTITY contrib.thanks "Վերջապես, բայց ոչ վերջին հերթին, շնորհակալ եմ բոլոր օգտագործողներին, ովքեր օգնել են թեստավորել նախնական տարբերակները, հայտնել են ֆորումում սխալների մասին, կիսվել են գաղափարներով և առաջարկություններով կամ գրել են դրական մեկնաբանություն: :-) Բոլորիդ շատ շնորհակալություն!">
 <!ENTITY trans.desc "Թարգմանիչների ցանկ [դասավորված ըստ լեզվի կոդի]:">
diff --git a/locale/hy-AM/prefs.dtd b/locale/hy-AM/prefs.dtd
index 3d2db38..d3b8d5b 100644
--- a/locale/hy-AM/prefs.dtd
+++ b/locale/hy-AM/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Մենյուներ">
 <!ENTITY tab.menus.sidebar "Կողավահանակ">
 <!ENTITY tab.keys "Կոճակներ">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Դիրքը">
 <!ENTITY gen.orient.label "Կողավահանակը">
 <!ENTITY gen.orient.left "ձախից">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Փոփոխությունները ազդում են միայն նոր պատուհանների վրա">
 <!ENTITY keyconfig.onreset "Պետք է վերբեռնել ծրագիրը">
 <!ENTITY keyconfig.unrecognized "Չհայտնաբերված ($1)">
-<!ENTITY keyconfig.used "Այդ կոճակը օգտագործված է` \n\n\t$1\n\nՉնայած դա կաշխատի:">
+<!ENTITY keyconfig.used "Այդ կոճակը օգտագործված է` \\n\\n\\t$1\\n\\nՉնայած դա կաշխատի:">
 <!ENTITY menus.sidebar.desc "Փոփոխել «Տեսք > Կողավահանակ» և կողավահանակի կոճակների մենյուների պարունակությունը:">
 <!ENTITY menus.icons.label "Ցույց տալ նկարները">
 <!ENTITY menus.entries.label "Մենյուում ավելացնել կոճակներ">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Ցույց տալ պատուհանը քաշելու ժամանակ">
 <!ENTITY misc.dm.autoclose.label "Փակել ավարտից հետո">
 <!ENTITY misc.colors.label "Թույլտարել ֆոնի գունավորումը">
-<!ENTITY misc.slim.label "Միացնել Բարակ Ցուցակը">
 <!ENTITY misc.count.label "Ցույց տալ հերթական համարները">
 <!ENTITY misc.enablelink.tooltip "Սեղմել ավելի շատ իմանալու համար (հղում դեպի անգլերեն ՀՏՀ)">
 <!ENTITY misc.paneltab.reverse "Մկնիկի ձախ և միջին կոճակների գործողությունները տեղերով փոխել">
diff --git a/locale/it/about.dtd b/locale/it/about.dtd
index 52e6124..03e26d7 100644
--- a/locale/it/about.dtd
+++ b/locale/it/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Impostazioni…">
 <!ENTITY close "Chiudi">
 <!ENTITY tab.about "Informazioni">
+<!ENTITY tab.help "Contenuti guida">
 <!ENTITY tab.contrib "Collaboratori">
 <!ENTITY tab.trans "Traduttori">
 <!ENTITY about.desc "Permette di aprire diverse finestre quale la finestra di gestione dei download nella barra laterale analogamente alla barra dei segnalibri e della cronologia, passando rapidamente da una all'altra">
+<!ENTITY create.desc "creata da Ingo Wennemaring, Amburgo [Germania]">
+<!ENTITY help.desc "I contenuti guida di All-in-One Sidebar sono disponibili (in inglese) nelle pagine web qui sotto">
 <!ENTITY about1.name "Sito web - molteplici informazioni tutte insieme">
 <!ENTITY about2.name "Caratteristiche - tutte le caratteristiche di All-in-One Sidebar">
 <!ENTITY about3.name "FAQ - domande poste frequentemente e risposte">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Forum - discussioni, rapporti sui bug e soluzioni per i conflitti dei temi">
 <!ENTITY about6.name "Storico - cronologia e modifiche">
 <!ENTITY about7.name "Da fare - aggiunte pianificate e miglioramenti">
-<!ENTITY create.desc "creata da Ingo Wennemaring, Amburgo [Germania]">
 <!ENTITY contrib.desc "Si ringraziano i seguenti sviluppatori per l'ispirazione e le parti di codice (ordine alfabetico):">
 <!ENTITY contrib.thanks "Si ringraziano infine tutti gli utilizzatori che hanno aiutato testando le versioni in via di sviluppo, riportando i bug nel forum, condividendo le loro idee ed i loro suggerimenti o scrivendo giusto un commento carino :-). Molte grazie!">
 <!ENTITY trans.desc "I traduttori di All-in-One Sidebar (in ordine alfabetico per sigla della lingua):">
diff --git a/locale/it/lib.properties b/locale/it/lib.properties
index 14e6e02..8bca7f9 100644
--- a/locale/it/lib.properties
+++ b/locale/it/lib.properties
@@ -1,10 +1,10 @@
-extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description=Permette di aprire diverse finestre quale la finestra di gestione dei download nella barra laterale analogamente alla barra dei segnalibri e della cronologia, passando rapidamente da una all'altra
+extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description=Permette di aprire diverse finestre quale la finestra di gestione dei download nella barra laterale analogamente alla barra dei segnalibri e della cronologia, passando rapidamente da una all\'altra
 bm_hi.search.blur=Cerca…
 prefs.confirm=Ripristinare le impostazioni predefinite di All-in-One Sidebar?
-prefs.import=Importare queste impostazioni di All-in-One Sidebar?\n\n
+prefs.import=Importare queste impostazioni di All-in-One Sidebar?\\n\\n
 prefs.save=Esporta le impostazioni
 prefs.open=Importa le impostazioni
 prefs.copy=Le impostazioni sono state copiate con successo negli appunti
 prefs.invalid=Impossibile importare le impostazioni poiché il file non è valido
-prefs.failed=L'importazione delle impostazioni non è riuscita
+prefs.failed=L\'importazione delle impostazioni non è riuscita
 prefs.openpanel=Apri
diff --git a/locale/it/prefs.dtd b/locale/it/prefs.dtd
index 220640d..136b043 100644
--- a/locale/it/prefs.dtd
+++ b/locale/it/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menu">
 <!ENTITY tab.menus.sidebar "Barra laterale">
 <!ENTITY tab.keys "Scorciatoie da tastiera">
+<!ENTITY tab.about "Informazioni/Contenuti guida">
 <!ENTITY gen.orient.caption "Orientamento">
 <!ENTITY gen.orient.label "Posiziona la barra laterale nella">
 <!ENTITY gen.orient.left "parte sinistra della finestra">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Mostra la barra laterale quando si scarica un file">
 <!ENTITY misc.dm.autoclose.label "Chiudila quando tutti i download sono completati">
 <!ENTITY misc.colors.label "Attiva gli sfondi colorati in base allo stato attuale">
-<!ENTITY misc.slim.label "Attiva la lista compatta">
 <!ENTITY misc.count.label "Mostra il numero degli elementi">
 <!ENTITY misc.enablelink.tooltip "Fare clic qui per ulteriori informazioni (link alle FAQ)">
 <!ENTITY misc.paneltab.reverse "Scambia le azioni del clic con tasto sinistro con clic centrale">
diff --git a/locale/ja-JP/about.dtd b/locale/ja-JP/about.dtd
index 77d7baf..da5fcf6 100644
--- a/locale/ja-JP/about.dtd
+++ b/locale/ja-JP/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "設定">
 <!ENTITY close "閉じる">
 <!ENTITY tab.about "About">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "貢献者">
 <!ENTITY tab.trans "翻訳者">
 <!ENTITY about.desc "The All-in-One Sidebar lets you open various windows as sidebar panels, and quickly switch between them. So it put an end to the window chaos! In addition to bookmarks and history it opens dialogues such as downloads, add-ons and more in the sidebar.">
+<!ENTITY create.desc "作成者: Ingo Wennemaring, ハンブルク [ドイツ]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "ホームページ - あらゆる情報を掲載">
 <!ENTITY about2.name "特徴 - All-in-One Sidebar のすべて">
 <!ENTITY about3.name "FAQ - よくある質問と回答">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "フォーラム - 質疑応答、バグレポート、テーマフィックス、その他">
 <!ENTITY about6.name "更新履歴 - 更新とその履歴">
 <!ENTITY about7.name "プランニング - 新機能と改良の計画">
-<!ENTITY create.desc "作成者: Ingo Wennemaring, ハンブルク [ドイツ]">
 <!ENTITY contrib.desc "インスピレーションとコード部分について以下の開発者に感謝します (アルファベット順)">
 <!ENTITY contrib.thanks "フォーラムに開発版のテスト結果やバグ報告をして助けてくれたり、アイデアや提案を共有したり、楽しいコメントを寄せてくれる多くのユーザに感謝します。ありがとうございます!">
 <!ENTITY trans.desc "All-in-One Sidebar の言語翻訳者の皆さん (アルファベット順/英語表記名)">
diff --git a/locale/ja-JP/lib.dtd b/locale/ja-JP/lib.dtd
index 66289a3..f7aa335 100644
--- a/locale/ja-JP/lib.dtd
+++ b/locale/ja-JP/lib.dtd
@@ -7,7 +7,7 @@
 <!ENTITY key.shift "Shift">
 <!ENTITY menu.tools.label "ツール">
 <!ENTITY closeFolder.label "すべてのフォルダを閉じる">
-<!ENTITY show.closeFolder.label "'すべてのフォルダを閉じる' ボタン">
+<!ENTITY show.closeFolder.label "\'すべてのフォルダを閉じる\' ボタン">
 <!ENTITY enable.autoClose.label "自動的に他のフォルダを閉じる">
 <!ENTITY enable.scrollToFolder.label "自動的に選択したフォルダにスクロール">
 <!ENTITY enable.rememberFolder.label "最後に選択したフォルダを記憶して移動">
diff --git a/locale/ja-JP/prefs.dtd b/locale/ja-JP/prefs.dtd
index c031ce5..2911893 100644
--- a/locale/ja-JP/prefs.dtd
+++ b/locale/ja-JP/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "メニュー">
 <!ENTITY tab.menus.sidebar "サイドバー">
 <!ENTITY tab.keys "ショートカット">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "外観設定">
 <!ENTITY gen.orient.label "表示位置方向">
 <!ENTITY gen.orient.left "左側に置く">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "新規ウィンドウで変更が反映されます">
 <!ENTITY keyconfig.onreset "ブラウザを再起動してください">
 <!ENTITY keyconfig.unrecognized "認識できません ($1)">
-<!ENTITY keyconfig.used "そのキーはすでに使われています:   \t$1  It そのキーはまだ有効だと思われます">
+<!ENTITY keyconfig.used "そのキーはすでに使われています:   \\t$1  It そのキーはまだ有効だと思われます">
 <!ENTITY menus.sidebar.desc "“ 表示 > サイドバー ” メニューとサイドバーボタンのドロップダウンメニューの登録選択">
 <!ENTITY menus.icons.label "アイコンの表示">
 <!ENTITY menus.entries.label "エントリーの表示">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "ファイルのダウンロード時にダウンロードマネージャをサイドバーに開く">
 <!ENTITY misc.dm.autoclose.label "ダウンロード完了時にダウンロードマネージャを閉じる">
 <!ENTITY misc.colors.label "現状の背景色を有効にする">
-<!ENTITY misc.slim.label "スリム表示にする">
 <!ENTITY misc.count.label "アイテム数の表示">
 <!ENTITY misc.enablelink.tooltip "より詳しい情報を得るにはここをクリックしてください (FAQ's にリンク)">
 <!ENTITY misc.paneltab.reverse "左クリックと中クリックの動作を入れ替える">
diff --git a/locale/ko-KR/about.dtd b/locale/ko-KR/about.dtd
index c620aef..7aaccba 100644
--- a/locale/ko-KR/about.dtd
+++ b/locale/ko-KR/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "설정…">
 <!ENTITY close "닫기">
 <!ENTITY tab.about "AIOS는">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "공헌자분들">
 <!ENTITY tab.trans "번역가분들">
 <!ENTITY about.desc "All-in-One Sidebar는 북마크, 방문 기록은 물론 다운로드, 부가 가능 등의 대화창을 탐색 창에 집어 넣어서, 그들 사이를 신속히 전환할 수 있도록 해줍니다. 이것은 대화창으로 화면이 너저분해 지는 것을 방지해 줍니다!">
+<!ENTITY create.desc "만든이: Ingo Wennemaring,  함부르크 [독일]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "홈페이지 - 많은 정보를 한 곳에서 볼 수 있습니다">
 <!ENTITY about2.name "기능 - All-In-One Sidebar의 모든 기능을 알려드립니다">
 <!ENTITY about3.name "FAQ - 자주 하는 질문과 그에 대한 답변입니다">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "포럼 - 대화, 버그 보고, 테마 수정 및 기타 등등">
 <!ENTITY about6.name "변경 기록부 - 히스토리 및 변경사항입니다">
 <!ENTITY about7.name "To-do - 추가 예정인 기능과 개선할 사항입니다">
-<!ENTITY create.desc "만든이: Ingo Wennemaring,  함부르크 [독일]">
 <!ENTITY contrib.desc "영감을 준 그리고 코드를 인용하게 해준 아래의 개발자분들께 감사의 마음을 전합니다 [알파벳순 정렬]:">
 <!ENTITY contrib.thanks "마지막으로 개발 빌드 버전을 테스트해 주시거나, 포럼에 버그를 보고해 주시거나, 아이디어와 발상을 빌려주시거나 단지 좋은 댓글을 달아 주는 등의 도움을 주신 모든 사용자 분들께 감사의 마음을 전합니다. :-) 정말 감사합니다!">
 <!ENTITY trans.desc "All-In-One Sidebar의 번역가분들 [언어 코드의 알파벳순으로 정렬]:">
diff --git a/locale/ko-KR/lib.dtd b/locale/ko-KR/lib.dtd
index 0c0e0b0..1768c63 100644
--- a/locale/ko-KR/lib.dtd
+++ b/locale/ko-KR/lib.dtd
@@ -7,7 +7,7 @@
 <!ENTITY key.shift "Shift">
 <!ENTITY menu.tools.label "도구">
 <!ENTITY closeFolder.label "모든 폴더 닫기">
-<!ENTITY show.closeFolder.label "'모든 폴더 닫기' 버튼">
+<!ENTITY show.closeFolder.label "\'모든 폴더 닫기\' 버튼">
 <!ENTITY enable.autoClose.label "다른 폴더 자동으로 닫기">
 <!ENTITY enable.scrollToFolder.label "선택한 폴더로 자동으로 스크롤하기">
 <!ENTITY enable.rememberFolder.label "마지막으로 선택한 폴더를 기억하고 활성화하기">
diff --git a/locale/ko-KR/prefs.dtd b/locale/ko-KR/prefs.dtd
index 266dd18..1808d6c 100644
--- a/locale/ko-KR/prefs.dtd
+++ b/locale/ko-KR/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "메뉴">
 <!ENTITY tab.menus.sidebar "탐색 창">
 <!ENTITY tab.keys "단축키">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "위치">
 <!ENTITY gen.orient.label "탐색 창을">
 <!ENTITY gen.orient.left "왼쪽에 표시">
@@ -71,8 +72,8 @@
 <!ENTITY keyconfig.warn "바뀐 사항은 새 창에서부터 적용됩니다.">
 <!ENTITY keyconfig.onreset "브라우저를 다시 시작해야 합니다.">
 <!ENTITY keyconfig.unrecognized "인식되지 않음 ($1)">
-<!ENTITY keyconfig.used "이 키는 \n\n\t$1이\n\n쓰고 있으므로 동작하지 않을듯합니다.">
-<!ENTITY menus.sidebar.desc "'보기 > 탐색 창' 메뉴의 항목들과 탐색 창 버튼의 내리펼침 메뉴의 항목들을 설정하세요.">
+<!ENTITY keyconfig.used "이 키는 \\n\\n\\t$1이\\n\\n쓰고 있으므로 동작하지 않을듯합니다.">
+<!ENTITY menus.sidebar.desc "\'보기 > 탐색 창\' 메뉴의 항목들과 탐색 창 버튼의 내리펼침 메뉴의 항목들을 설정하세요.">
 <!ENTITY menus.icons.label "아이콘 보이기">
 <!ENTITY menus.entries.label "목록 보이기">
 <!ENTITY menus.sidebar.entrydeac "역동적인 탐색 창 목록을 안 쓰기">
@@ -82,11 +83,10 @@
 <!ENTITY misc.dm.autoopen.label "파일을 다운로드할 때 다운로드 탐색 창 보이기">
 <!ENTITY misc.dm.autoclose.label "다운로드가 모두 끝나면 탐색 창을 닫기">
 <!ENTITY misc.colors.label "현재 상태를 기초로 한 색깔있는 배경 쓰기">
-<!ENTITY misc.slim.label "얇은 목록 쓰기">
 <!ENTITY misc.count.label "항목의 수 보이기">
 <!ENTITY misc.enablelink.tooltip "더 많은 정보를 보려면 여기를 클릭하십시오 (FAQ로 가는 링크)">
 <!ENTITY misc.paneltab.reverse "왼쪽 클릭과 가운데 클릭의 동작을 서로 바꾸기">
-<!ENTITY misc.bm.paneltab.desc "'패널탭' 버튼으로 북마크 패널 대신 북마크 관리자를 새 탭으로 열 수 있습니다.">
+<!ENTITY misc.bm.paneltab.desc "\'패널탭\' 버튼으로 북마크 패널 대신 북마크 관리자를 새 탭으로 열 수 있습니다.">
 <!ENTITY misc.bm.paneltab "새 탭에 북마크 관리자를 여는 것을 허용">
 <!ENTITY special.collapsing.caption "탐색 창 접기">
 <!ENTITY special.collapsing.label "탐색 창 접기 쓰기">
diff --git a/locale/lt-LT/about.dtd b/locale/lt-LT/about.dtd
index f3922f1..8dace55 100644
--- a/locale/lt-LT/about.dtd
+++ b/locale/lt-LT/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Nustatymai…">
 <!ENTITY close "Užverti">
 <!ENTITY tab.about "Apie">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Pagalbininkai">
 <!ENTITY tab.trans "Vertėjai">
 <!ENTITY about.desc "The All-in-One Sidebar lets you open various windows as sidebar panels, and quickly switch between them. So it put an end to the window chaos! In addition to bookmarks and history it opens dialogues such as downloads, add-ons and more in the sidebar.">
+<!ENTITY create.desc "sukūrė Ingo Wennemaring, Hamburgas (Vokietija)">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Pradžios tinklalapis - daug informacijos">
 <!ENTITY about2.name "Savybės - visos „All-in-One Sidebar“ savybės">
 <!ENTITY about3.name "DUK - dažnai užduodami klausimai ir atsakymai">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Forumas - diskusijos, pranešimai apie klaidas, grafinių apvalkalų pataisymai ir t.t.">
 <!ENTITY about6.name "Pakeitimų sąrašas - istorija ir pakeitimai">
 <!ENTITY about7.name "To-do - planuojamos savybės bei patobulinimai">
-<!ENTITY create.desc "sukūrė Ingo Wennemaring, Hamburgas (Vokietija)">
 <!ENTITY contrib.desc "Dėkoju šiems žmonėms už įkvėpimą ir kodo fragmentus (abėcėlės tvarka):">
 <!ENTITY contrib.thanks "Taip pat dėkoju visiems, padėjusiems testuoti priedą, pranešusiems apie klaidas forume, besidalijusiems savo idėjomis ir pasiūlymais ar tiesiog rašiusiems gražius komentarus. :-) Labai ačiū Jums!">
 <!ENTITY trans.desc "„All-in-One Sidebar“ vertėjai (abėcėlės tvarka pagal kalbos trumpinį):">
diff --git a/locale/lt-LT/lib.dtd b/locale/lt-LT/lib.dtd
index 233ee4c..bf7e7bb 100644
--- 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/prefs.dtd b/locale/lt-LT/prefs.dtd
index 01508cb..165b542 100644
--- a/locale/lt-LT/prefs.dtd
+++ b/locale/lt-LT/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Meniu">
 <!ENTITY tab.menus.sidebar "Parankinė">
 <!ENTITY tab.keys "Trumpiniai">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Orientacija">
 <!ENTITY gen.orient.label "Rodyti parankinę">
 <!ENTITY gen.orient.left "kairėje pusėje">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Pakeitimai įsigalios tik naujiems langams">
 <!ENTITY keyconfig.onreset "Reikia iš naujo paleisti naršyklę">
 <!ENTITY keyconfig.unrecognized "Neatpažinta ($1)">
-<!ENTITY keyconfig.used "Spartieji klavišai jau naudojami šiam veiksmui: \n\n\t$1\n\nTačiau tai vistiek gali veikti.">
+<!ENTITY keyconfig.used "Spartieji klavišai jau naudojami šiam veiksmui: \\n\\n\\t$1\\n\\nTačiau tai vistiek gali veikti.">
 <!ENTITY menus.sidebar.desc "Prisitaikykite „Rodinys > Parankinė“ ir kontekstinius parankinės mygtukų meniu įrašus.">
 <!ENTITY menus.icons.label "Rodyti piktogramas">
 <!ENTITY menus.entries.label "Rodyti įrašus">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Show the Downloads sidebar when downloading a file">
 <!ENTITY misc.dm.autoclose.label "Close it when all downloads are finished">
 <!ENTITY misc.colors.label "Įjungti spalvotus fonus pagal dabartinę būseną">
-<!ENTITY misc.slim.label "Įjungti sumažintą sąrašą">
 <!ENTITY misc.count.label "Rodyti elementų skaičių">
 <!ENTITY misc.enablelink.tooltip "Spragtelkite čia norėdami gauti daugiau informacijos (nuoroda į DUK)">
 <!ENTITY misc.paneltab.reverse "Swap Left-click and Middle-click Actions">
diff --git a/locale/nb-NO/about.dtd b/locale/nb-NO/about.dtd
index 4fd304b..df689ff 100644
--- a/locale/nb-NO/about.dtd
+++ b/locale/nb-NO/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Innstillinger…">
 <!ENTITY close "Lukk">
 <!ENTITY tab.about "Om">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Bidragsytere">
 <!ENTITY tab.trans "Oversettere">
 <!ENTITY about.desc "The All-in-One Sidebar lets you open various windows as sidebar panels, and quickly switch between them. So it put an end to the window chaos! In addition to bookmarks and history it opens dialogues such as downloads, add-ons and more in the sidebar.">
+<!ENTITY create.desc "laget av Ingo Wennemaring, Hamburg [Tyskland]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Hjemmeside - masse informasjon på ett sted">
 <!ENTITY about2.name "Muligheter - alle mulighetene som All-in-One Sidebar har">
 <!ENTITY about3.name "OSP - ofte stilte spørsmål og svar">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Forum - diskusjon, feilrapporter og temafikser blant mange andre ting">
 <!ENTITY about6.name "Endringslogg - historie og endringer">
 <!ENTITY about7.name "To-do - planlagte muligheter og forbedringer">
-<!ENTITY create.desc "laget av Ingo Wennemaring, Hamburg [Tyskland]">
 <!ENTITY contrib.desc "Jeg takker følgende utviklere for inspirasjon og kodebiter [alfabetisk rekkefølge]:">
 <!ENTITY contrib.thanks "Sist, men ikke minst vil jeg takke alle brukerne som har hjulpet med testing av prøveversjoner, feilrapportering i forumet, deling av ideer og forslag eller de som kun skrev en hyggelig kommentar. :-) Tusen takk skal du ha!">
 <!ENTITY trans.desc "All-in-One Sidebars oversettere [alfabetisk rekkefølge etter landskode]:">
diff --git a/locale/nb-NO/lib.dtd b/locale/nb-NO/lib.dtd
index c4c5aff..6d1a503 100644
--- 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/prefs.dtd b/locale/nb-NO/prefs.dtd
index 305044a..4338257 100644
--- a/locale/nb-NO/prefs.dtd
+++ b/locale/nb-NO/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menyer">
 <!ENTITY tab.menus.sidebar "Sidestolpe">
 <!ENTITY tab.keys "Snarveier">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Orientering">
 <!ENTITY gen.orient.label "Vis sidestolpe på">
 <!ENTITY gen.orient.left "venstre side">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Endringer vil kun ha virkning på nye vinduer">
 <!ENTITY keyconfig.onreset "Nettleseren må omstartes">
 <!ENTITY keyconfig.unrecognized "Ukjent (&1)">
-<!ENTITY keyconfig.used "Denne nøkkelen brukes allerede av: \n\n\t$1\n\nVil kanskje virke…">
+<!ENTITY keyconfig.used "Denne nøkkelen brukes allerede av: \\n\\n\\t$1\\n\\nVil kanskje virke…">
 <!ENTITY menus.sidebar.desc "Tilpass elementene i menyen “Vis > Sidestolpe” og i rullegardinmenyene i sidestolpevalgene.">
 <!ENTITY menus.icons.label "Vis ikoner">
 <!ENTITY menus.entries.label "Vis elementer">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Show the Downloads sidebar when downloading a file">
 <!ENTITY misc.dm.autoclose.label "Close it when all downloads are finished">
 <!ENTITY misc.colors.label "Aktiver farget bakgrunn basert på nåværende tilstand">
-<!ENTITY misc.slim.label "Aktiver smal liste">
 <!ENTITY misc.count.label "Vis nummer på elementene">
 <!ENTITY misc.enablelink.tooltip "Klikk her for mer informasjon (lenke til FAQ's)">
 <!ENTITY misc.paneltab.reverse "Bytt venstreklikk og midtklikk handling">
diff --git a/locale/nl/about.dtd b/locale/nl/about.dtd
index 744f07b..2dda17e 100644
--- a/locale/nl/about.dtd
+++ b/locale/nl/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Instellingen…">
 <!ENTITY close "Sluiten">
 <!ENTITY tab.about "Over">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Medewerkers">
 <!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 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">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Forum - discussies, bugmeldingen, thema oplossingen naast andere zaken">
 <!ENTITY about6.name "Changelog - geschiedenis en veranderingen">
 <!ENTITY about7.name "Te doen - Geplande functies en verbeteringen">
-<!ENTITY create.desc "gemaakt door Ingo Wennemaring, Hamburg [Duitsland]">
 <!ENTITY contrib.desc "Ik bedankt de volgende ontwikkelaars voor hun inspiratie en code-onderdelen (alfabetische volgorde):">
 <!ENTITY contrib.thanks "Als laatste, maar niet minste, bedank ik alle gebruikers die geholpen hebben met het testen van de developmentversies, raporteren van bugs in het forum, het delen van ideeën en suggesties of die simpelweg een mooie reactie hebben geschreven :-). Heel erg bedankt!">
 <!ENTITY trans.desc "De vertalers van All-in-One Sidebar (alfabetische volgorde van de taal):">
diff --git a/locale/nl/prefs.dtd b/locale/nl/prefs.dtd
index 4083f68..e6d0319 100644
--- a/locale/nl/prefs.dtd
+++ b/locale/nl/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menu’s">
 <!ENTITY tab.menus.sidebar "Zijbalk">
 <!ENTITY tab.keys "Sneltoetsen">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Oriëntatie">
 <!ENTITY gen.orient.label "Zijbalk tonen aan">
 <!ENTITY gen.orient.left "linkerkant">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Veranderingen alleen bij nieuwe vensters">
 <!ENTITY keyconfig.onreset "Herstart van de browser is noodzakelijk">
 <!ENTITY keyconfig.unrecognized "Niet herkend ($1)">
-<!ENTITY keyconfig.used "Deze toets wordt al gebruikt door: \n\n\t$1\n\nZou eventueel wel kunnen werken.">
+<!ENTITY keyconfig.used "Deze toets wordt al gebruikt door: \\n\\n\\t$1\\n\\nZou eventueel wel kunnen werken.">
 <!ENTITY menus.sidebar.desc "De items in het menu “Beeld > Zijbalk” aanpassen en de keuzemenu's van de zijbalkknoppen.">
 <!ENTITY menus.icons.label "Pictogrammen tonen">
 <!ENTITY menus.entries.label "Items tonen">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Downloadzijbalk tonen tijdens het downloaden van een bestand">
 <!ENTITY misc.dm.autoclose.label "Sluiten wanneer alle downloads klaar zijn">
 <!ENTITY misc.colors.label "Gekleurde achtergronden gebaseerd op de huidige toestand inschakelen">
-<!ENTITY misc.slim.label "Slanke lijst inschakelen">
 <!ENTITY misc.count.label "Aantal items tonen">
 <!ENTITY misc.enablelink.tooltip "Klik hier voor meer informatie (koppeling naar de FAQ's)">
 <!ENTITY misc.paneltab.reverse "Linker- en middelklikacties omwisselen">
diff --git a/locale/pl/about.dtd b/locale/pl/about.dtd
index 076a8ae..0494279 100644
--- a/locale/pl/about.dtd
+++ b/locale/pl/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Ustawienia">
 <!ENTITY close "Zamknij">
 <!ENTITY tab.about "O AIOS">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Współtwórcy">
 <!ENTITY tab.trans "Tłumacze">
 <!ENTITY about.desc "All-in-One Sidebar umożliwia otwieranie różnych okien w panelu bocznym i szybkie przełączanie się pomiędzy nimi. Koniec z chaosem okien! Oprócz zakładek i historii można teraz otwierać w panelu bocznym menedżer pobierania, dodatków i wiele innych…">
+<!ENTITY create.desc "Autor: Ingo Wennemaring, Hamburg [DE]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Strona domowa - mnóstwo informacji w jednym miejscu">
 <!ENTITY about2.name "Opcje - wszystkie opcje All-In-One Sidebar">
 <!ENTITY about3.name "FAQ - często zadawane pytania i odpowiedzi">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Forum - dyskusja, raportowanie o błędach, zmiany motywów i inne sprawy">
 <!ENTITY about6.name "Lista zmian - historia i wykonane zmiany">
 <!ENTITY about7.name "Do zrobienia - planowane nowe opcje i udoskonalenia">
-<!ENTITY create.desc "Autor: Ingo Wennemaring, Hamburg [DE]">
 <!ENTITY contrib.desc "Dziękuję następującym twórcom za inspirację i części kodu (w porządku alfabetycznym):">
 <!ENTITY contrib.thanks "Chciałbym podziękować wszystkim użytkownikom, którzy pomagali w testowaniu i rozwoju tego wydania informując o błędach, dzieląc się swoimi uwagami i sugestiami lub pisząc piękne komentarze na forum. :-) Dziękuję bardzo!">
 <!ENTITY trans.desc "Tłumacze All-In-One Sidebar (w porządku alfabetycznym kodów języków):">
diff --git a/locale/pl/lib.properties b/locale/pl/lib.properties
index 6c83bce..c561626 100644
--- a/locale/pl/lib.properties
+++ b/locale/pl/lib.properties
@@ -1,7 +1,7 @@
 extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description=Panel boczny podobny do tego z Opery. Daje szybki dostęp do różnych opcji.
 bm_hi.search.blur=Szukaj
 prefs.confirm=Czy na pewno chcesz przywrócić domyślne ustawienia All-In-One Sidebar?
-prefs.import=Czy na pewno chcesz zaimportować te ustawienia All-In-One Sidebar?\n\n
+prefs.import=Czy na pewno chcesz zaimportować te ustawienia All-In-One Sidebar?\\n\\n
 prefs.save=Eksportuj ustawienia
 prefs.open=Importuj ustawienia
 prefs.copy=Ustawienia zostały skopiowane do schowka.
diff --git a/locale/pl/prefs.dtd b/locale/pl/prefs.dtd
index e46d647..1cf5840 100644
--- a/locale/pl/prefs.dtd
+++ b/locale/pl/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menu">
 <!ENTITY tab.menus.sidebar "Panel boczny">
 <!ENTITY tab.keys "Skróty">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Położenie panela">
 <!ENTITY gen.orient.label "Wyświetlaj panel boczny po">
 <!ENTITY gen.orient.left "lewej stronie">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Zmiany zostaną zastosowane w nowo otwieranych oknach">
 <!ENTITY keyconfig.onreset "Zmiany zostaną zastosowane po ponownym uruchomieniu przeglądarki">
 <!ENTITY keyconfig.unrecognized "Nie rozpoznano ($1)">
-<!ENTITY keyconfig.used "Ten klawisz jest używany przez: \n\n\t$1\n\nPomimo tego mógłby nadal działać">
+<!ENTITY keyconfig.used "Ten klawisz jest używany przez: \\n\\n\\t$1\\n\\nPomimo tego mógłby nadal działać">
 <!ENTITY menus.sidebar.desc "Określ elementy wyświetlane w elemencie „Panel boczny” z menu „Widok” oraz w rozwijanych menu przycisków panelu bocznego">
 <!ENTITY menus.icons.label "Wyświetlaj ikony">
 <!ENTITY menus.entries.label "Wyświetlaj elementy">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Wyświetlaj panel pobierania podczas pobierania pliku">
 <!ENTITY misc.dm.autoclose.label "Zamknij po zakończeniu pobierania">
 <!ENTITY misc.colors.label "Włącz kolorowe tła w oparciu o aktualny stan">
-<!ENTITY misc.slim.label "Włącz skrócony tryb wyświetlania listy">
 <!ENTITY misc.count.label "Wyświetlaj ilość elementów">
 <!ENTITY misc.enablelink.tooltip "Kliknij tutaj, aby uzyskać więcej informacji (odnośnik do FAQ-ów)">
 <!ENTITY misc.paneltab.reverse "Zamień działanie kliknięcia l.p.m. z p.p.m.">
diff --git a/locale/pt-BR/about.dtd b/locale/pt-BR/about.dtd
index 8e87b14..4cf77cc 100644
--- a/locale/pt-BR/about.dtd
+++ b/locale/pt-BR/about.dtd
@@ -3,19 +3,21 @@
 <!ENTITY settings "Configurações…">
 <!ENTITY close "Fechar">
 <!ENTITY tab.about "Sobre">
+<!ENTITY tab.help "Ajuda">
 <!ENTITY tab.contrib "Colaboradores">
 <!ENTITY tab.trans "Tradutores">
-<!ENTITY about.desc "The All-in-One Sidebar lets you open various windows as sidebar panels, and quickly switch between them. So it put an end to the window chaos! In addition to bookmarks and history it opens dialogues such as downloads, add-ons and more in the sidebar.">
-<!ENTITY about1.name "Homepage - apresentação do All-in-One Sidebar">
+<!ENTITY about.desc "O All-in-One Sidebar permite que você abra várias janelas como painéis laterais e alterne entre eles rapidamente. Portanto, ele põe fim ao caos das janelas! Além dos favoritos e do histórico, ele abre no painel janelas como as de downloads, de complementos e muito mais.">
+<!ENTITY create.desc "criado por Ingo Wennemaring, Hamburgo [Alemanha]">
+<!ENTITY help.desc "Você vai encontrar muitas informações sobre este complemento no site:">
+<!ENTITY about1.name "Página inicial - apresentação do All-in-One Sidebar">
 <!ENTITY about2.name "Funcionalidades - todas as características">
-<!ENTITY about3.name "FAQ - perguntas freqüentes e suas respostas">
+<!ENTITY about3.name "FAQ - perguntas frequentes e suas respostas">
 <!ENTITY about4.name "Problemas conhecidos - descrição e soluções">
-<!ENTITY about5.name "Fórum - discussões, relatos de bug, ajustes de temas, entre outras coisas">
+<!ENTITY about5.name "Fórum - discussões, relatos de erros, ajustes de temas, entre outras coisas">
 <!ENTITY about6.name "Alterações - histórico e mudanças">
-<!ENTITY about7.name "To-do - funcionalidades previstas e melhoramentos">
-<!ENTITY create.desc "criado por Ingo Wennemaring, Hamburgo [Alemanha]">
+<!ENTITY about7.name "Pendências - funcionalidades previstas e melhorias">
 <!ENTITY contrib.desc "Agradeço aos seguintes programadores pela inspiração e partes de código (em ordem alfabética):">
-<!ENTITY contrib.thanks "Por último, mas não menos importante, agradeço a todos os usuários que ajudaram testando os builds de desenvolvimento, apontando bugs no forum, compartilhando suas idéias e sugestões ou que simplesmente escreveram um comentário legal. :-) Muito obrigado!">
+<!ENTITY contrib.thanks "Por último, mas não menos importante, agradeço a todos os usuários que ajudaram testando as versões de desenvolvimento, apontando erros no fórum, compartilhando suas ideias e sugestões ou que simplesmente escreveram um comentário legal. :-) Muito obrigado!">
 <!ENTITY trans.desc "Os tradutores do All-in-One Sidebar (por ordem alfabética de código do idioma):">
 <!ENTITY trans.ar-SA.lang "Árabe">
 <!ENTITY trans.be-BY.lang "Bielorrusso">
@@ -33,7 +35,7 @@
 <!ENTITY trans.he-IL.lang "Hebraico">
 <!ENTITY trans.hr-HR.lang "Croata">
 <!ENTITY trans.hu-HU.lang "Húngaro">
-<!ENTITY trans.hy-AM.lang "Armenian (Armenia)">
+<!ENTITY trans.hy-AM.lang "Armênio">
 <!ENTITY trans.it-IT.lang "Italiano">
 <!ENTITY trans.ja-JP.lang "Japonês">
 <!ENTITY trans.ko-KR.lang "Coreano">
@@ -43,15 +45,15 @@
 <!ENTITY trans.pl-PL.lang "Polonês">
 <!ENTITY trans.pt-BR.lang "Português (Brasil)">
 <!ENTITY trans.pt-PT.lang "Português (Portugal)">
-<!ENTITY trans.ro-RO.lang "Romanian">
+<!ENTITY trans.ro-RO.lang "Romeno">
 <!ENTITY trans.ru-RU.lang "Russo">
 <!ENTITY trans.sk-SK.lang "Eslovaco">
-<!ENTITY trans.sq-AL.lang "Albanian">
-<!ENTITY trans.sr-RS.lang "Serbian (Cyrillic)">
+<!ENTITY trans.sq-AL.lang "Albanês">
+<!ENTITY trans.sr-RS.lang "Sérvio">
 <!ENTITY trans.sv-SE.lang "Sueco">
 <!ENTITY trans.tr-TR.lang "Turco">
 <!ENTITY trans.uk-UA.lang "Ucraniano">
-<!ENTITY trans.vi-VN.lang "Vietnamese (Vietnam)">
+<!ENTITY trans.vi-VN.lang "Vietnamita">
 <!ENTITY trans.zh-CN.lang "Chinês (Simplificado)">
 <!ENTITY trans.zh-TW.lang "Chinês (Tradicional)">
 <!ENTITY trans.thanks "Eu agradeço obviamente também à equipe do BabelZilla.org por seu ótimo trabalho!">
diff --git a/locale/pt-BR/aios.dtd b/locale/pt-BR/aios.dtd
index e9a65c7..58fa4c7 100644
--- a/locale/pt-BR/aios.dtd
+++ b/locale/pt-BR/aios.dtd
@@ -1,12 +1,12 @@
 <!ENTITY loading.label "carregando painel…">
 <!ENTITY menu.prefs.label "Opções do All-in-One Sidebar…">
-<!ENTITY menu.togglebar.label "Pegador do Painel">
+<!ENTITY menu.togglebar.label "Alternador do painel">
 <!ENTITY menu.grippy.label "Pegador do painel">
 <!ENTITY toolbar.name "All-in-One Sidebar">
-<!ENTITY sbhtoolbar.name "Sidebarheader Toolbar">
+<!ENTITY sbhtoolbar.name "Barra de ferramentas de cabeçalho de painel">
 <!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">
+<!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">
 <!ENTITY button.switch.tooltip2 "Ativa/desativa a barra de ferramentas">
 <!ENTITY button.switch.tooltip3 "Ativa/desativa a barra lateral">
 <!ENTITY sidebar.open.label "Abrir painel">
@@ -29,10 +29,10 @@
 <!ENTITY button.tooltip.sidebar "Abre no painel lateral">
 <!ENTITY button.tooltip.window "Abrir em uma janela">
 <!ENTITY button.tooltip.tab "Abrir em uma nova aba">
-<!ENTITY button.addons.label "Add-ons">
+<!ENTITY button.addons.label "Complementos">
 <!ENTITY button.addons.tooltip "Exibir extensões e temas instalados">
-<!ENTITY button.multipanel.label "MultiPanel">
-<!ENTITY button.multipanel.tooltip "Exibe, por exemplo, um site da web, o código fonte e as informações do navegador">
+<!ENTITY button.multipanel.label "Multipainel">
+<!ENTITY button.multipanel.tooltip "Exibe, por exemplo, um site, o código fonte e as informações do navegador">
 <!ENTITY button.pageinfo.tooltip "Mostra informações, formulários, links, mídia e segurança">
 <!ENTITY button.console.label "Console de erros">
 <!ENTITY button.console.tooltip "Abre o console de erros, que procura problemas com o código fonte">
diff --git a/locale/pt-BR/lib.dtd b/locale/pt-BR/lib.dtd
index 4810d78..75d27fe 100644
--- a/locale/pt-BR/lib.dtd
+++ b/locale/pt-BR/lib.dtd
@@ -7,7 +7,7 @@
 <!ENTITY key.shift "Shift">
 <!ENTITY menu.tools.label "Ferramentas">
 <!ENTITY closeFolder.label "Fechar todas as pastas">
-<!ENTITY show.closeFolder.label "'Close All Folders' Button">
+<!ENTITY show.closeFolder.label "Botão 'Fechar todas as pastas'">
 <!ENTITY enable.autoClose.label "Fechar automaticamente outras pastas">
 <!ENTITY enable.scrollToFolder.label "Rolar automaticamente para pasta selecionada">
 <!ENTITY enable.rememberFolder.label "Lembrar e focar última pasta selecionada">
diff --git a/locale/pt-BR/lib.properties b/locale/pt-BR/lib.properties
index 06aa6fb..bcd74a3 100644
--- a/locale/pt-BR/lib.properties
+++ b/locale/pt-BR/lib.properties
@@ -1,10 +1,10 @@
 extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description=Controle de painéis laterais com experiência premiada!
 bm_hi.search.blur=Pesquisar…
-prefs.confirm=Tem certeza de que quer restaurar as configuraçõees do All-in-One Sidebar?
-prefs.import=Tem certeza de que quer importar estas configurações do All-in-One Sidebar?nn
+prefs.confirm=Tem certeza de que deseja restaurar as configuraçõees do All-in-One Sidebar?
+prefs.import=Tem certeza de que deseja importar estas configurações do All-in-One Sidebar?
 prefs.save=Exportar Configurações
 prefs.open=Importar Configurações
-prefs.copy=Settings copied to Clipboard.
+prefs.copy=Configurações copiadas para a área de transferência.
 prefs.invalid=Não é possível importar configurações porque este não é um arquivo válido.
-prefs.failed=Falhou ao importar configurações.
+prefs.failed=Falha ao importar configurações.
 prefs.openpanel=Abrir
diff --git a/locale/pt-BR/multipanel.dtd b/locale/pt-BR/multipanel.dtd
index 9a144ae..eaa4ca7 100644
--- a/locale/pt-BR/multipanel.dtd
+++ b/locale/pt-BR/multipanel.dtd
@@ -2,20 +2,20 @@
 <!ENTITY page.tooltip "Abrir a página web neste painel">
 <!ENTITY page.ssr.label "Conversão para tela pequena">
 <!ENTITY page.ssr100.label "Adaptar para a largura do painel">
-<!ENTITY about.label "sobre:">
+<!ENTITY about.label "about:">
 <!ENTITY about.tooltip "Exibe diferentes informações sobre o navegador">
 <!ENTITY about.config.tooltip "Exibe uma interface para visualização e definição de uma ampla variedade de variáveis de configuração">
-<!ENTITY about.plugins.tooltip "Exibe informações sobre todos os plug-ins instalados">
-<!ENTITY about.support.tooltip "Shows application basics, extensions, and modified preferences">
-<!ENTITY about.cache.tooltip "Exibe informações sobre o Serviço de Cache para cache de memória e disco">
+<!ENTITY about.plugins.tooltip "Exibe informações sobre todos os plugins instalados">
+<!ENTITY about.support.tooltip "Exibe dados básicos da aplicação, extensões e preferências modificadas">
+<!ENTITY about.cache.tooltip "Exibe informações sobre o serviço de cache para cache de memória e disco">
 <!ENTITY about.cache.disk.tooltip "Exibe entradas individuais no disco">
 <!ENTITY about.cache.memory.tooltip "Exibe entradas individuais na memória">
-<!ENTITY about.cache.offline.tooltip "List offline cache entries">
-<!ENTITY about.crashes.tooltip "Shows submitted crash reports">
-<!ENTITY about.buildconfig.tooltip "Exibe os argumentos e opções utilizadas para compilar o build em uso">
+<!ENTITY about.cache.offline.tooltip "Listar entradas de cache offline">
+<!ENTITY about.crashes.tooltip "Exibe relatórios de erros enviados">
+<!ENTITY about.buildconfig.tooltip "Exibe os parâmetros e opções utilizadas para compilar o build em uso">
 <!ENTITY about.about.tooltip "Exibe informações de versão e de copyright">
 <!ENTITY about.robots.tooltip "Gort! Klaatu barada nikto!">
 <!ENTITY about.credits.tooltip "Exibe uma lista de todos os colaboradores do Mozilla">
 <!ENTITY about.license.tooltip "Exibe a Licença Pública Mozilla">
-<!ENTITY about.mozilla.tooltip "Exibe uma página fictício Livro do Mozilla">
+<!ENTITY about.mozilla.tooltip "Exibe uma página do fictício Livro de Mozilla">
 <!ENTITY tools.remlast.label "Lembrar o último conteúdo exibido">
diff --git a/locale/pt-BR/prefs.dtd b/locale/pt-BR/prefs.dtd
index 607392f..a0a7a5c 100644
--- a/locale/pt-BR/prefs.dtd
+++ b/locale/pt-BR/prefs.dtd
@@ -1,11 +1,11 @@
 <!ENTITY title "Opções do All-in-One Sidebar">
-<!ENTITY restart "Requer reinicialização do browser">
+<!ENTITY restart "Necessário reiniciar o navegador">
 <!ENTITY settings "Configurações">
-<!ENTITY settings.default "Restaurar Padrões…">
-<!ENTITY settings.advanced "Modo Avançado">
-<!ENTITY settings.import "Importar Configurações…">
-<!ENTITY settings.export "Exportar Configurações…">
-<!ENTITY settings.copy "Copy Settings to Clipboard">
+<!ENTITY settings.default "Restaurar padrões…">
+<!ENTITY settings.advanced "Modo avançado">
+<!ENTITY settings.import "Importar configurações…">
+<!ENTITY settings.export "Exportar configurações…">
+<!ENTITY settings.copy "Copiar configurações para a área de transferência">
 <!ENTITY apply "Aplicar">
 <!ENTITY gen.column1 "135">
 <!ENTITY tab.gen "Geral">
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menus">
 <!ENTITY tab.menus.sidebar "Painel">
 <!ENTITY tab.keys "Atalhos">
+<!ENTITY tab.about "Sobre/Ajuda">
 <!ENTITY gen.orient.caption "Posição">
 <!ENTITY gen.orient.label "Mostrar painel no">
 <!ENTITY gen.orient.left "lado esquerdo">
@@ -28,36 +29,36 @@
 <!ENTITY gen.width.caption "Tamanho">
 <!ENTITY gen.width.px "pixels">
 <!ENTITY gen.width.perc "porcento">
-<!ENTITY gen.width.current "Largura Atual">
+<!ENTITY gen.width.current "Largura atual">
 <!ENTITY gen.width.current.tip "Aplica a largura atual do painel">
 <!ENTITY gen.width.min.hint "[Shift+clique duplo] no título do painel">
 <!ENTITY gen.width.def.hint "[Clique duplo] no título do painel">
 <!ENTITY gen.width.max.hint "[Ctrl+clique duplo] ou [Alt+clique duplo] no título do painel">
-<!ENTITY gen.init.caption "Inicialização do browser">
+<!ENTITY gen.init.caption "Inicialização do navegador">
 <!ENTITY gen.init.label "Painel lateral">
 <!ENTITY gen.init.toolbar.label "Barra de ferramentas">
 <!ENTITY gen.init.toolbar.show.label "Exibir barra de ferramentas">
 <!ENTITY gen.init.toolbar.hide.label "Ocultar barra de ferramentas">
 <!ENTITY gen.init.switch.show.label "Exibir o seletor de painel lateral">
 <!ENTITY gen.init.switch.hide.label "Ocultar o seletor de painel lateral">
-<!ENTITY gen.init.mode1 "Recuperar Estado Memorizado">
+<!ENTITY gen.init.mode1 "Recuperar estado memorizado">
 <!ENTITY gen.init.sidebar "Abrir o painel lateral (Seletor do painel lateral, botão do painel, atalho)">
 <!ENTITY gen.init.sidebar.restore "Reataurar o painel lembrado">
 <!ENTITY gen.switch.autoshow "Exibir/ocultar o painel lateral automaticamente (contato do mouse ao invés de clique)">
-<!ENTITY gen.switch.onlymax "Apenas se o browser estiver maximizado ou em modo de tela cheia">
+<!ENTITY gen.switch.onlymax "Apenas se o navegador estiver maximizado ou em modo de tela cheia">
 <!ENTITY gen.switch.delay "Tempo de espera">
-<!ENTITY gen.switch.delayUnit "milisegundos">
+<!ENTITY gen.switch.delayUnit "milissegundos">
 <!ENTITY gen.switch.hide "Ocultar painel se o cursor do mouse…">
 <!ENTITY gen.switch.hideBar "for movido de volta para a página web">
 <!ENTITY gen.switch.hidePage "estiver dentro do seletor de painel">
 <!ENTITY gen.switch.thin "Habilitar seletor de painel reduzido">
 <!ENTITY gen.switch.width "Largura do seletor do painel">
 <!ENTITY gen.switch.twidth "Largura do seletor de painel reduzido">
-<!ENTITY cmode.caption "Exibir/Ocultar painel">
-<!ENTITY cmode.desc "Informe quais elementos devem ser afetados ao se abrir ou fechar o painel de formas diferentes.">
+<!ENTITY cmode.caption "Exibir/ocultar painel">
+<!ENTITY cmode.desc "Informe quais elementos devem ser afetados ao abrir ou fechar o painel de formas diferentes.">
 <!ENTITY cmode.key.label "Tecla de atalho (F4)">
 <!ENTITY cmode.tbb.label "Botão AiOS">
-<!ENTITY cmode.close.label "Botão Fechar:">
+<!ENTITY cmode.close.label "Botão Fechar">
 <!ENTITY cmode.mode1.label "Somente o painel">
 <!ENTITY cmode.mode2.label "Painel e barra de ferramentas">
 <!ENTITY cmode.mode3.label "Painel, barra de ferramentas e entalhe">
@@ -68,23 +69,22 @@
 <!ENTITY keyconfig.apply "Aplicar">
 <!ENTITY keyconfig.disable "Desabilitar">
 <!ENTITY keyconfig.reset "Redefinir">
-<!ENTITY keyconfig.warn "As mudanças afetam somente novas janelas">
-<!ENTITY keyconfig.onreset "Reinicie o browser">
+<!ENTITY keyconfig.warn "As mudanças afetam somente novas janelas.">
+<!ENTITY keyconfig.onreset "Reinicie o navegador">
 <!ENTITY keyconfig.unrecognized "Não reconhecido ($1)">
-<!ENTITY keyconfig.used "Esta tecla já está sendo usada por:   t$1. No entanto pode funcionar.">
+<!ENTITY keyconfig.used "Esta tecla já está sendo usada por:   t$1. No entanto, pode funcionar.">
 <!ENTITY menus.sidebar.desc "Personalize as opções no menu "Exibir > Painel"; e no menu suspenso dos botões do painel.">
 <!ENTITY menus.icons.label "Exibir ícones">
 <!ENTITY menus.entries.label "Exibir opções">
 <!ENTITY menus.sidebar.entrydeac "Desabilitar a opção do painel ativo no menu">
 <!ENTITY misc.enablesidebar.label "Abrir no painel">
 <!ENTITY misc.layout.label "Otimização para o painel">
-<!ENTITY misc.dm.overlay "Change options for the sidebar behavior">
-<!ENTITY misc.dm.autoopen.label "Show the Downloads sidebar when downloading a file">
-<!ENTITY misc.dm.autoclose.label "Close it when all downloads are finished">
+<!ENTITY misc.dm.overlay "Alterar opções do funcionamento do painel">
+<!ENTITY misc.dm.autoopen.label "Exibir painel ao iniciar downloads">
+<!ENTITY misc.dm.autoclose.label "Fechar ao concluir todos os downloads">
 <!ENTITY misc.colors.label "Habilitar fundos coloridos baseados no estado atual">
-<!ENTITY misc.slim.label "Habilitar lista compacta">
-<!ENTITY misc.count.label "Exibir número de ítens">
-<!ENTITY misc.enablelink.tooltip "Clique mara maiores informações (link para as perguntas freqüentes)">
+<!ENTITY misc.count.label "Exibir número de itens">
+<!ENTITY misc.enablelink.tooltip "Clique para mais informações (link para as perguntas frequentes)">
 <!ENTITY misc.paneltab.reverse "Trocar ações do clique esquerdo e direito">
 <!ENTITY misc.bm.paneltab.desc "O botão PainelAba pode abrir em uma nova aba o gerenciador de favoritos ao invés do painel de favoritos.">
 <!ENTITY misc.bm.paneltab "Abrir gerenciador de favoritos em nova aba">
diff --git a/locale/pt-PT/about.dtd b/locale/pt-PT/about.dtd
index ed29d30..9f2d85e 100644
--- a/locale/pt-PT/about.dtd
+++ b/locale/pt-PT/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Definições…">
 <!ENTITY close "Fechar">
 <!ENTITY tab.about "Sobre">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Colaboradores">
 <!ENTITY tab.trans "Tradutores">
 <!ENTITY about.desc "O All-in-One Sidebar deixa-o abrir várias janelas como painéis laterais e trocar rapidamente entre eles. Por isso põe fim ao caos de janelas! Para além dos marcadores e do histórico abre os diálogos das transferências, extras e muito mais na barra lateral.">
+<!ENTITY create.desc "criado por Ingo Wennemaring, Hamburg [Alemanha]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Página Inicial- muitas informações num só lugar">
 <!ENTITY about2.name "Características - todas as características do All-in-One Sidebar">
 <!ENTITY about3.name "Perguntas e respostas frequentes">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Fórum - discussões, informações de bugs, correcções de temas entre outras coisas">
 <!ENTITY about6.name "Histórico e mudanças">
 <!ENTITY about7.name "Tarefas - funções e melhorias planeadas">
-<!ENTITY create.desc "criado por Ingo Wennemaring, Hamburg [Alemanha]">
 <!ENTITY contrib.desc "Agradeço aos seguintes programadores pela inspiração e partes de código (em ordem alfabética):">
 <!ENTITY contrib.thanks "Por último, mas não menos importante, agradeço a todos os utilizadores que ajudaram a testar as versões de desenvolvimento, reportando bugs no fórum, partilhando as suas ideias e sugestões ou que escreveram apenas um comentário. :-) Muito obrigado!">
 <!ENTITY trans.desc "Os tradutores do All-in-One Sidebar (ordem alfabética pelo código do idioma):">
diff --git a/locale/pt-PT/prefs.dtd b/locale/pt-PT/prefs.dtd
index dddab39..81d254e 100644
--- a/locale/pt-PT/prefs.dtd
+++ b/locale/pt-PT/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menus">
 <!ENTITY tab.menus.sidebar "Barra Lateral">
 <!ENTITY tab.keys "Atalhos">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Posição">
 <!ENTITY gen.orient.label "Mostrar barra lateral no">
 <!ENTITY gen.orient.left "lado esquerdo">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "As mudanças afectam somente novas janelas,">
 <!ENTITY keyconfig.onreset "Reinicie o navegador">
 <!ENTITY keyconfig.unrecognized "Não reconhecido ($1)">
-<!ENTITY keyconfig.used "Esta tecla já está sendo usada por:\n\n\t$1. No entanto pode funcionar.">
+<!ENTITY keyconfig.used "Esta tecla já está sendo usada por:\\n\\n\\t$1. No entanto pode funcionar.">
 <!ENTITY menus.sidebar.desc "Personalize as opções no menu "Mostrar > Barra Lateral"; e no menu suspenso dos botões da barra lateral.">
 <!ENTITY menus.icons.label "Mostrar ícones">
 <!ENTITY menus.entries.label "Mostrar opções">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Mostra a barra lateral de transferências ao transferir um ficheiro">
 <!ENTITY misc.dm.autoclose.label "Fechar quando todas as transferências trminarem">
 <!ENTITY misc.colors.label "Activar cores de fundo baseado no estado actual">
-<!ENTITY misc.slim.label "Habilitar lista compacta">
 <!ENTITY misc.count.label "Mostrar o número de itens">
 <!ENTITY misc.enablelink.tooltip "Clique aqui para mais informação (ligação para a FAQ)">
 <!ENTITY misc.paneltab.reverse "Swap das Acções clique-esquerdo e meio-clique">
diff --git a/locale/ro/about.dtd b/locale/ro/about.dtd
index f1e9b9c..2f63c69 100644
--- a/locale/ro/about.dtd
+++ b/locale/ro/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Opțiuni…">
 <!ENTITY close "Închide">
 <!ENTITY tab.about "Despre AiOS">
+<!ENTITY tab.help "Ajutor">
 <!ENTITY tab.contrib "Colaboratori">
 <!ENTITY tab.trans "Traducători">
 <!ENTITY about.desc "All-in-One Sidebar vă permite să deschideți diferite ferestre ca panouri laterale și să comutați rapid între ele. Astfel s-a pus capăt haosului ferestrelor deschise! În plus față de Semnele de carte și Istoric, AiOS deschide casete de dialog cum ar fi Descărcările, Suplimentele și altele.">
+<!ENTITY create.desc "Supliment creat de Ingo Wennemaring, Hamburg, Germania">
+<!ENTITY help.desc "Găsiţi mai multe informaţii despre acest supliment pe saitul web:">
 <!ENTITY about1.name "Pagina principală - o mulțime de informații într-un singur loc">
 <!ENTITY about2.name "Caracteristici - toate caracteristicile AiOS">
 <!ENTITY about3.name "Întrebări frecvente - „FAQ“">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Forum - discuții, raportarea erorilor și rezolvări (printre alte chestiuni)">
 <!ENTITY about6.name "Jurnal - istoric și modificări">
 <!ENTITY about7.name "De făcut - noi caracteristici și îmbunătățiri planificate">
-<!ENTITY create.desc "Supliment creat de Ingo Wennemaring, Hamburg, Germania">
 <!ENTITY contrib.desc "Mulțumesc următorilor programatori pentru că mi-au inspirat părți din cod (în ordine alfabetică):">
 <!ENTITY contrib.thanks "În final dar nu în ultimul rând, mulțumesc tuturor utilizatorilor care m-au ajutat testând versiunile în dezvoltare, care au raportat în forum erori, care mi-au împărtășit ideile și sugestiile lor sau doar pentru că au făcut comentarii drăguțe. ☺ Vă mulțumesc foarte mult!">
 <!ENTITY trans.desc "Traducători ai AiOS (în ordinea alabetică a codurilor de limbă):">
diff --git a/locale/ro/prefs.dtd b/locale/ro/prefs.dtd
index d49bca2..b58c8f7 100644
--- a/locale/ro/prefs.dtd
+++ b/locale/ro/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Meniuri">
 <!ENTITY tab.menus.sidebar "Panou lateral">
 <!ENTITY tab.keys "Taste directe">
+<!ENTITY tab.about "Despre/Ajutor">
 <!ENTITY gen.orient.caption "Orientare">
 <!ENTITY gen.orient.label "Afișează panoul lateral în">
 <!ENTITY gen.orient.left "partea stângă">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Modificările sunt efective numai în noile ferestre.">
 <!ENTITY keyconfig.onreset "Este necesară repornirea navigatorului.">
 <!ENTITY keyconfig.unrecognized "Necunoscut ($1)">
-<!ENTITY keyconfig.used "Această tastă este deja utilizată de: \n\n\t$1\n\nTotuși, este posibil să funcționeze.">
+<!ENTITY keyconfig.used "Această tastă este deja utilizată de: \\n\\n\\t$1\\n\\nTotuși, este posibil să funcționeze.">
 <!ENTITY menus.sidebar.desc "Particularizează opțiunile meniului „Vizualizare > Bară laterală (panou lateral!)“ și ale listelor derulante aferente butoanelor panoului lateral.">
 <!ENTITY menus.icons.label "Afișează pictogramele">
 <!ENTITY menus.entries.label "Afișează opțiunile">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Afișează panoul când se descarcă un fișier">
 <!ENTITY misc.dm.autoclose.label "Închide panoul la terminarea descărcărilor">
 <!ENTITY misc.colors.label "Colorează fundalul pe baza stărilor curente">
-<!ENTITY misc.slim.label "Activează afișarea restrânsă a listei">
 <!ENTITY misc.count.label "Afișează numărul de elemente">
 <!ENTITY misc.enablelink.tooltip "Faceți clic aici pentru mai multe informații (legătură la „Întrebări și răspunsuri“)">
 <!ENTITY misc.paneltab.reverse "Inversează acțiunile pentru clic-stânga și clic-mijloc">
diff --git a/locale/ru-RU/about.dtd b/locale/ru/about.dtd
similarity index 96%
rename from locale/ru-RU/about.dtd
rename to locale/ru/about.dtd
index e170268..879b96d 100644
--- a/locale/ru-RU/about.dtd
+++ b/locale/ru/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Настройки…">
 <!ENTITY close "Закрыть">
 <!ENTITY tab.about "Информация о расширении">
+<!ENTITY tab.help "Справка">
 <!ENTITY tab.contrib "Участники проекта">
 <!ENTITY tab.trans "Переводчики">
 <!ENTITY about.desc "All-in-One Sidebar позволяет вам открывать различные окна в боковой панели и быстро переключаться между ними. Помимо закладок и истории посещений вы можете просматривать список загрузок, установленных дополнений и многое другое. Положите конец хаосу открытых окон!">
+<!ENTITY create.desc "Автор расширения: Ingo Wennemaring, Гамбург [Германия]">
+<!ENTITY help.desc "Вы можете найти больше информации об этом дополнении на сайте:">
 <!ENTITY about1.name "Домашняя страница, содержащая большое количество информации о расширении">
 <!ENTITY about2.name "Список всех возможностей расширения All-in-One Sidebar">
 <!ENTITY about3.name "Часто задаваемые вопросы (FAQ) и ответы">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Форум — обсуждения, сообщения об ошибках, прочая информация">
 <!ENTITY about6.name "Список изменений и история старых версий расширения">
 <!ENTITY about7.name "Планы на будущее — список планируемых новых возможностей и усовершенствований">
-<!ENTITY create.desc "Автор расширения: Ingo Wennemaring, Гамбург [Германия]">
 <!ENTITY contrib.desc "Я благодарю следующих разработчиков за вдохновляющие идеи и фрагменты исходного кода (в алфавитном порядке):">
 <!ENTITY contrib.thanks "Последними, но не в последнюю очередь я благодарю всех пользователей, которые помогали в тестировании разрабатываемых сборок, сообщали об ошибках на форуме, делились своими идеями и предложениями или просто писали хорошие комментарии. :-) Большое спасибо!">
 <!ENTITY trans.desc "Переводчики All-in-One Sidebar:">
diff --git a/locale/ru-RU/aios.dtd b/locale/ru/aios.dtd
similarity index 100%
rename from locale/ru-RU/aios.dtd
rename to locale/ru/aios.dtd
diff --git a/locale/ru-RU/lib.dtd b/locale/ru/lib.dtd
similarity index 100%
rename from locale/ru-RU/lib.dtd
rename to locale/ru/lib.dtd
diff --git a/locale/ru-RU/lib.properties b/locale/ru/lib.properties
similarity index 94%
rename from locale/ru-RU/lib.properties
rename to locale/ru/lib.properties
index 2e41a9d..6184ee6 100644
--- a/locale/ru-RU/lib.properties
+++ b/locale/ru/lib.properties
@@ -1,7 +1,7 @@
 extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description=Управление боковой панелью, заслужившее множество лестных отзывов от пользователей!
 bm_hi.search.blur=Поиск…
 prefs.confirm=Вы уверены, что хотите восстановить настройки по умолчанию?
-prefs.import=Вы уверены, что хотите импортировать эти настройки?\n\n
+prefs.import=Вы уверены, что хотите импортировать эти настройки?\\n\\n
 prefs.save=Экспорт настроек
 prefs.open=Импорт настроек
 prefs.copy=Настройки скопированы в буфер обмена
diff --git a/locale/ru-RU/multipanel.dtd b/locale/ru/multipanel.dtd
similarity index 100%
rename from locale/ru-RU/multipanel.dtd
rename to locale/ru/multipanel.dtd
diff --git a/locale/ru-RU/prefs.dtd b/locale/ru/prefs.dtd
similarity index 98%
rename from locale/ru-RU/prefs.dtd
rename to locale/ru/prefs.dtd
index 6b954d2..c50b5c0 100644
--- a/locale/ru-RU/prefs.dtd
+++ b/locale/ru/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Меню">
 <!ENTITY tab.menus.sidebar "Боковая панель">
 <!ENTITY tab.keys "Горячие клавиши">
+<!ENTITY tab.about "Информация/Справка">
 <!ENTITY gen.orient.caption "Расположение боковой панели">
 <!ENTITY gen.orient.label "Открывать боковую панель">
 <!ENTITY gen.orient.left "слева">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Изменения затрагивают только новые окна">
 <!ENTITY keyconfig.onreset "Требуется перезагрузка браузера">
 <!ENTITY keyconfig.unrecognized "Неопознанный ($1)">
-<!ENTITY keyconfig.used "Этот ключ уже используется: \n\n\t$1\n\nХотя, это может всё же работать.">
+<!ENTITY keyconfig.used "Этот ключ уже используется: \\n\\n\\t$1\\n\\nХотя, это может всё же работать.">
 <!ENTITY menus.sidebar.desc "Настройка состава меню “Вид > Боковая панель” и выпадающего меню кнопок боковой панели.">
 <!ENTITY menus.icons.label "Показывать значки">
 <!ENTITY menus.entries.label "Показывать строки">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Показывать боковую панель с загрузками, когда загружается файл">
 <!ENTITY misc.dm.autoclose.label "Закрывать её, когда все загрузки окончены">
 <!ENTITY misc.colors.label "Использовать цветные фоны, основанные на текущем состоянии">
-<!ENTITY misc.slim.label "Использовать компактный список">
 <!ENTITY misc.count.label "Показывать число элементов">
 <!ENTITY misc.enablelink.tooltip "Нажмите здесь, чтобы получить больше информации (ссылка на FAQ)">
 <!ENTITY misc.paneltab.reverse "Менять местами действие левой и средней кнопок мыши">
diff --git a/locale/sk-SK/about.dtd b/locale/sk-SK/about.dtd
index 109a284..f5b7637 100644
--- a/locale/sk-SK/about.dtd
+++ b/locale/sk-SK/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Možnosti…">
 <!ENTITY close "Zatvoriť">
 <!ENTITY tab.about "O rozšírení">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Prispievatelia">
 <!ENTITY tab.trans "Lokalizátori">
 <!ENTITY about.desc "The All-in-One Sidebar lets you open various windows as sidebar panels, and quickly switch between them. So it put an end to the window chaos! In addition to bookmarks and history it opens dialogues such as downloads, add-ons and more in the sidebar.">
+<!ENTITY create.desc "vytvoril Ingo Wennemaring, Hamburg [Nemecko]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Domovská stránka - viac informácií">
 <!ENTITY about2.name "Súčasti - všetky súčasti All-in-One Sidebar">
 <!ENTITY about3.name "FAQ - často kladené otázky">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Fórum - diskusie, hlásenie chýb…">
 <!ENTITY about6.name "Prehľad zmien">
 <!ENTITY about7.name "Plánované vylepšenia">
-<!ENTITY create.desc "vytvoril Ingo Wennemaring, Hamburg [Nemecko]">
 <!ENTITY contrib.desc "Ďakujem nasledujúcim tvorcom za inšpiráciu [abecedné poradie]:">
 <!ENTITY contrib.thanks "Naposledy, ale nie najmenej, ďakujem všetkým užívateľim, ktorý mi pomohli s testovaním vývojových verzií, hlásili chyby, podelili sa o svoje nápady alebo napísali pekný komentár. :-) Ďakujem veľmi pekne!">
 <!ENTITY trans.desc "Lokalizátori All-in-One Sidebar [zoradené abecedne podľa jazyka]:">
@@ -23,7 +25,7 @@
 <!ENTITY trans.da-DK.lang "Danish">
 <!ENTITY trans.de-DE.lang "German">
 <!ENTITY trans.el-GR.lang "Greek">
-<!ENTITY trans.en-GB.lang "English (Great Britain">
+<!ENTITY trans.en-GB.lang "English (Great Britain)">
 <!ENTITY trans.en-US.lang "English (USA)">
 <!ENTITY trans.es-AR.lang "Spanish (Argentina)">
 <!ENTITY trans.es-ES.lang "Spanish (Spain)">
diff --git a/locale/sk-SK/lib.dtd b/locale/sk-SK/lib.dtd
index 8fd5930..b841900 100644
--- 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/prefs.dtd b/locale/sk-SK/prefs.dtd
index 919e74b..2a34f13 100644
--- a/locale/sk-SK/prefs.dtd
+++ b/locale/sk-SK/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Ponuky">
 <!ENTITY tab.menus.sidebar "Bočný panel">
 <!ENTITY tab.keys "Klávesové skratky">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Umiestnenie">
 <!ENTITY gen.orient.label "Zobraziť bočný panel">
 <!ENTITY gen.orient.left "vľavo">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Zmeny sa prejavia až na nových oknách">
 <!ENTITY keyconfig.onreset "Zmeny si vyžadujú reštart prehliadača">
 <!ENTITY keyconfig.unrecognized "Nerozpoznané ($1)">
-<!ENTITY keyconfig.used "Táto klávesová skratka už je používaná pre: \n\n\t$1\n\n">
+<!ENTITY keyconfig.used "Táto klávesová skratka už je používaná pre: \\n\\n\\t$1\\n\\n">
 <!ENTITY menus.sidebar.desc "Nastavenie položiek v ponuke "Zobraziť > Bočný panel" a v miestnych ponukách líšt s nástrojmi.">
 <!ENTITY menus.icons.label "Zobraziť ikony">
 <!ENTITY menus.entries.label "Zobraziť položky">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Show the Downloads sidebar when downloading a file">
 <!ENTITY misc.dm.autoclose.label "Close it when all downloads are finished">
 <!ENTITY misc.colors.label "Povoliť farebné pozadia založené na súčasnom stave">
-<!ENTITY misc.slim.label "Povoliť zobrazovanie zúžených položiek (šetrí miesto)">
 <!ENTITY misc.count.label "Zobraziť počet položiek">
 <!ENTITY misc.enablelink.tooltip "Kliknite sem pre viac informácií">
 <!ENTITY misc.paneltab.reverse "Zameniť akcie pre ľavé a pravé tlačidlo myši">
diff --git a/locale/sq-AL/about.dtd b/locale/sq-AL/about.dtd
index b8d44cb..d2643b9 100644
--- a/locale/sq-AL/about.dtd
+++ b/locale/sq-AL/about.dtd
@@ -1,22 +1,24 @@
 <!ENTITY title "Rreth All-in-One Sidebar">
-<!ENTITY version "verzioni">
+<!ENTITY version "versioni">
 <!ENTITY settings "Parapëlqimet...">
 <!ENTITY close "Mbylle">
 <!ENTITY tab.about "Rreth">
+<!ENTITY tab.help "Ndihmë">
 <!ENTITY tab.contrib "Kontribuuesit">
 <!ENTITY tab.trans "Përkthyesit">
-<!ENTITY about.desc ""All-in-One Shiriti Anësor" ju mundëson hapjen e dritareve të ndryshme si panele të shiritit anësor dhe kalimin e shpejtë nëpër to. Pra, i jep fund kaosit të dritareve. Sa i përket faqeve favorite dhe historisë, hap dialogje sikur shkarkimet, shtesat si dhe më shumë në shiritin anësor.">
+<!ENTITY about.desc "\"All-in-One Shiriti Anësor\" ju mundëson hapjen e dritareve të ndryshme si panele të shiritit anësor dhe kalimin e shpejtë nëpër to. Pra, i jep fund kaosit të dritareve. Sa i përket faqeve favorite dhe historisë, hap dialogje sikur shkarkimet, shtesat si dhe më shumë në shiritin anësor.">
+<!ENTITY create.desc "u krijua nga Ingo Wennemaring, Hamburg [Gjermani]">
+<!ENTITY help.desc "Më shumë informata rreth shtesës tek faqja:">
 <!ENTITY about1.name "Uebfaqja - shumë informata në një vend">
-<!ENTITY about2.name "Funksionet - të gjitha funksionet e "All-in-One-Sidebar"">
+<!ENTITY about2.name "Funksionet - të gjitha funksionet e \"All-in-One-Sidebar\"">
 <!ENTITY about3.name "FAQ - pyetjet e bëra më shpesh dhe përgjigjet e tyre">
 <!ENTITY about4.name "Çështjet e njohura - përshkrimet dhe problemet">
 <!ENTITY about5.name "Forumi - diskutime, raportim i problemeve dhe përmirësim i pjesëve me gabime">
 <!ENTITY about6.name "Ndryshimet - historia dhe ndryshimet">
 <!ENTITY about7.name "Të-bëj- funksionet dhe përmirësimet e planifikuara">
-<!ENTITY create.desc "u krijua nga Ingo Wennemaring, Hamburg [Gjermani]">
 <!ENTITY contrib.desc "I faleminderit programuesit në vijim për për inspirimin dhe copëzat [radhitja alfabetike]:">
 <!ENTITY contrib.thanks "I faleminderit të gjithë përdoruesit të cilët më ndihmuan në testimit gjatë zhvillimit, raportimin e problemeve në forum, dhënien e ideve dhe sugjerimeve ose atyre që sëpaku shkruan komente te mira. :-) Faleminderit shumë.">
-<!ENTITY trans.desc "Përkthyesit e "All-in-One Shiritit Anësor" [radhitja alfabetike sipas gjuhës]:">
+<!ENTITY trans.desc "Përkthyesit e \"All-in-One Shiritit Anësor\" [radhitja alfabetike sipas gjuhës]:">
 <!ENTITY trans.ar-SA.lang "Arabisht">
 <!ENTITY trans.be-BY.lang "Bjellorusisht">
 <!ENTITY trans.cs-CZ.lang "Çekisht">
diff --git a/locale/sq-AL/lib.dtd b/locale/sq-AL/lib.dtd
index 1526f0d..7f3ac11 100644
--- a/locale/sq-AL/lib.dtd
+++ b/locale/sq-AL/lib.dtd
@@ -7,7 +7,7 @@
 <!ENTITY key.shift "Shift">
 <!ENTITY menu.tools.label "Mjetet">
 <!ENTITY closeFolder.label "Mbyll të gjitha Dosjet">
-<!ENTITY show.closeFolder.label "'Mbyll Gjitha Dosjet' Pullë">
+<!ENTITY show.closeFolder.label "\'Mbyll Gjitha Dosjet\' Pullë">
 <!ENTITY enable.autoClose.label "Mbylli Automatikisht Dosjet Tjera">
 <!ENTITY enable.scrollToFolder.label "Rrotullo automatikisht për tek Dosja e parazgjedhur">
 <!ENTITY enable.rememberFolder.label "Mbaje mend dhe fokusohu tek dosja e fundit">
diff --git a/locale/sq-AL/multipanel.dtd b/locale/sq-AL/multipanel.dtd
index 956fb35..40d05cb 100644
--- a/locale/sq-AL/multipanel.dtd
+++ b/locale/sq-AL/multipanel.dtd
@@ -5,7 +5,7 @@
 <!ENTITY about.label "rreth">
 <!ENTITY about.tooltip "Shows different information about the browser">
 <!ENTITY about.config.tooltip "Shows an interface for viewing and setting a wide variety of configuration variables">
-<!ENTITY about.plugins.tooltip "Shows information about all installed plug-ins">
+<!ENTITY about.plugins.tooltip "Shfaq informacionet mbi të gjitha shtesat e instaluara">
 <!ENTITY about.support.tooltip "Shows application basics, extensions, and modified preferences">
 <!ENTITY about.cache.tooltip "Shows information about the Cache Service for both memory and disk cache">
 <!ENTITY about.cache.disk.tooltip "List cache entries on disk">
@@ -13,9 +13,9 @@
 <!ENTITY about.cache.offline.tooltip "List offline cache entries">
 <!ENTITY about.crashes.tooltip "Shows submitted crash reports">
 <!ENTITY about.buildconfig.tooltip "Shows the arguments and options used to compile the build in use">
-<!ENTITY about.about.tooltip "Shows version information and copyright information">
+<!ENTITY about.about.tooltip "Shfaq informata mbi versionin dhe të drejtat e autorit">
 <!ENTITY about.robots.tooltip "Gort! Klaatu barada nikto!">
-<!ENTITY about.credits.tooltip "Shows a list of all those who contributed to Mozilla">
+<!ENTITY about.credits.tooltip "Shfaq listën e të gjithë atyre që kontribuuan tek Mozilla">
 <!ENTITY about.license.tooltip "Paraqit Licencën Publike të Mozilla-s">
 <!ENTITY about.mozilla.tooltip "Paraqet faqe nga libri fiktiv i Mozilla-s">
 <!ENTITY tools.remlast.label "Mbaj mend përmbajtjen e herës së kaluar">
diff --git a/locale/sq-AL/prefs.dtd b/locale/sq-AL/prefs.dtd
index 316be70..9af9ec8 100644
--- a/locale/sq-AL/prefs.dtd
+++ b/locale/sq-AL/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menytë">
 <!ENTITY tab.menus.sidebar "Shiriti anësorë">
 <!ENTITY tab.keys "Shkurtesat">
+<!ENTITY tab.about "Rreth/Ndihmë">
 <!ENTITY gen.orient.caption "Orientimi">
 <!ENTITY gen.orient.label "Trego Shiritin Anësor aktiv">
 <!ENTITY gen.orient.left "ana e majtë">
@@ -66,12 +67,12 @@
 <!ENTITY keyconfig.keyid "Emri">
 <!ENTITY keyconfig.id "ID">
 <!ENTITY keyconfig.apply "Apliko">
-<!ENTITY keyconfig.disable "Ç'aktivizo">
+<!ENTITY keyconfig.disable "Ç\'aktivizo">
 <!ENTITY keyconfig.reset "Ribëj">
 <!ENTITY keyconfig.warn "Changes affect only new windows">
-<!ENTITY keyconfig.onreset "Browser restart required">
+<!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">
@@ -79,15 +80,14 @@
 <!ENTITY misc.enablesidebar.label "Hape në Shiritin Anësor">
 <!ENTITY misc.layout.label "Optimize Layout for the Sidebar">
 <!ENTITY misc.dm.overlay "Ndrysho variantet e sjelljes së shiritit anësor">
-<!ENTITY misc.dm.autoopen.label "Show the Downloads sidebar when downloading a file">
-<!ENTITY misc.dm.autoclose.label "Close it when all downloads are finished">
+<!ENTITY misc.dm.autoopen.label "Shfaqe shiritin gjatë shkarkimit të një skede">
+<!ENTITY misc.dm.autoclose.label "Mbylle pasi të mbarojë shkarkimi">
 <!ENTITY misc.colors.label "Enable colored backgrounds based on current state">
-<!ENTITY misc.slim.label "Enable Slim List">
-<!ENTITY misc.count.label "Show Number of Items">
+<!ENTITY misc.count.label "Shfaq numrin e artikujve">
 <!ENTITY misc.enablelink.tooltip "Click here for more information (link to the FAQs)">
 <!ENTITY misc.paneltab.reverse "Swap Left-click and Middle-click Actions">
 <!ENTITY misc.bm.paneltab.desc "The button “PanelTab” can open the Bookmark Manager in a new tab instead of the Bookmark Panel.">
-<!ENTITY misc.bm.paneltab "Enable Bookmark Manager in New Tab">
-<!ENTITY special.collapsing.caption "Sidebar Collapsing">
-<!ENTITY special.collapsing.label "Enable Sidebar Collapsing">
+<!ENTITY misc.bm.paneltab "Mundëso menaxhimin e faqeve favorite në një Tab të ri">
+<!ENTITY special.collapsing.caption "Kolapsi i shiritit anësor">
+<!ENTITY special.collapsing.label "Mundëso kolapsin e shiritit anësor">
 <!ENTITY special.collapsing.desc "The sidebar can collapse instead of closing. The advantage is that the sidebar content doesn't have to reload after re-opening so it responds faster.">
diff --git a/locale/sr/about.dtd b/locale/sr/about.dtd
index db05a58..cab7277 100644
--- a/locale/sr/about.dtd
+++ b/locale/sr/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Подешавања…">
 <!ENTITY close "Затвори">
 <!ENTITY tab.about "О додатку">
+<!ENTITY tab.help "Помоћ">
 <!ENTITY tab.contrib "Заслуге">
 <!ENTITY tab.trans "Преводиоци">
 <!ENTITY about.desc "АиОС омогућава отварање разних прозора и бочних трака и брзо пребацивање између њих. Поздравите се са нередом око прозора! Поред забелешки и историјата, у бочној траци је могуће отварање и разних дијалоге, као што су преузимања, додаци и остало.">
+<!ENTITY create.desc "направио Инго Венемеринг, Хамбург (Немачка)">
+<!ENTITY help.desc "Многе информације о додатку можете да пронађете на">
 <!ENTITY about1.name "Моја страница - све информације на једном месту">
 <!ENTITY about2.name "Особине - све особине проширења АиОС-а">
 <!ENTITY about3.name "ЧПП - често постављана питања и одговори">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Заједница - расправе, пријаве грешака и поправке тема">
 <!ENTITY about6.name "Попис промена - историја и измене">
 <!ENTITY about7.name "Задаци - планиране особине и побољшања">
-<!ENTITY create.desc "направио Инго Венемеринг, Хамбург (Немачка)">
 <!ENTITY contrib.desc "Захваљујем се следећим програмерима за подстицај:">
 <!ENTITY contrib.thanks "На крају, захваљујем се свим корисницима који су тестирањем помогли развој пријављивањем грешки, дељењем идеја и предлога или писањем лепих коментара. :-) Хвала вам много!">
 <!ENTITY trans.desc "Преводиоци АиоСа-а (по азбучном реду):">
diff --git a/locale/sr/lib.properties b/locale/sr/lib.properties
index 55381fd..1c64f9a 100644
--- a/locale/sr/lib.properties
+++ b/locale/sr/lib.properties
@@ -1,4 +1,4 @@
-extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description=Контроле бочне траке са добитничким корисничким искуством\!
+extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description=Контроле бочне траке са добитничким корисничким искуством\\!
 bm_hi.search.blur=Претрага…
 prefs.confirm=Сигурни сте да желите да вратите почетна подешавања АиОС-а?
 prefs.import=Сигурни сте да желите да увезете ова подешавања за АиОС?
diff --git a/locale/sr/prefs.dtd b/locale/sr/prefs.dtd
index 45dd655..ec35bcd 100644
--- a/locale/sr/prefs.dtd
+++ b/locale/sr/prefs.dtd
@@ -1,5 +1,5 @@
-<!ENTITY title "Поставке АиОС-а">
-<!ENTITY restart "Промене захтевају поновно покретање претраживача">
+<!ENTITY title "All-in-One Sidebar - опције">
+<!ENTITY restart "Потребно је да поново покрене прегледач">
 <!ENTITY settings "Подешавања">
 <!ENTITY settings.default "Врати почетна подешавања…">
 <!ENTITY settings.advanced "Напредни начин рада">
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Менији">
 <!ENTITY tab.menus.sidebar "Бочна трака">
 <!ENTITY tab.keys "Пречице">
+<!ENTITY tab.about "Помоћ и информације">
 <!ENTITY gen.orient.caption "Смер">
 <!ENTITY gen.orient.label "Прикажи бочну траку на">
 <!ENTITY gen.orient.left "левој страни">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Промене утичу само на нове прозоре">
 <!ENTITY keyconfig.onreset "Потребно је поново покренути претраживач">
 <!ENTITY keyconfig.unrecognized "Непрепознатљиво ($1)">
-<!ENTITY keyconfig.used "Овај кључ се користи од стране: \n\n\t$1\n\nМогуће да ће радити, иако…">
+<!ENTITY keyconfig.used "Овај кључ се користи од стране: \\n\\n\\t$1\\n\\nМогуће да ће радити, иако…">
 <!ENTITY menus.sidebar.desc "Прилагоди уносе у менију „Преглед > Бочна трака” и падајућим менијима на дугмадима бочне траке.">
 <!ENTITY menus.icons.label "Прикажи иконе">
 <!ENTITY menus.entries.label "Прикажи уносе">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Прикажи бочну траку са преузимањима приликом преузимања датотека">
 <!ENTITY misc.dm.autoclose.label "Затвори је је када се сва преузимања заврше">
 <!ENTITY misc.colors.label "Омогући позадине у боји засноване на тренутном стању">
-<!ENTITY misc.slim.label "Омогући танак списак">
 <!ENTITY misc.count.label "Прикажи бројеве ставки">
 <!ENTITY misc.enablelink.tooltip "Кликните овде за више информација (веза према НПП)">
 <!ENTITY misc.paneltab.reverse "Замени улоге левог и средњег клика">
diff --git a/locale/sv-SE/about.dtd b/locale/sv-SE/about.dtd
index e2daa15..80bd202 100644
--- a/locale/sv-SE/about.dtd
+++ b/locale/sv-SE/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Inställningar…">
 <!ENTITY close "Stäng">
 <!ENTITY tab.about "Om">
+<!ENTITY tab.help "Hjälp">
 <!ENTITY tab.contrib "Medverkande">
 <!ENTITY tab.trans "Översättare">
 <!ENTITY about.desc "All-in-One Sidebar låter dig öppna olika fönster som sidopaneler och snabbt byta mellan dem. Det sätter punkt för fönsterkaoset! Förutom bokmärken och historik öppnas filhämtaren, tillägg med mera i sidofältet.">
+<!ENTITY create.desc "skapad av Ingo Wennemaring, Hamburg [Tyskland]">
+<!ENTITY help.desc "Du hittar mycket information om detta tillägg på webbplatsen:">
 <!ENTITY about1.name "Webbsida - massvis med information på ett ställe">
 <!ENTITY about2.name "Funktioner - alla finesser i  All-in-One Sidebar">
 <!ENTITY about3.name "FAQ - vanliga frågor och svar">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Forum - diskussioner, felrapporter, kompatibilitetsproblem etc">
 <!ENTITY about6.name "Ändringslogg - historik och förändringar">
 <!ENTITY about7.name "Att göra - planerade funktioner och förbättringar">
-<!ENTITY create.desc "skapad av Ingo Wennemaring, Hamburg [Tyskland]">
 <!ENTITY contrib.desc "Jag tackar följande utvecklare för inspiration och kodsnuttar (i alfabetisk ordning):">
 <!ENTITY contrib.thanks "Till sist tackar jag alla användare som testat utvecklingsversioner, rapporterat problem i forumet samt meddelat idéer och förslag eller som bara skrivit uppmuntrande kommentarer. :) Tack så mycket!">
 <!ENTITY trans.desc "Översättare av All-in-One Sidebar (i alfabetisk ordning):">
diff --git a/locale/sv-SE/prefs.dtd b/locale/sv-SE/prefs.dtd
index 3cde7ed..833f8f5 100644
--- a/locale/sv-SE/prefs.dtd
+++ b/locale/sv-SE/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menyer">
 <!ENTITY tab.menus.sidebar "Sidopanel">
 <!ENTITY tab.keys "Snabbval">
+<!ENTITY tab.about "Om/Hjälp">
 <!ENTITY gen.orient.caption "Orientering">
 <!ENTITY gen.orient.label "Visa sidopanelen på">
 <!ENTITY gen.orient.left "vänster sida">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Ändringarna påverkar endast nya fönster">
 <!ENTITY keyconfig.onreset "Webbläsaren måste startas om">
 <!ENTITY keyconfig.unrecognized "Okänd ($1)">
-<!ENTITY keyconfig.used "Denna tangent används redan av: \n\n\t$1\n\nDet kan kanske fungera ändå.">
+<!ENTITY keyconfig.used "Denna tangent används redan av: \\n\\n\\t$1\\n\\nDet kan kanske fungera ändå.">
 <!ENTITY menus.sidebar.desc "Anpassa menyvalen i “Visa > Sidopanel” och i sidopanelknapparnas menyer.">
 <!ENTITY menus.icons.label "Visa ikoner">
 <!ENTITY menus.entries.label "Visa menyval">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Visa filhämtningssidopanelen när en fil hämtas">
 <!ENTITY misc.dm.autoclose.label "Stäng den när alla hämtningar är slutförda">
 <!ENTITY misc.colors.label "Aktivera färgbakgrund beroende på läge">
-<!ENTITY misc.slim.label "Aktivera tunn lista">
 <!ENTITY misc.count.label "Visa antal objekt">
 <!ENTITY misc.enablelink.tooltip "Klicka här för mera information (FAQ)">
 <!ENTITY misc.paneltab.reverse "Växla vänsterklicks- och mellanklicksfunktion">
diff --git a/locale/tr-TR/about.dtd b/locale/tr/about.dtd
similarity index 96%
rename from locale/tr-TR/about.dtd
rename to locale/tr/about.dtd
index 61c7362..621bd00 100644
--- a/locale/tr-TR/about.dtd
+++ b/locale/tr/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Ayarlar">
 <!ENTITY close "Kapat">
 <!ENTITY tab.about "Hakkında">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Destekleyenler">
 <!ENTITY tab.trans "Çevirmenler">
 <!ENTITY about.desc "The All-in-One Sidebar lets you open various windows as sidebar panels, and quickly switch between them. So it put an end to the window chaos! In addition to bookmarks and history it opens dialogues such as downloads, add-ons and more in the sidebar.">
+<!ENTITY create.desc "Ingo Wennemaring, Hamburg [Almanya] tarafından yapılmıstır.">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!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">
@@ -13,7 +16,6 @@
 <!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 create.desc "Ingo Wennemaring, Hamburg [Almanya] tarafından yapılmıstır.">
 <!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)">
diff --git a/locale/tr-TR/aios.dtd b/locale/tr/aios.dtd
similarity index 100%
rename from locale/tr-TR/aios.dtd
rename to locale/tr/aios.dtd
diff --git a/locale/tr-TR/lib.dtd b/locale/tr/lib.dtd
similarity index 89%
rename from locale/tr-TR/lib.dtd
rename to locale/tr/lib.dtd
index 8f139c8..dce0e6e 100644
--- a/locale/tr-TR/lib.dtd
+++ b/locale/tr/lib.dtd
@@ -7,7 +7,7 @@
 <!ENTITY key.shift "Shift">
 <!ENTITY menu.tools.label "Araçlar">
 <!ENTITY closeFolder.label "Bütün dizinleri kapat">
-<!ENTITY show.closeFolder.label "'Close All Folders' Button">
+<!ENTITY show.closeFolder.label "\'Close All Folders\' Button">
 <!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-TR/lib.properties b/locale/tr/lib.properties
similarity index 93%
rename from locale/tr-TR/lib.properties
rename to locale/tr/lib.properties
index c2ec47b..cb74bd0 100644
--- a/locale/tr-TR/lib.properties
+++ b/locale/tr/lib.properties
@@ -1,7 +1,7 @@
 extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description=Sidebar control with award-winning user experience!
 bm_hi.search.blur=Ara…
 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.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=Settings copied to Clipboard.
diff --git a/locale/tr-TR/multipanel.dtd b/locale/tr/multipanel.dtd
similarity index 100%
rename from locale/tr-TR/multipanel.dtd
rename to locale/tr/multipanel.dtd
diff --git a/locale/tr-TR/prefs.dtd b/locale/tr/prefs.dtd
similarity index 98%
rename from locale/tr-TR/prefs.dtd
rename to locale/tr/prefs.dtd
index ec87517..7795241 100644
--- a/locale/tr-TR/prefs.dtd
+++ b/locale/tr/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Menüler">
 <!ENTITY tab.menus.sidebar "Kenar çubuğu">
 <!ENTITY tab.keys "Kısayollar">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Yönelim">
 <!ENTITY gen.orient.label "Kenar çubuğunun üstünde göster">
 <!ENTITY gen.orient.left "sol kenarda">
@@ -71,7 +72,7 @@
 <!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 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">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Show the Downloads sidebar when downloading a file">
 <!ENTITY misc.dm.autoclose.label "Close it when all downloads are finished">
 <!ENTITY misc.colors.label "Renkli alanlar güncel durumda aktif">
-<!ENTITY misc.slim.label "İnce listeyi etkinleştir">
 <!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">
diff --git a/locale/uk-UA/about.dtd b/locale/uk/about.dtd
similarity index 96%
rename from locale/uk-UA/about.dtd
rename to locale/uk/about.dtd
index 971b964..fe4d7f2 100644
--- a/locale/uk-UA/about.dtd
+++ b/locale/uk/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Налаштування…">
 <!ENTITY close "Закрити">
 <!ENTITY tab.about "Про розширення">
+<!ENTITY tab.help "Довідка">
 <!ENTITY tab.contrib "Помічники">
 <!ENTITY tab.trans "Перекладачі">
 <!ENTITY about.desc "All-in-One Sidebar дозволяє вам відкривати різні вікна у формі бічних панелей, швидко перемикатися між ними. Покладено край хаосу з вікнами! Крім бічних панелей Закладки та Історія, також доступні такі діалоги як Завантаження, Додатки тощо.">
+<!ENTITY create.desc "створено Ingo Wennemaring, Гамбург [Німеччина]">
+<!ENTITY help.desc "Більше про цей додаток можна довідатися на сайті:">
 <!ENTITY about1.name "Домашня сторінка - море інформації в одному місці">
 <!ENTITY about2.name "Переваги - всі переваги All-In-One Sidebar">
 <!ENTITY about3.name "FAQ - питання та відповіді">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Форум - обговорення, повідомлення про помилки, а також удосконалення тем для сумісності поміж іншого.">
 <!ENTITY about6.name "Changelog - історія та зміни">
 <!ENTITY about7.name "To-do - заплановані функції та вдосконалення">
-<!ENTITY create.desc "створено Ingo Wennemaring, Гамбург [Німеччина]">
 <!ENTITY contrib.desc "Дякую наступним розробникам за натхнення та допомогу [у абетковому порядку]:">
 <!ENTITY contrib.thanks "Сьогоднішній баг не є останнім. Дякую всім користувачам, які допомагали у тестуванні, повідомленнями про баги на форумі, ділилися ідеями та порадами, нарешті, просто писали гарні коментарі:-) Дуже Вам дякую-:) !">
 <!ENTITY trans.desc "Перекладачі All-In-One Sidebar [у абетковому порядку за кодом мови]:">
diff --git a/locale/uk-UA/aios.dtd b/locale/uk/aios.dtd
similarity index 100%
rename from locale/uk-UA/aios.dtd
rename to locale/uk/aios.dtd
diff --git a/locale/uk-UA/lib.dtd b/locale/uk/lib.dtd
similarity index 100%
rename from locale/uk-UA/lib.dtd
rename to locale/uk/lib.dtd
diff --git a/locale/uk-UA/lib.properties b/locale/uk/lib.properties
similarity index 98%
rename from locale/uk-UA/lib.properties
rename to locale/uk/lib.properties
index 1d0ab82..cb8ef86 100644
--- a/locale/uk-UA/lib.properties
+++ b/locale/uk/lib.properties
@@ -1,7 +1,7 @@
 extensions.{097d3191-e6fa-4728-9826-b533d755359d}.description=Контроль бічної панелі - чудові відгуки користувачів!
 bm_hi.search.blur=Пошук…
 prefs.confirm=Ви впевнені, що хочете відновити налаштування за умовчанням All-In-One Sidebar?
-prefs.import=Ви впевнені, що хочете імпортувати ці налаштування для All-In-One Sidebar?\n\n
+prefs.import=Ви впевнені, що хочете імпортувати ці налаштування для All-In-One Sidebar?\\n\\n
 prefs.save=Експортувати налаштування
 prefs.open=Імпортувати налаштування
 prefs.copy=Налаштування скопійовані до буфера обміну.
diff --git a/locale/uk-UA/multipanel.dtd b/locale/uk/multipanel.dtd
similarity index 91%
rename from locale/uk-UA/multipanel.dtd
rename to locale/uk/multipanel.dtd
index ffd21c1..7592311 100644
--- a/locale/uk-UA/multipanel.dtd
+++ b/locale/uk/multipanel.dtd
@@ -7,9 +7,9 @@
 <!ENTITY about.config.tooltip "Показує інтерфейс для перегляду та налаштування великого числа змінних конфігурації">
 <!ENTITY about.plugins.tooltip "Показує інформацію про встановлені модулі">
 <!ENTITY about.support.tooltip "Показує основну інформацію про додаток, розширення та змінені налаштування">
-<!ENTITY about.cache.tooltip "Показує інформацію про дисковий кеш та кеш пам'яті">
+<!ENTITY about.cache.tooltip "Показує інформацію про дисковий кеш та кеш пам\'яті">
 <!ENTITY about.cache.disk.tooltip "Переглянути елементи дискового кеша">
-<!ENTITY about.cache.memory.tooltip "Переглянути елементи кеша пам'яті">
+<!ENTITY about.cache.memory.tooltip "Переглянути елементи кеша пам\'яті">
 <!ENTITY about.cache.offline.tooltip "Переглянути офлайнові елементи кеша">
 <!ENTITY about.crashes.tooltip "Переглянути надіслані повідомлення про аварії браузера">
 <!ENTITY about.buildconfig.tooltip "Показує аргументи та налаштування, використані для компіляції версії, що використовується">
@@ -18,4 +18,4 @@
 <!ENTITY about.credits.tooltip "Показує перелік всіх, хто співпрацює з Mozilla">
 <!ENTITY about.license.tooltip "Показує публічну ліцензію Mozilla Public License">
 <!ENTITY about.mozilla.tooltip "Показує сторінку з фантастичної Книги Mozilla">
-<!ENTITY tools.remlast.label "Пам'ятати останній показаний вміст">
+<!ENTITY tools.remlast.label "Пам\'ятати останній показаний вміст">
diff --git a/locale/uk-UA/prefs.dtd b/locale/uk/prefs.dtd
similarity index 97%
rename from locale/uk-UA/prefs.dtd
rename to locale/uk/prefs.dtd
index e4db5b5..6e97e45 100644
--- a/locale/uk-UA/prefs.dtd
+++ b/locale/uk/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Меню">
 <!ENTITY tab.menus.sidebar "Бічна панель">
 <!ENTITY tab.keys "Поєднання клавіш">
+<!ENTITY tab.about "Про додаток/Довідка">
 <!ENTITY gen.orient.caption "Розташування бічної панелі">
 <!ENTITY gen.orient.label "Показувати бічну панель">
 <!ENTITY gen.orient.left "зліва">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Зміни стосуються тільки нових вікон">
 <!ENTITY keyconfig.onreset "Потрібне перезавантаження браузера">
 <!ENTITY keyconfig.unrecognized "Нерозпізнано ($1)">
-<!ENTITY keyconfig.used "Ці поєднання клавіш вже використовуються: \n\n\t$1\n\nОднак це може все ж працювати.">
+<!ENTITY keyconfig.used "Ці поєднання клавіш вже використовуються: \\n\\n\\t$1\\n\\nОднак це може все ж працювати.">
 <!ENTITY menus.sidebar.desc "Налаштувати пункти меню “Вигляд > Бічна панель” та пункти меню-згорток кнопок бічної панелі.">
 <!ENTITY menus.icons.label "Показувати піктограми">
 <!ENTITY menus.entries.label "Показувати пункти">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Показувати бічну панель завантажень під час завантаження файлу">
 <!ENTITY misc.dm.autoclose.label "Закривати її після завершення всіх завантажень">
 <!ENTITY misc.colors.label "Застосовувати кольоровий фон відповідно до поточного стану">
-<!ENTITY misc.slim.label "Увімкнути скорочений перелік">
 <!ENTITY misc.count.label "Показувати кількість елементів">
 <!ENTITY misc.enablelink.tooltip "Натисніть тут для детальної інформації (посилання на FAQ)">
 <!ENTITY misc.paneltab.reverse "Поміняти місцями дії лівої та правої кнопок миші">
diff --git a/locale/vi/about.dtd b/locale/vi/about.dtd
index 59400ee..b42a102 100644
--- a/locale/vi/about.dtd
+++ b/locale/vi/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "Thiết lập…">
 <!ENTITY close "Đóng">
 <!ENTITY tab.about "Giới thiệu">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "Những người đóng góp">
 <!ENTITY tab.trans "Người dịch">
 <!ENTITY about.desc "AiOS cho phép bạn mở nhiều cửa sổ dưới dạng thanh lề, và nhanh chóng chuyển đổi qua lại. Nó đã đặt dấu chấm hết cho thời kì cửa sổ lộn xộn! Ngoài đánh dấu và lược sử, nó còn mở các hộp thoại tải xuống, tiện ích và nhiều thứ khác trong thanh lề.">
+<!ENTITY create.desc "tạo bởi Ingo Wennemaring, Hamburg [Đức]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "Trang chủ - nhiều thông tin được liệt kê ở một nơi">
 <!ENTITY about2.name "Tính năng - tất cả tính năng của All-in-One Sidebar">
 <!ENTITY about3.name "FAQ - các câu hỏi và trả lời thường gặp">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "Diễn đang - thảo luận, báo cáo lỗi, và sửa giao diện cùng các thứ khác">
 <!ENTITY about6.name "Lưu kí thay đổi - lược sử và các thay đổi">
 <!ENTITY about7.name "Cần làm - các tính năng và cải tiến dự tính">
-<!ENTITY create.desc "tạo bởi Ingo Wennemaring, Hamburg [Đức]">
 <!ENTITY contrib.desc "Tôi xin cảm ơn các nhà phát triển sau vì đã đem lại cảm hứng và kiến thức cho tôi [thứ tự ABC]:">
 <!ENTITY contrib.thanks "Cuối cùng nhưng chưa phải là hết, tôi xin cảm ơn tất cả những người dùng đã giúp đỡ bằng việc thử các phiên bản đang phát triển, báo cáo lỗi trong diễn đàn, chia sẻ ý kiến và đề nghị, cũng như đã viết các bình luận tốt. :-) Cảm ơn mọi người rất nhiều!">
 <!ENTITY trans.desc "Những người dịch All-in-One Sidebar [theo thứ tự ABC của mã ngôn ngữ]:">
diff --git a/locale/vi/lib.dtd b/locale/vi/lib.dtd
index e745452..9c29a6e 100644
--- a/locale/vi/lib.dtd
+++ b/locale/vi/lib.dtd
@@ -7,7 +7,7 @@
 <!ENTITY key.shift "Shift">
 <!ENTITY menu.tools.label "Công cụ">
 <!ENTITY closeFolder.label "Đóng Tất cả Thư mục">
-<!ENTITY show.closeFolder.label "Nút 'Đóng Tất cả Thư mục'">
+<!ENTITY show.closeFolder.label "Nút \'Đóng Tất cả Thư mục\'">
 <!ENTITY enable.autoClose.label "Tự động Đóng các Thư mục Khác">
 <!ENTITY enable.scrollToFolder.label "Tự động Cuộn đến Thư mục Đã chọn">
 <!ENTITY enable.rememberFolder.label "Ghi nhớ và Chú ý vào Thư mục Đã chọn Cuối cùng">
diff --git a/locale/vi/prefs.dtd b/locale/vi/prefs.dtd
index 1ff34aa..5128961 100644
--- a/locale/vi/prefs.dtd
+++ b/locale/vi/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "Trình đơn">
 <!ENTITY tab.menus.sidebar "Thanh lề">
 <!ENTITY tab.keys "Phím tắt">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "Chiều hướng">
 <!ENTITY gen.orient.label "Hiện thanh lề ở">
 <!ENTITY gen.orient.left "bên trái">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "Các thay đổi chỉ ảnh hưởng đến các cửa sổ mới">
 <!ENTITY keyconfig.onreset "Yêu cầu khởi động lại trình duyệt">
 <!ENTITY keyconfig.unrecognized "Không nhận ra ($1)">
-<!ENTITY keyconfig.used "Phím này đã được sử dụng bởi: \n\n\t$1\n\nDù vậy, nó có thể vẫn hoạt động.">
+<!ENTITY keyconfig.used "Phím này đã được sử dụng bởi: \\n\\n\\t$1\\n\\nDù vậy, nó có thể vẫn hoạt động.">
 <!ENTITY menus.sidebar.desc "Tùy chỉnh các mục trong trình đơn “Hiển thị > Thanh lề” và trong trình đơn thả xuống của các nút trên thanh lề.">
 <!ENTITY menus.icons.label "Hiện biểu tượng">
 <!ENTITY menus.entries.label "Hiện các mục">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Hiện thanh lề Tải xuống khi tải xuống một tập tin">
 <!ENTITY misc.dm.autoclose.label "Đóng nó khi tất cả các phiên tải xuống đã hoàn thành">
 <!ENTITY misc.colors.label "Kích hoạt nền có màu sắc dựa trên trạng thái hiện tại">
-<!ENTITY misc.slim.label "Kích hoạt Danh sách Gọn nhỏ">
 <!ENTITY misc.count.label "Hiện số lượng danh mục">
 <!ENTITY misc.enablelink.tooltip "Nhấp vào đây để biết thêm thông tin (liên kết đến FAQ)">
 <!ENTITY misc.paneltab.reverse "Hoán đổi Thao tác Nhấp chuột trái và Nhấp chuột giữa">
diff --git a/locale/zh-CN/about.dtd b/locale/zh-CN/about.dtd
index 397bfe5..018c9db 100644
--- a/locale/zh-CN/about.dtd
+++ b/locale/zh-CN/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "设置…">
 <!ENTITY close "关闭">
 <!ENTITY tab.about "关于">
+<!ENTITY tab.help "帮助">
 <!ENTITY tab.contrib "贡献者">
 <!ENTITY tab.trans "翻译人员">
 <!ENTITY about.desc "All-in-One Sidebar 可以让您以侧栏面板打开各式各样的窗口,并且您可以在它们之间快速切换。All-in-One Sidebar 终结了窗口的混乱!除了书签和历史之外,All-in-One Sidebar 还可以在侧栏中打开下载、附加组件等功能。">
+<!ENTITY create.desc "由Ingo Wennemaring, Hamburg [Germany]创建">
+<!ENTITY help.desc "您可以从以下网站获取很多关于本扩展的信息:">
 <!ENTITY about1.name "主页 - 查看更多信息">
 <!ENTITY about2.name "特性 - All-in-One Sidebar 的所有特性">
 <!ENTITY about3.name "FAQ - 常见问题与解答">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "论坛 - 讨论,问题报告, 其他的主题">
 <!ENTITY about6.name "更新日志 - 历史和更新">
 <!ENTITY about7.name "待完成 - 计划的特性和改进">
-<!ENTITY create.desc "由Ingo Wennemaring, Hamburg [Germany]创建">
 <!ENTITY contrib.desc "感谢以下开发者提供灵感和部分代码(按字母顺序):">
 <!ENTITY contrib.thanks "还要感谢所有用户,他们帮助测试开发版,在论坛中报告错误,分享他们的想法和建议或者只是留下美好的评论。:-) 真的非常感谢你们!">
 <!ENTITY trans.desc "All-in-One Sidebar 翻译人员(按语言首字母顺序):">
diff --git a/locale/zh-CN/prefs.dtd b/locale/zh-CN/prefs.dtd
index 017092f..00f05c1 100644
--- a/locale/zh-CN/prefs.dtd
+++ b/locale/zh-CN/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "菜单">
 <!ENTITY tab.menus.sidebar "侧栏菜单">
 <!ENTITY tab.keys "快捷键">
+<!ENTITY tab.about "关于/帮助">
 <!ENTITY gen.orient.caption "位置">
 <!ENTITY gen.orient.label "侧栏位于">
 <!ENTITY gen.orient.left "浏览器左侧">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "下载文件时显示下载侧栏">
 <!ENTITY misc.dm.autoclose.label "下载完成时关闭下载侧栏">
 <!ENTITY misc.colors.label "基于当前状态启用彩色背景">
-<!ENTITY misc.slim.label "使用简化列表">
 <!ENTITY misc.count.label "显示项目数量">
 <!ENTITY misc.enablelink.tooltip "点击这里获得更多信息">
 <!ENTITY misc.paneltab.reverse "交换左键与右键的功能">
diff --git a/locale/zh-TW/about.dtd b/locale/zh-TW/about.dtd
index e3e6d5d..04a386a 100644
--- a/locale/zh-TW/about.dtd
+++ b/locale/zh-TW/about.dtd
@@ -3,9 +3,12 @@
 <!ENTITY settings "選項…">
 <!ENTITY close "關閉">
 <!ENTITY tab.about "關於">
+<!ENTITY tab.help "Help">
 <!ENTITY tab.contrib "貢獻者">
 <!ENTITY tab.trans "翻譯人員">
 <!ENTITY about.desc "The All-in-One Sidebar lets you open various windows as sidebar panels, and quickly switch between them. So it put an end to the window chaos! In addition to bookmarks and history it opens dialogues such as downloads, add-ons and more in the sidebar.">
+<!ENTITY create.desc "套件作者為:Ingo Wennemaring, Hamburg [Germany]">
+<!ENTITY help.desc "You will find many information about this addon on the website:">
 <!ENTITY about1.name "產品首頁 - 您可以在這裡找到 AIO-Sidebar 所有的相關資訊">
 <!ENTITY about2.name "軟體介紹 - All-in-One Sidebar 產品特色、功能的說明">
 <!ENTITY about3.name "常見問題 - 經常被詢問到的問題及其解答">
@@ -13,7 +16,6 @@
 <!ENTITY about5.name "用戶論壇 - 軟體使用相關討論、錯誤回報、佈景主題修正…">
 <!ENTITY about6.name "更新紀錄 - 各個版本間的變動、改進項目以及版本歷史">
 <!ENTITY about7.name "未來展望 - 計畫加入的新功能與改善項目">
-<!ENTITY create.desc "套件作者為:Ingo Wennemaring, Hamburg [Germany]">
 <!ENTITY contrib.desc "感謝下列人士的啟發與貢獻程式碼(依姓名字順序排列):">
 <!ENTITY contrib.thanks "最後(但並非最不重要),我感謝所有協助測試開發版本的使用者,除了在論壇回報 bugs 之外,也分享他們的意見與建議(或是只寫了一些不錯的評語),總之非常感謝你們!">
 <!ENTITY trans.desc "感謝以下人士的翻譯(依語系英文字順序排列):">
diff --git a/locale/zh-TW/lib.dtd b/locale/zh-TW/lib.dtd
index 399e92b..27d95e3 100644
--- 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/prefs.dtd b/locale/zh-TW/prefs.dtd
index d10a421..63c0ff5 100644
--- a/locale/zh-TW/prefs.dtd
+++ b/locale/zh-TW/prefs.dtd
@@ -21,6 +21,7 @@
 <!ENTITY tab.menus "選單">
 <!ENTITY tab.menus.sidebar "側邊欄">
 <!ENTITY tab.keys "快速鍵">
+<!ENTITY tab.about "About/Help">
 <!ENTITY gen.orient.caption "駁接位置">
 <!ENTITY gen.orient.label "顯示側邊欄在">
 <!ENTITY gen.orient.left "瀏覽器視窗左邊">
@@ -71,7 +72,7 @@
 <!ENTITY keyconfig.warn "目前所作的變更將只會影響新開啟的瀏覽器視窗">
 <!ENTITY keyconfig.onreset "需要重新啟動瀏覽器">
 <!ENTITY keyconfig.unrecognized "未經辨識 ($1)">
-<!ENTITY keyconfig.used "這組快速鍵已被下列功能所使用:\n\n\t$1\n\n目前的設定或許仍可作用…">
+<!ENTITY keyconfig.used "這組快速鍵已被下列功能所使用:\\n\\n\\t$1\\n\\n目前的設定或許仍可作用…">
 <!ENTITY menus.sidebar.desc "自訂「檢視 → 側邊欄」以及「側邊欄按鈕」下拉選單裡的選單項目">
 <!ENTITY menus.icons.label "顯示圖示">
 <!ENTITY menus.entries.label "顯示選單項目">
@@ -82,7 +83,6 @@
 <!ENTITY misc.dm.autoopen.label "Show the Downloads sidebar when downloading a file">
 <!ENTITY misc.dm.autoclose.label "Close it when all downloads are finished">
 <!ENTITY misc.colors.label "允許「當前選擇的項目使用彩色背景」">
-<!ENTITY misc.slim.label "顯示精簡樣式列表">
 <!ENTITY misc.count.label "顯示目前的 套件/主題/下載 數量">
 <!ENTITY misc.enablelink.tooltip "點此以獲得更多資訊(連到FAQ's)">
 <!ENTITY misc.paneltab.reverse "滑鼠左右鍵之功能互換。">
diff --git a/skin/_alternate.css b/skin/_alternate.css
deleted file mode 100644
index 99fff68..0000000
--- a/skin/_alternate.css
+++ /dev/null
@@ -1,51 +0,0 @@
-
-/*
-    alternierende Elemente
-*/
-window[aios_appDefTheme="true"] richlistitem[alternate=true]:not([type="download"]):not([opType="needs-install"]):not([selected=true]),
-window[aios_appDefTheme="true"] richlistitem[alternate=true]:not([type="download"]):not([opType="needs-enable"]):not([selected=true]),
-window[aios_appDefTheme="true"] richlistitem[alternate=true]:not([type="download"]):not([opType="needs-upgrade"]):not([selected=true]),
-window[aios_appDefTheme="true"] richlistitem[alternate=true]:not([type="download"]):not([availableUpdateURL^="http"]):not([selected=true]),
-window[aios_appDefTheme="true"] richlistitem[alternate=true]:not([type="download"]):not([opType="needs-uninstall"]):not([selected=true]),
-window[aios_appDefTheme="true"] richlistitem[alternate=true]:not([type="download"]):not([opType="needs-disable"]):not([selected=true]),
-window[aios_appDefTheme="true"] richlistitem[alternate=true]:not([type="download"]):not([compatible="false"]):not([selected=true]),
-
-window[aios_appDefTheme="true"] richlistitem[alternate=true][state="1"]:not([selected=true]) {
-    background-color: #F9F9F9;
-}
-
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem[alternate=true]:not([type="download"]):not([opType="needs-install"]):not([selected=true]),
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem[alternate=true]:not([type="download"]):not([opType="needs-enable"]):not([selected=true]),
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem[alternate=true]:not([type="download"]):not([opType="needs-upgrade"]):not([selected=true]),
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem[alternate=true]:not([type="download"]):not([availableUpdateURL^="http"]):not([selected=true]),
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem[alternate=true]:not([type="download"]):not([opType="needs-uninstall"]):not([selected=true]),
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem[alternate=true]:not([type="download"]):not([opType="needs-disable"]):not([selected=true]),
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem[alternate=true]:not([type="download"]):not([compatible="false"]):not([selected=true]),
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem[alternate=true][state="1"]:not([selected=true]) {
-    background-color: #ECF3FE;
-}
-
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem:not([alternate=true]):not([type="download"]):not([opType="needs-install"]):not([selected=true]),
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem:not([alternate=true]):not([type="download"]):not([opType="needs-enable"]):not([selected=true]),
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem:not([alternate=true]):not([type="download"]):not([opType="needs-upgrade"]):not([selected=true]),
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem:not([alternate=true]):not([type="download"]):not([availableUpdateURL^="http"]):not([selected=true]),
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem:not([alternate=true]):not([type="download"]):not([opType="needs-uninstall"]):not([selected=true]),
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem:not([alternate=true]):not([type="download"]):not([opType="needs-disable"]):not([selected=true]),
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem:not([alternate=true]):not([type="download"]):not([compatible="false"]):not([selected=true]),
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem:not([alternate=true])[state="1"]:not([selected=true]) {
-    background-color: #FFFFFF;
-}
-
-
-*[aios_appDefTheme="true"]:-moz-system-metric(windows-default-theme) richlistitem[selected="true"] {
-    background: #E6ECF2 url(images/itemSelected.png) repeat-x scroll top !important;
-}
-
-richlistitem .status {
-    white-space: pre !important;
-    -moz-appearance: none !important;
-}
\ No newline at end of file
diff --git a/skin/_coloredlist.css b/skin/_coloredlist.css
deleted file mode 100644
index dbc7470..0000000
--- a/skin/_coloredlist.css
+++ /dev/null
@@ -1,79 +0,0 @@
-
-/*
-	div. Status-Möglichkeiten der Downloads
-
-	state="-1"	=>	download-starting
-	state="0"	=>	download-downloading
-	state="1"	=>	download-done
-	state="2"	=>	download-failed
-	state="3"	=>	download-canceled
-	state="4"	=>	download-paused
-*/
-
-/*
-	installieren, aktivieren, upgraden, downloaden
-*/
-*[aios_appDefTheme="true"] richlistitem[opType="needs-install"]:not([selected=true]),
-*[aios_appDefTheme="true"] richlistitem[opType="needs-enable"]:not([selected=true]),
-*[aios_appDefTheme="true"] richlistitem[opType="needs-upgrade"]:not([selected=true]),
-*[aios_appDefTheme="true"] richlistitem[availableUpdateURL^="http"]:not([selected=true]),
-
-*[aios_appDefTheme="true"] richlistitem[state="-1"]:not([selected=true]),
-*[aios_appDefTheme="true"] richlistitem[state="0"]:not([selected=true]),
-*[aios_appDefTheme="true"] richlistitem[state="4"]:not([selected=true]) {
-    background-color: #ECFFEC !important;
-}
-
-
-richlistitem[opType="needs-install"]:not([selected=true]) > *,
-richlistitem[opType="needs-enable"]:not([selected=true]) > *,
-richlistitem[opType="needs-upgrade"]:not([selected=true]) > *,
-richlistitem[availableUpdateURL^="http"]:not([selected=true]) > *,
-
-richlistitem[state="-1"]:not([selected=true]) > *,
-richlistitem[state="0"]:not([selected=true]) > *,
-richlistitem[state="4"]:not([selected=true]) > * {
-    color: #006600;
-}
-
-
-/*
-	deinstallieren, deaktivieren, inkompatibel, fehlgeschlagene und abgebrochene Downloads, Fehler in Console
-*/
-*[aios_appDefTheme="true"] richlistitem[opType="needs-uninstall"]:not([selected=true]),
-*[aios_appDefTheme="true"] richlistitem[opType="needs-disable"]:not([selected=true]),
-*[aios_appDefTheme="true"] richlistitem[compatible="false"]:not([selected=true]),
-
-*[aios_appDefTheme="true"] richlistitem[state="2"]:not([selected=true]),
-*[aios_appDefTheme="true"] richlistitem[state="3"]:not([selected=true]),
-
-*[aios_appDefTheme="true"] .console-row[type="error"]:not([selected=true]),
-*[aios_appDefTheme="true"] .console-row[type="exception"]:not([selected=true]) {
-    background-color: #FFECEC !important;
-}
-
-
-richlistitem[opType="needs-uninstall"]:not([selected=true]) > *,
-richlistitem[opType="needs-disable"]:not([selected=true]) > *,
-richlistitem[compatible="false"]:not([selected=true]) > *,
-
-richlistitem[state="2"]:not([selected=true]),
-richlistitem[state="3"]:not([selected=true]) {
-    color: #660000;
-}
-
-
-/*
-	Warnung in Console
-*/
-.console-row[type="warning"]:not([selected=true]) {
-    background-color: #FFFFEC;
-}
-
-
-/*
-	Nachricht in Console
-*/
-.console-row[type="message"]:not([selected=true]) {
-    background-color: #F9F9F9;
-}
\ No newline at end of file
diff --git a/skin/_slimlist.css b/skin/_slimlist.css
deleted file mode 100644
index 4b78593..0000000
--- a/skin/_slimlist.css
+++ /dev/null
@@ -1,83 +0,0 @@
-
-/*
-	div. Status-Möglichkeiten der Downloads
-
-	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[state="1"]:not([selected=true]),
-richlistitem[state="2"]:not([selected=true]),
-richlistitem[state="3"]:not([selected=true]) {
-    min-height: 27px;
-}
-
-*[aios_appOS="Darwin"] richlistitem[state="1"]:not([selected=true]),
-*[aios_appOS="Darwin"] richlistitem[state="2"]:not([selected=true]),
-*[aios_appOS="Darwin"] richlistitem[state="3"]:not([selected=true]) {
-    min-height: 30px !important;
-}
-
-*[aios_appOS="Darwin"] richlistitem[state="1"]:not([selected=true]) .mini-button,
-*[aios_appOS="Darwin"] richlistitem[state="2"]:not([selected=true]) .mini-button,
-*[aios_appOS="Darwin"] richlistitem[state="3"]:not([selected=true]) .mini-button {
-    display: none;
-}
-
-
-richlistitem:not([selected=true]):not([opType^="needs-"]):not([updateStatus^=""]):not([typeName="update"]):not([progress]):not([typeName="install"]) .addonIcon,
-richlistitem:not([selected=true]):not([opType^="needs-"]):not([updateStatus^=""]):not([typeName="update"]):not([progress]):not([typeName="install"]) .addonIcon image,
-
-richlistitem[state="1"]:not([selected=true]) .downloadTypeIcon,
-richlistitem[state="2"]:not([selected=true]) .downloadTypeIcon,
-richlistitem[state="3"]:not([selected=true]) .downloadTypeIcon,
-
-.console-row:not([selected=true]) .console-row-icon image {
-    width: 16px;
-    height: 16px;
-    min-width: 16px;
-    min-height: 16px;
-}
-
-
-
-
-richlistitem:not([selected=true]):not([opType^="needs-"]) .addon-description,
-richlistitem *[value^="Support"],
-richlistitem *[value^="Contribute"],
-
-richlistitem[state="1"]:not([selected=true]) label.status,
-richlistitem[state="2"]:not([selected=true]) label.status,
-richlistitem[state="3"]:not([selected=true]) label.status,
-
-richlistitem[state="1"]:not([selected=true]) vbox spacer,
-richlistitem[state="2"]:not([selected=true]) vbox spacer,
-richlistitem[state="3"]:not([selected=true]) vbox spacer,
-
-richlistitem[state="1"]:not([selected=true]) #dmtDoneShowBtn,
-richlistitem[state="2"]:not([selected=true]) #dmtDoneShowBtn,
-richlistitem[state="3"]:not([selected=true]) #dmtDoneShowBtn,
-
-richlistitem[state="1"]:not([selected=true]) #dmtDoneReloadBtn,
-richlistitem[state="2"]:not([selected=true]) #dmtDoneReloadBtn,
-richlistitem[state="3"]:not([selected=true]) #dmtDoneReloadBtn,
-
-richlistitem[state="1"]:not([selected=true]) #dmtDoneDeleteBtn,
-richlistitem[state="2"]:not([selected=true]) #dmtDoneDeleteBtn,
-richlistitem[state="3"]:not([selected=true]) #dmtDoneDeleteBtn,
-
-richlistitem[state="1"]:not([selected=true]) #dmtDoneCleanUpBtn,
-richlistitem[state="2"]:not([selected=true]) #dmtDoneCleanUpBtn,
-richlistitem[state="3"]:not([selected=true]) #dmtDoneCleanUpBtn,
-
-.console-row:not([selected=true]) .console-row-code  {
-    display: none;
-}
-
-richlistitem .addonName {
-    -moz-box-flex:1000;
-}
\ No newline at end of file
diff --git a/skin/aboutconfig.css b/skin/aboutconfig.css
deleted file mode 100644
index c90982c..0000000
--- a/skin/aboutconfig.css
+++ /dev/null
@@ -1,50 +0,0 @@
-
-/*
-	Firefox-Standard-Theme
-*/
-window[aios_appDefTheme="true"] {
-    border-top: 1px solid ThreedHighlight;
-}
-
-window[aios_appDefTheme="true"] #filterRow {
-    -moz-appearance: toolbox;
-    margin: 0px;
-    padding-right: 1px;
-    padding-bottom: 1px;
-}
-
-window[aios_appDefTheme="true"] #configTree {
-    -moz-appearance: none;
-    margin: 0px;
-    border: none;
-}
-
-window[aios_appDefTheme="true"] #configTree treecols{
-    border-top: 1px solid ThreedShadow;
-}
-
-window[aios_appDefTheme="true"] treechildren {
-    margin-left: 5px;
-}
-
-
-/*
-	Firefox- und Windows-Standard-Theme
-*/
-window[aios_appDefTheme="true"]:-moz-system-metric(windows-default-theme) #configTree treecols {
-    border-top: 1px solid ActiveBorder;
-}
-
-
-/*
-	Darwin
-*/
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #filterRow {
-    padding-bottom: 5px;
-    background-color: #D4DDE5;
-    background-image: none;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #filterRow:-moz-window-inactive {
-    background-color: #e8e8e8;
-}
\ No newline at end of file
diff --git a/skin/addons_fx4.css b/skin/addons_fx4.css
deleted file mode 100644
index 88196c9..0000000
--- a/skin/addons_fx4.css
+++ /dev/null
@@ -1,590 +0,0 @@
-
-#addons-page {
-    padding: 0px;
-}
-
-
-/* Navigation */
-/* oberhalb des Contents */
-#addons-page > hbox {
-    -moz-box-orient: vertical;
-}
-
-#categories {
-    margin: 0px;
-    padding: 0px;
-}
-
-.category, .category:not([disabled]) {
-    height: auto;
-    margin: 0px 1px 1px 0px;
-    padding: 2px;
-}
-
-.category-icon {
-    margin: 0px;
-}
-
-#category-search[disabled="true"],
-#category-discover,
-#category-availableUpdates[disabled="true"],
-#category-recentUpdates[disabled="true"],
-.category-name,
-.category-badge {
-    display: none;
-}
-
-
-/* Header */
-#header {
-    margin: 0px;
-    padding: 4px;
-}
-
-#header-utils-btn {
-    margin: 0px 5px;
-    min-width: 0px;
-}
-
-#header-search {
-    width: 200px;
-}
-
-#updates-container {
-    padding: 5px 0px;
-}
-
-#close-btn {
-    display: block !important;
-}
-
-/* Content */
-.view-header {
-    padding: 0px 4px;
-    min-height: 0px; 
-}
-
-.sorter, .search-filter-radio {
-    margin: 3px 0px 3px 5px;
-    height: 18px;
-    max-height: 18px;
-}
-
-#search-filter {
-    padding: 0px;
-    font-size: 11px;
-}
-
-#view-port richlistbox richlistitem {
-    -moz-binding: url("chrome://aios/content/addons.xml#richlistitem");
-}
-
-/* Add-ons */
-.addon {
-    padding: 5px;
-}
-
-.addon * {
-    margin: 0px;
-}
-
-.addon .warning,
-.addon .error,
-.addon .pending {
-    margin-bottom: 10px;
-}
-
-.addon .pending > vbox {
-    margin-left: 10px;
-}
-
-.addon .pending .button-box,
-#updates-container .button-box {
-    padding-left: 0px;
-    padding-right: 0px;
-}
-
-.addon .icon-container,
-.addon .warning-icon,
-.addon .error-icon,
-.addon .pending-icon {
-    margin-right: 10px;
-}
-
-.addon .name-container {
-    font-size: 11px;
-    font-weight: normal;
-}
-
-.addon .name-container .name {
-    font-weight: bold;
-}
-
-.addon .name-container .version {
-    margin-left: 10px;
-}
-
-.addon .name-container spacer,
-.addon .creator {
-    display: none !important;
-}
-
-
-
-/*
-    nicht selektierte Add-ons
-*/
-.addon:not([selected="true"]) .icon-container,
-.addon:not([selected="true"]) .icon {
-    height: 16px;
-    width: 16px;
-}
-
-.addon:not([selected="true"]) .disabled-postfix,
-.addon:not([selected="true"]) .update-postfix {
-    margin-left: 5px;
-}
-
-.addon:not([selected="true"]) .addon-control,
-.addon:not([selected="true"]) .description-container,
-.addon:not([selected="true"]) .date-updated,
-.addon:not([selected="true"]) .relnotes-container,
-.addon:not([selected="true"]) .relnotes-toggle {
-    display: none !important;
-}
-
-
-/*
-    selektierte Add-ons
-*/
-.addon[selected="true"] .icon-container,
-.addon[selected="true"] .icon {
-    height: 32px;
-    width: 32px;
-}
-
-.addon[selected="true"] .name-container {
-    font-size: 13px;
-    font-weight: bold;
-}
-
-#addon-list .addon[selected="true"] .date-updated {
-    display: block;
-}
-
-.addon[selected="true"] .warning-icon,
-.addon[selected="true"] .error-icon,
-.addon[selected="true"] .pending-icon {
-    margin: 0px 18px 0px 8px;
-}
-
-.addon[selected="true"] .aios-container > vbox,
-.addon[selected="true"] .install-status,
-.addon[selected="true"] .relnotes-toggle {
-    margin-top: 5px;
-}
-
-.addon[selected="true"] .description-container {
-    -moz-box-orient: vertical;
-    float: left;
-}
-
-.addon[selected="true"] .description-container .description {
-    display: block;
-}
-
-.addon[selected="true"] .description-container .details {
-    margin-left: -3px;
-}
-
-.addon[selected="true"] .addon-control {
-    margin-left: 5px;
-    min-width: 0px;
-}
-
-.addon[selected="true"] .addon-control.preferences {
-    margin-left: 0px;
-}
-
-.addon[selected="true"] .relnotes H2 {
-    font-size: 10px !important;
-}
-
-.addon[selected="true"] .relnotes UL {
-    margin: 0px !important;
-    padding: 0px !important;
-}
-
-
-/* Detail-Ansicht */
-#detail-view .text-link {
-    -moz-binding: url("chrome://aios/content/addons.xml#textlink");
-}
-
-#detail-view vbox {
-    font-size: 1em;
-}
-
-#detail-view .detail-view-container {
-    padding: 10px;
-}
-
-#detail-view #detail-notifications {
-    margin: 0px;
-    padding: 0px;
-}
-
-#detail-view #warning-container,
-#detail-view #error-container,
-#detail-view #pending-container {
-    margin-bottom: 9px;
-    padding-bottom: 10px;
-}
-
-#detail-view #pending-container .button-box {
-    padding-left: 0px;
-    padding-right: 0px;
-}
-
-#detail-view #pending-container > vbox {
-    margin-left: 10px;
-}
-
-#detail-view #detail-header {
-    margin-bottom: 15px;
-    padding-bottom: 10px;
-}
-
-#detail-view #detail-header > * {
-    margin: 0px;
-    padding: 0px;
-}
-
-#detail-view #detail-icon {
-    margin: 0px 10px 0px 0px;
-    width: 64px;
-    height: 64px;
-}
-
-#detail-view spacer {
-    display: none;
-}
-
-#detail-view #detail-name {
-    margin-bottom: 0px;
-}
-
-#detail-view #detail-version {
-    margin-bottom: 5px;
-}
-
-#detail-view #detail-name,
-#detail-view #detail-version,
-#detail-view .disabled-postfix,
-#detail-view .update-postfix {
-    font-size: 14px;
-}
-
-#detail-view #detail-restart-btn,
-#detail-view #detail-undo-btn,
-#detail-view #detail-name,
-#detail-view #detail-version,
-#detail-view #detail-creator,
-#detail-view #detail-desc,
-#detail-view #detail-fulldesc,
-#detail-view #detail-grid * {
-    margin-left: 0px;
-    margin-right: 0px;
-}
-
-#detail-view #detail-name,
-#detail-view #detail-desc {
-    font-weight: bold;
-}
-
-#detail-view #detail-screenshot {
-    margin-top: 5px;
-    max-width: none;
-}
-
-#detail-view #detail-contributions > hbox {
-    -moz-box-orient: vertical;
-    -moz-box-align: end;
-}
-
-#detail-view #detail-rating-row > hbox {
-    -moz-box-orient: vertical;
-}
-
-#detail-view #detail-controls button {
-    margin-left: 0px;
-}
-
-
-
-/*#detail-view .detail-view-container > hbox > vbox {
-    -moz-box-orient: vertical;
-    -moz-box-flex: 1;
-    width: 100%;
-}
-
-#detail-view #detail-desc-container {
-    -moz-box-orient: vertical;
-}*/
-
-
-
-
-/* Firefox-Standard-Theme */
-#addons-page[aios_appDefTheme="true"] {
-    background-image: none;
-}
-
-#addons-page[aios_appDefTheme="true"] .addon:not([selected="true"]) {
-    background-color: #FFFFFF;
-}
-
-#addons-page[aios_appDefTheme="true"] #categories {
-    border-top: none;
-    border-bottom: 1px solid ThreedShadow;
-    background-color: #ffffff;
-}
-
-#addons-page[aios_appDefTheme="true"] .category,
-#addons-page[aios_appDefTheme="true"] .category:not([disabled]) {
-    border: none;
-    border-radius: 0px;
-}
-
-#addons-page[aios_appDefTheme="true"] .category[selected="true"] {
-    background-color: #C1D2EE;
-}
-
-#addons-page[aios_appDefTheme="true"] .category:hover {
-    background-color: #E0E8F6;
-}
-
-#addons-page[aios_appDefTheme="true"] #header {
-    border-top: 1px solid ThreedHighlight;
-    border-bottom: 1px solid ThreedShadow;
-}
-
-#addons-page[aios_appDefTheme="true"] #updates-container {
-    color: infotext;
-    background-color: infobackground;
-    border-bottom: 1px solid ThreedShadow;
-}
-
-#addons-page[aios_appDefTheme="true"] .view-header,
-#addons-page[aios_appDefTheme="true"] #search-filter {
-    background-color: -moz-dialog;
-    border-top: 1px solid ThreedHighlight;
-    border-bottom: 1px solid ThreedShadow;
-}
-
-#addons-page[aios_appDefTheme="true"] #view-port-container {
-    border: 0px;
-    border-radius: 0px;
-}
-
-#addons-page[aios_appDefTheme="true"] #detail-view #warning-container,
-#addons-page[aios_appDefTheme="true"] #detail-view #error-container,
-#addons-page[aios_appDefTheme="true"] #detail-view #pending-container,
-#addons-page[aios_appDefTheme="true"] #detail-view #detail-header {
-    border-bottom: 2px solid;
-    -moz-border-bottom-colors: rgba(255, 255, 255, 0.2) rgba(28, 31, 37, 0.2);
-}
-
-#addons-page[aios_appDefTheme="true"] #detail-view #detail-screenshot {
-    border: 5px solid #ffffff;
-}
-
-
-/* Windows */
-#addons-page[aios_appDefTheme="true"][aios_appOS="WINNT"] .sorter {
-    color: black;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="WINNT"] .sorter[checkState="1"] {
-    list-style-image: url("images/arrow-dn.png");
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="WINNT"] .sorter[checkState="2"] {
-    list-style-image: url("images/arrow-up.png");
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="WINNT"] .sorter[checkState="1"],
-#addons-page[aios_appDefTheme="true"][aios_appOS="WINNT"] .sorter[checkState="2"] {
-    background-color: grey;
-    color: white;
-    box-shadow: none;
-    text-shadow: none;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="WINNT"] .addon {
-    border-top: none;
-    border-bottom-width: 1px !important;
-    border-bottom-style: dotted;
-    border-bottom-color: threedshadow;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="WINNT"] .addon:not([selected="true"]):nth-child(odd) {
-    background-color: rgba(255,255,255,0.6);
-}
-
-
-/* Windows Vista - 7 */
-#addons-page[aios_appDefTheme="true"][aios_appOS="WINNT"]:not([aios_appOSVersion="Windows NT 5.1"]):-moz-system-metric(windows-default-theme) .view-header,
-#addons-page[aios_appDefTheme="true"][aios_appOS="WINNT"]:not([aios_appOSVersion="Windows NT 5.1"]):-moz-system-metric(windows-default-theme) #search-filter {
-    background-color: rgb(204, 217, 234);
-}
-
-
-
-/* Darwin */
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] {
-    background-color: #D4DDE5;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"]:-moz-window-inactive {
-    background-color: #e8e8e8;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] > hbox {
-    border-top: 1px solid #484848;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] > hbox:-moz-window-inactive {
-    border-top: 1px solid #929292;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] #categories {
-    -moz-box-align: center;
-    background-color: -moz-mac-chrome-active;
-    border-top: 1px solid #c0c0c0;
-    border-left: 1px solid #c0c0c0;
-    border-right: 1px solid #484848;
-    border-bottom: 1px solid #484848;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] #categories:-moz-window-inactive {
-    background-color: -moz-mac-chrome-inactive;
-    border-top: 1px solid #e1e1e1;
-    border-left: 1px solid #e1e1e1;
-    border-right: 1px solid #929292;
-    border-bottom: 1px solid #929292;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] #categories .scrollbox-innerbox {
-    -moz-box-align: center;
-    -moz-box-pack: center;
-    
-    /*background-color: rgba(0, 0, 0, 0.55);*/
-    padding: 0px;
-    border: 1px solid rgba(0, 0, 0, 0.55);
-    border-left: none;
-    border-radius: 0px; /* border-radius: 3px; */
-    box-shadow: 0 1px rgba(255, 255, 255, .4);
-    margin: 1px 0px 2px 0px;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] .category {
-    margin: 0px;
-    padding: 7px 5px;
-    border-left: 1px solid rgba(0, 0, 0, 0.55);
-    background: -moz-linear-gradient(top, #FFF, #ADADAD) repeat-x;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] .category[selected="true"] {
-    text-shadow: rgba(0, 0, 0, 0.4) 0 1px;
-    background: #606060;
-    box-shadow: inset #2A2A2A 0 3px 3.5px;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] .category:-moz-locale-dir(ltr):first-child {
-    /*border-top-left-radius: 0px;     border-top-left-radius: 2px; */
-    /*border-bottom-left-radius: 0px;  border-bottom-left-radius: 2px; */
-    /*border-left: none !important;*/
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] .category:-moz-locale-dir(ltr):last-child {
-    /*border-top-right-radius: 0px;        border-top-right-radius: 2px; */
-    /*border-bottom-right-radius: 0px;     border-bottom-right-radius: 2px; */
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] .category-icon {
-    max-width: 24px;
-    max-height: 24px;
-    opacity: 0.5;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] .category:hover .category-icon,
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] .category[selected="true"] .category-icon {
-    opacity: 1;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] #header {
-    border-top: none;
-    border-bottom: none;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] .view-header,
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] #search-filter {
-    background-color: #D4DDE5;
-    background-image: none;
-    border: none;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] .view-header:-moz-window-inactive,
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] #search-filter:-moz-window-inactive {
-    background-color: #e8e8e8;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] #view-port-container {
-    background-color: #D4DDE5;
-    background-image: none;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] #view-port-container:-moz-window-inactive {
-    background-color: #e8e8e8;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] #view-port richlistbox {
-    margin-top: 5px;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] .addon {
-    padding: 7px 5px;
-    border: none;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Darwin"] .addon:not([selected="true"]):nth-child(odd) {
-    background-color: -moz-oddtreerow;
-}
-
-
-
-/*
-	Firefox-Standard-Theme und Linux
-*/
-#addons-page[aios_appDefTheme="true"][aios_appOS="Linux"] #categories {
-    padding:  1px;
-    border:  1px solid ThreedShadow;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Linux"] #header {
-    border:  none;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Linux"] .category,
-#addons-page[aios_appDefTheme="true"][aios_appOS="Linux"] .category:not([disabled]) {
-    margin: 0px 0px 1px 0px;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Linux"] .category[selected="true"] {
-    background-color: highlight;
-}
-
-#addons-page[aios_appDefTheme="true"][aios_appOS="Linux"] .category:hover:not([selected="true"]) {
-    background-color: transparent;
-}
\ No newline at end of file
diff --git a/skin/addons_layout.css b/skin/addons_layout.css
deleted file mode 100644
index 3f17cca..0000000
--- a/skin/addons_layout.css
+++ /dev/null
@@ -1,499 +0,0 @@
-
- at import url("_alternate.css");
-
-/*
-	Manager
-*/
-#extensionsManager,
-#extensionsBox,
-#userscriptsBox {
-    margin: 0px;
-    padding: 0px;
-    border: none;
-}
-
-/* Theme-Preview unter den Add-ons */
-#extensionsBox > hbox[flex="1"] {
-    -moz-box-orient: vertical;
-}
-
-#extensionsView,
-#userscriptsView {
-    -moz-appearance: none;
-    margin: 0px;
-    padding: 0px;
-    border: none;
-    min-width: 0px;
-}
-
-#themeSplitter {
-    max-width: none;	/* Fix fuer einige Themes, z.B. In The Dark */
-}
-
-#themePreviewArea {
-    -moz-appearance: none;
-    border: none;
-}
-
-#resizerBox {
-    display: none;
-}
-
-
-
-/*
-	Toolbars
-*/
-#viewGroup {
-    padding: 0px 0px 1px 1px;
-}
-
-.viewSelector {
-    margin: 0px;
-}
-
-#viewGroup[hideLabel=true] radio {
-    min-width: 0px;
-    margin: 0px 2px 0px 0px;
-    padding: 2px;
-}
-
-#viewGroup[hideLabel=true] radio label {
-    display: none;
-}
-
-/* nur sichtbar, wenn sie wirklich benötigt wird, ansonsten wird viewGroup zu hoch dargestellt */
-#progressBox {
-    display: none;
-}
-#topBar > deck[selectedIndex="1"] #progressBox {
-    display: -moz-box;
-}
-
-#commandBarBottom {
-    margin: 0px;
-    padding: 0px 1px 1px 1px;
-    border: none;
-    -moz-box-flex: 0;	/* für einige Themes */
-}
-
-#commandBarBottom spacer {
-    display: none;
-}
-
-#addonsMsg .outset {
-    border: none;
-}
-
-#searchfield {
-    -moz-box-flex: 1000;
-}
-
-
-/*
-	Add-ons
-*/
-vbox[id="urn:mozilla:addons:search:status:header"] label {
-    margin: 5px;
-    font-size: 14px;
-    font-weight: bold;
-}
-
-richlistitem {
-    padding: 5px 0px 5px 5px;
-}
-
-richlistitem button {
-    min-width: 0px;
-}
-
-richlistitem[typeName="searchResult"][selected="true"] {
-    padding: 0px;
-}
-
-richlistitem[typeName="searchResult"][selected="true"] vbox.addon-icon {
-    display: none;
-}
-
-richlistitem[typeName="searchResult"][selected="true"] vbox.addonTextBox {
-    margin: 5px 0px;
-}
-
-hbox[anonid="addonNameVersion"] {
-    -moz-box-flex: 1;
-}
-
-.addonName {
-    -moz-box-flex: 1;
-}
-
-richlistitem[typeName="searchResult"][selected="true"] hbox[anonid="addonNameVersion"] label {
-    font-size: 12px;
-}
-
-richlistitem[typeName="searchResult"] .addonRating {
-    margin-right: 5px;
-}
-
-richlistitem[typeName="searchResult"][selected="true"] .addon-search-details {
-    -moz-box-orient: vertical;
-}
-
-
-
-/*
-	Buttons
-*/
-#installFileButton,
-#installFileButton[disabled="true"],
-#installFileButton:not([disabled="true"]):hover,
-#installFileButton:not([disabled="true"]):hover:active,
-
-#showUpdateInfoButton,
-#showUpdateInfoButton[disabled="true"],
-#showUpdateInfoButton:not([disabled="true"]):hover,
-#showUpdateInfoButton:not([disabled="true"]):hover:active,
-
-#hideUpdateInfoButton,
-#hideUpdateInfoButton[disabled="true"],
-#hideUpdateInfoButton:not([disabled="true"]):hover,
-#hideUpdateInfoButton:not([disabled="true"]):hover:active,
-
-#checkUpdatesAllButton,
-#checkUpdatesAllButton[disabled="true"],
-#checkUpdatesAllButton:not([disabled="true"]):hover,
-#checkUpdatesAllButton:not([disabled="true"]):hover:active,
-
-#installUpdatesAllButton,
-#installUpdatesAllButton[disabled="true"],
-#installUpdatesAllButton:not([disabled="true"]):hover,
-#installUpdatesAllButton:not([disabled="true"]):hover:active {
-    -moz-image-region: rect(0px, 16px, 0px, 16px);
-}
-
-#installFileButton,
-#installUpdatesAllButton {
-    list-style-image: url(smallIcons/options.png);
-}
-
-#installFileButton[disabled=true] {
-    list-style-image: url(smallIcons/options_dis.png);
-}
-
-#showUpdateInfoButton,
-#checkUpdatesAllButton {
-    list-style-image: url(smallIcons/ok.png);
-}
-
-#hideUpdateInfoButton {
-    list-style-image: url(smallIcons/disable.png);
-}
-
-#checkUpdatesAllButton[disabled=true] {
-    list-style-image: url(smallIcons/ok_dis.png);
-}
-
-
-
-/*
-	Firefox-Standard-Theme
-*/
-window[aios_appDefTheme="true"] #topStackBar {
-    border-bottom: 1px solid ThreedHighlight;
-}
-
-window[aios_appDefTheme="true"] #searchbox {
-    margin-left: 2px;
-}
-
-window[aios_appDefTheme="true"] #themeSplitter {
-    border: none;
-    border-top: 1px solid ActiveBorder;
-    border-bottom: 1px solid ActiveBorder;
-}
-
-window[aios_appDefTheme="true"][aios_appOSVersion="Windows NT 5.1"] #aios-searchpanel-top,
-window[aios_appDefTheme="true"][aios_appOSVersion="Windows NT 5.1"] #extensionsBox > hbox[flex="1"],
-window[aios_appDefTheme="true"][aios_appOSVersion="Windows NT 5.1"] #addonsMsg notification {
-    border-top: 1px solid ThreedShadow;
-}
-
-window[aios_appDefTheme="true"] vbox[id="urn:mozilla:addons:search:status:header"] {
-    border-bottom: 1px solid ThreedShadow;
-}
-
-window[aios_appDefTheme="true"] #addonsMsg .outset {
-    border-top: 1px solid ThreedHighlight;
-}
-
-window[aios_appDefTheme="true"] #commandBarBottom,
-window[aios_appDefTheme="true"] #searchPanel {
-    -moz-appearance: toolbox;
-}
-
-
-/*
-	Firefox- und Windows-Standard-Theme
-*/
-window[aios_appDefTheme="true"][aios_appOSVersion="Windows NT 5.1"]:-moz-system-metric(windows-default-theme) vbox[id="urn:mozilla:addons:search:status:header"] {
-    border-top: 1px solid ThreedHighlight;
-}
-
-window[aios_appDefTheme="true"][aios_appOSVersion="Windows NT 5.1"]:-moz-system-metric(windows-default-theme) #aios-searchpanel-top,
-window[aios_appDefTheme="true"][aios_appOSVersion="Windows NT 5.1"]:-moz-system-metric(windows-default-theme) #extensionsBox > hbox[flex="1"],
-window[aios_appDefTheme="true"][aios_appOSVersion="Windows NT 5.1"]:-moz-system-metric(windows-default-theme) #addonsMsg notification {
-    border-top: 1px solid ActiveBorder;
-}
-
-window[aios_appDefTheme="true"] vbox[id="urn:mozilla:addons:search:status:header"] {
-    border-bottom: 1px solid ActiveBorder;
-}
-
-window[aios_appDefTheme="true"]:-moz-system-metric(windows-default-theme) #topBar {
-    border-bottom: 1px solid #FFFFFF;
-}
-
-window[aios_appDefTheme="true"]:-moz-system-metric(windows-default-theme) #topBar > deck {
-    border-bottom: 1px solid ActiveBorder;
-}
-
-
-/*
-	Firefox-Standard-Theme und Darwin
-*/
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) #topStackBar,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) #viewGroup,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) #aios-searchpanel-top,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) #commandBarBottom,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) #searchPanel,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) #extensionsBox,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) #extensionsView,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) vbox[id="urn:mozilla:addons:search:status:header"] {
-    background-color: #E8E8E8 !important;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"] #topStackBar,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"] #viewGroup,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"] #aios-searchpanel-top,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"] #commandBarBottom,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"] #searchPanel,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"] #extensionsBox,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"] #extensionsView,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"] vbox[id="urn:mozilla:addons:search:status:header"] {
-    background-color: #D4DDE5 !important;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #topStackBar,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewGroup,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #aios-searchpanel-top,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #commandBarBottom,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #searchPanel,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #extensionsBox,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #extensionsView {
-    border-top: none !important;
-    border-bottom: none !important;
-    background-image: none !important;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #topBar {
-    -moz-appearance: none;
-    border-left: 1px solid #c0c0c0;
-    border-top: 1px solid #484848;
-    border-bottom: 1px solid #484848;
-    border-right: 1px solid #484848;
-    background-color: -moz-mac-chrome-active;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) #topBar {
-    -moz-appearance: none;
-    border-left: 1px solid #e1e1e1;
-    border-top: 1px solid #929292;
-    border-bottom: 1px solid #929292;
-    border-right: 1px solid #929292;
-    background-color: -moz-mac-chrome-inactive;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #topBar > deck {
-    border-top: 1px solid #c0c0c0;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) #topBar > deck {
-    border-top: 1px solid #e1e1e1 !important;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #commandBarBottom {
-    padding-top: 3px;
-    padding-bottom: 3px;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #extensionsBox > hbox[flex="1"] {
-    border-top: none;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] vbox[id="urn:mozilla:addons:search:status:header"] {
-    border: none;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] richlistitem {
-    border-bottom-style: none;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewGroup {
-    margin: 1px 0px 2px 0px;
-    padding: 0px;
-    border: 1px solid #575757 !important;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewGroup radio {
-    width: 35px;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewGroup radio, /* sonst wird das Label nicht per CSS versteckt */
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewGroup radio image {
-    margin: 0px;
-    padding: 0px;
-    list-style-image: url("icons/topbar_darwin.png");
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewGroup radio image {
-    margin: 7px 1px;
-    max-width: 32px;
-    max-height: 24px;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#extensions-view {
-    -moz-image-region: rect(0px, 24px,  24px, 0px);
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#themes-view {
-    -moz-image-region: rect(0px, 48px,  24px, 24px);
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#locales-view {
-    -moz-image-region: rect(0px, 72px,  24px, 48px);
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#plugins-view {
-    -moz-image-region: rect(0px, 96px, 24px, 72px);
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#updates-view {
-    -moz-image-region: rect(0px, 120px, 24px, 96px);
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#installs-view {
-    -moz-image-region: rect(0px, 144px, 24px, 120px);
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#search-view {
-    -moz-image-region: rect(0px, 168px, 24px, 144px);
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#userstyles-view {
-    -moz-image-region: rect(0px, 192px, 24px, 168px);
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#userscripts-view {
-    -moz-image-region: rect(0px, 216px, 24px, 192px);
-}
-
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#bandwagon-collections-view,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#bandwagon-collections-view image {
-    list-style-image: url("chrome://bandwagon/skin/images/icon32.png");
-    -moz-image-region: rect(1px, 29px, 30px, 1px);
-}
-window[aios_appOS="Darwin"] radio#bandwagon-collections-view image {
-    max-width: 24px;
-    max-height: 24px;
-}
-#bandwagon-collections-panel #no-amo-auth-box,
-#bandwagon-collections-panel #nosubs-box{
-    margin: 0px;
-    padding: 10px;
-}
-#bandwagon-collections-panel #no-amo-auth-box>hbox>hbox {
-    display: none;
-}
-#bandwagon-collections-panel #no-amo-auth-box>hbox>vbox .bold-text {
-    width: 200px;
-}
-#bandwagon-subscriptions-panel {
-    -moz-box-orient: vertical;
-}
-#bandwagon-collections-list,
-#bandwagon-addons-list {
-    -moz-appearance: none;
-    border: none;
-    min-height: 30px;
-}
-#extensionsBox,
-#bandwagon-collections-panel,
-#bandwagon-extensions-deck,
-#bandwagon-subscriptions-panel,
-#bandwagon-collections-list-box,
-#bandwagon-collections-list,
-#bandwagon-collections-list-box > toolbox,
-#bandwagon-sidebar-splitter,
-#bandwagon-collections-notification {
-    min-width: 0px !important;
-    max-width: 3000px !important;
-}
-#bandwagon-collections-list {
-    margin: 0px;
-}
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #bandwagon-sidebar-splitter {
-    height: 5px;
-    min-height: 0px;
-    background-color: #969696;
-    border-top: 1px solid #c9c9c9;
-    border-bottom: 1px solid #666666;
-    border-right: none;
-}
-
-
-
-/*
-	Labels zusätzlich zur JS-Lösung (aios_sidebarLayout() in addons_downloads.js) unsichtbar machen,
-	da diese erst beim zweiten Laden des Panels funktioniert, JS-Lösung wegen Dritt-Erweiterungen trotzdem notwendig
-*/
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#extensions-view label,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#themes-view label,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#locales-view label,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#plugins-view label,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#updates-view label,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#installs-view label,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#search-view label,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#userstyles-view label,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio#bandwagon-collections-view label{
-    display: none;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio:not([selected="true"]):hover image {
-    opacity: 1;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio:not([selected="true"]) image {
-    opacity: 0.5;
-}
-
-
-
-/*
-	Firefox-Standard-Theme und Linux
-*/
-window[aios_appDefTheme="true"][aios_appOS="Linux"] #topBar {
-    margin: 0px;
-    padding-top: 1px;
-}
-
-
-/* Greasemonkey-Fix */
-window.userscripts #installFileButton,
-window.userscripts #installUpdatesAllButton,
-window.userscripts #showUpdateInfoButton,
-window.userscripts #hideUpdateInfoButton,
-window.userscripts #skipDialogButton,
-window.userscripts #checkUpdatesAllButton {
-    display: none;
-}
\ No newline at end of file
diff --git a/skin/aios.css b/skin/aios.css
deleted file mode 100644
index 0a77ff7..0000000
--- a/skin/aios.css
+++ /dev/null
@@ -1,338 +0,0 @@
-
- at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/**
-	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,
-window[aiosOrient="left"] toolbox#aios-toggle-toolbox > toolbar#aios-toggle-toolbar {
-    margin: 0px !important;
-    border-left: none !important;
-}
-
-window[aiosOrient="right"] toolbox#aios-toggle-toolbox,
-window[aiosOrient="right"] toolbox#aios-toggle-toolbox > toolbar#aios-toggle-toolbar {
-    margin: 0px !important;
-    border-right: none !important;
-}
-
-#aios-toggle-toolbox,
-#aios-toggle-toolbar {
-    padding: 0px;
-    border: none;
-}
-
-#aios-toggle-toolbar {
-    -moz-appearance: none;
-}
-
-/* Binding for all toolboxes with palette */
-/* anscheinend ab Fx4 nur für Darwin nötig */
-toolbox[palette]:not([id="navigator-toolbox"]) {
-    -moz-binding: url("chrome://aios/content/aios.xml#toolbox");
-}
-
-/**
-	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;
-    border: none;
-}
-
-#aios-toolbar[orient="vertical"] {
-    -moz-box-orient: vertical;
-}
-
-#aios-toolbar-contextmenu dialogheader,
-#aios-sbhtoolbar-contextmenu dialogheader {
-    margin: 0px 0px 7px 0px;
-    padding: 2px 0px;
-    font-weight: bold;
-    border: none;
-}
-
-/* flexible Buttons */
-#aios-toolbar[flexbuttons="true"] toolbarbutton {
-    -moz-box-flex: 1;
-}
-
-/* vertikale Buttons - Fix für 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;
-}
-
-#aios-toolbar[orient="vertical"][mode="text"] .toolbarbutton-text {
-    text-align: left;
-}
-
-/* Toolbarspacer auf der Toolbar und im Konfigurationsmodus */
-#aios-toolbar[orient="vertical"] toolbarspacer,
-#aios-toolbar[orient="vertical"] toolbarpaletteitem[id^="wrapper-spacer"] {
-    height: 21px;
-}
-
-/* Toolbarspring auf der Toolbar und im Konfigurationsmodus */
-#aios-toolbar toolbarspring,
-#aios-toolbar toolbarpaletteitem[id^="wrapper-spring"] {
-    -moz-box-flex: 1000;
-}
-
-/* Toolbarseparator auf der Toolbar und im Konfigurationsmodus */
-#aios-toolbar toolbarseparator,
-#aios-toolbar toolbarpaletteitem[id^="wrapper-separator"] {
-    margin: 0px 0px 1px 1px;
-}
-
-#aios-toolbar[orient="vertical"] toolbarseparator,
-#aios-toolbar[orient="vertical"] toolbarpaletteitem[id^="wrapper-separator"] {
-    -moz-appearance: none;
-    height: 2px;
-    max-height: 2px;
-    min-height: 2px;
-    padding: 0px;
-    border: none;
-    border-top: 1px solid ThreedShadow;
-    border-bottom: 1px solid ThreedHighlight;
-}
-
-window:-moz-system-metric(windows-default-theme) #aios-toolbar[orient="vertical"] toolbarseparator,
-window:-moz-system-metric(windows-default-theme) #aios-toolbar[orient="vertical"] toolbarpaletteitem[id^="wrapper-separator"] {
-    border-bottom: none;
-}
-
-#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 0px;
-    border: none;
-    border-top: 2px solid transparent;
-    border-bottom: 2px solid transparent;
-}
-
-#aios-toolbar[orient="vertical"] toolbarpaletteitem[dragover="left"] {
-    border-color: transparent;
-    border-top-color: #000000;
-}
-
-#aios-toolbar[orient="vertical"] toolbarpaletteitem[dragover="right"] {
-    border-color: transparent;
-    border-bottom-color: #000000;
-}
-
-
-/**
-	SIDEBAR
-*/
-#sidebar,
-#sidebar-box {
-    margin: 0px;
-    padding: 0px;
-    max-width: none !important;
-}
-
-/**
-	ermöglicht eine minimale Größe von 0
-		=> allerdings kann der Splitter dann weiter gezogen werden, als die Maximalbreite zuläßt
-*/
-/*#sidebar-box {
-	overflow-x: hidden;
-}*/
-
-sidebarheader {
-    padding: 0px 1px 1px 1px;
-}
-
-#sidebar-title {
-    display: none !important;
-}
-
-#sidebars-titlebutton > label {
-    padding-top: 2px;
-    padding-bottom: 2px;
-    padding-right: 10px;
-    background: url(images/arrow.gif) no-repeat right 8px;
-}
-
-sidebarheader > .tabs-closebutton {
-    display: none;
-}
-
-/* Fix für TotalToolbar */
-sidebarheader#sidebar-header {
-    display: none;
-}
-
-
-/*
-	SIDEBARHEADER-TOOLBAR
-*/
-#aios-sbhtoolbox, #aios-sbhtoolbar {
-    -moz-appearance: none;
-    min-width: 30px;
-    background-color: transparent;
-    background-image: none !important;
-    border: none;
-}
-
-
-/**
-	SIDEBAR ON RIGHT (LTR-Languages)
-*/
-window[aiosOrient="right"][aiosMode="ltr"] #browser * {
-    direction: ltr;
-}
-
-window[aiosOrient="right"][aiosMode="ltr"] #browser {
-    direction: rtl;
-}
-
-
-/**
-	SIDEBAR ON LEFT (RTL-Languages)
-*/
-window[aiosOrient="left"][aiosMode="rtl"] #browser * {
-    direction: rtl;
-}
-
-window[aiosOrient="left"][aiosMode="rtl"] #browser {
-    direction: ltr;
-}
-
-
-/**
-	TOOLTIPS
-*/
-#aiosPopupset tooltip box {
-    -moz-binding: url(chrome://aios/content/aios.xml#aiosTooltips);
-}
-
-#aiosPopupset tooltip {
-    padding: 1px;
-}
-
-#aiosPopupset tooltip label {
-    margin: 0px;
-    padding: 1px 3px;
-}
-
-#aiosPopupset tooltip label[value=""],
-#aiosPopupset tooltip label:not([value]) {
-    display: none;
-}
-
-#aiosPopupset tooltip > label:not([class="odd"]) {
-    margin-bottom: 5px;
-    padding: 2px 3px 4px 3px;
-}
-
-
-/**
-    Print Preview
-*/
-window[onclose="PrintUtils.exitPrintPreview(); return false;"] #aios-toggle-toolbox,
-window[onclose="PrintUtils.exitPrintPreview(); return false;"] #sidebar-box,
-window[onclose="PrintUtils.exitPrintPreview(); return false;"] #aios-toolbox-left,
-window[onclose="PrintUtils.exitPrintPreview(); return false;"] #aios-toolbox-right,
-window[onclose="PrintUtils.exitPrintPreview(); return false;"] #sidebar-splitter {
-    display: none;
-}
-
-
-/**
- * FIX FOR CONSOLE2
- *
- * */
-menuitem[observes="viewConsole2Sidebar"]:not([id="console-mitem"]) {
-    display: none !important;
-}
-
-
-/**
- * FIX FOR DOWNLOAD MANAGER TWEAK
- *
- * */
-menuitem[id="menu_dmtSidebar"] {
-    display: none !important;
-}
-
-
-/**
- * FIX FOR 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;
-}
-
-
-/*
- * FIX FOR PERSONAS
- *
- * */
-window[persona] #browser,
-window[lwtheme="true"] #browser {
-    border-top: none !important;
-}
-
-window[persona] #aios-toggle-toolbar,
-window[persona] #aios-toolbar,
-window[persona] sidebarheader,
-window[persona]:-moz-system-metric(windows-default-theme) #aios-toolbar[posMode="4"],
-window[persona] #aios-sidebardivider-1,
-window[persona] #aios-sidebardivider-2,
-window[persona] #sidebar-splitter[orient="horizontal"] hbox,
-window[lwtheme="true"] #aios-toggle-toolbar,
-window[lwtheme="true"] #aios-toolbar,
-window[lwtheme="true"] sidebarheader,
-window[lwtheme="true"]:-moz-system-metric(windows-default-theme) #aios-toolbar[posMode="4"],
-window[lwtheme="true"] #aios-sidebardivider-1,
-window[lwtheme="true"] #aios-sidebardivider-2,
-window[lwtheme="true"] #sidebar-splitter[orient="horizontal"] hbox {
-    border: none !important;
-    background-color: transparent !important;
-}
-
-window[persona] #sidebar-splitter[orient="horizontal"],
-window[lwtheme="true"] #sidebar-splitter[orient="horizontal"] {
-    -moz-appearance: none !important;
-}
\ No newline at end of file
diff --git a/skin/aios_buttons.css b/skin/aios_buttons.css
deleted file mode 100644
index d8ed942..0000000
--- a/skin/aios_buttons.css
+++ /dev/null
@@ -1,205 +0,0 @@
-
-/** Image-Region (wichtig für Theme-Kompatibilität und die Meebo-Erweiterung) */
-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_linux.png);
-}
-
-/** Rollover-Effekt */
-window[aios_appOS="WINNT"]:not([aios_appVersion^="4"]) .aios-tbutton image {
-    opacity: 0.8;
-}
-window[aios_appOS="WINNT"]:not([aios_appVersion^="4"]) .aios-tbutton:hover image,
-window[aios_appOS="WINNT"]:not([aios_appVersion^="4"]) .aios-tbutton:active image,
-window[aios_appOS="WINNT"]:not([aios_appVersion^="4"]) .aios-tbutton[checked="true"] image {
-    opacity: 1;
-}
-
-/** Icons deaktiviert */
-.aios-noIcons > .menu-iconic-left image {
-    display: none;
-}
-
-#aios-toolbar[orient="vertical"] toolbarseparator,
-#aios-toolbar[orient="vertical"] toolbarpaletteitem[id^="wrapper-separator"] {
-    margin: 3px 2px 2px 2px;
-}
-
-
-/**
-	B U T T O N - I C O N S
-*/
-/** Addons */
-#addons-button {
-    -moz-image-region: rect(0px, 24px, 24px, 0px);
-}
-toolbar[iconsize="small"] #addons-button {
-    -moz-image-region: rect(24px, 16px, 40px, 0px);
-}
-
-/** MultiPanel */
-#multipanel-button {
-    -moz-image-region: rect(0px, 48px, 24px, 24px);
-}
-toolbar[iconsize="small"] #multipanel-button {
-    -moz-image-region: rect(24px, 32px, 40px, 16px);
-}
-
-/** PageInfo */
-#pageinfo-button {
-    -moz-image-region: rect(0px, 72px, 24px, 48px);
-}
-toolbar[iconsize="small"] #pageinfo-button {
-    -moz-image-region: rect(24px, 48px, 40px, 32px);
-}
-
-/** Console-Button */
-#console-button {
-    -moz-image-region: rect(0px, 120px, 24px, 96px);
-}
-toolbar[iconsize="small"] #console-button {
-    -moz-image-region: rect(24px, 80px, 40px, 64px);
-}
-
-/** PanelTab */
-#paneltab-button {
-    -moz-image-region: rect(0px, 144px, 24px, 120px);
-}
-toolbar[iconsize="small"] #paneltab-button {
-    -moz-image-region: rect(24px, 96px, 40px, 80px);
-}
-
-/** Sidebars-Menu */
-#sidebars-button {
-    -moz-image-region: rect(0px, 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 */
-#sidebars-togglebutton {
-    padding: 0px !important;
-    -moz-image-region: rect(0px, 192px, 24px, 168px);
-}
-toolbar[iconsize="small"] #sidebars-togglebutton {
-    -moz-image-region: rect(24px, 128px, 40px, 112px);
-}
-
-/** Autohide */
-#autohide-button {
-    -moz-image-region: rect(0px, 216px, 24px, 192px);
-}
-toolbar[iconsize="small"] #autohide-button {
-    -moz-image-region: rect(24px, 144px, 40px, 128px);
-}
-
-/** Toolbar */
-#toolbar-button {
-    -moz-image-region: rect(0px, 240px, 24px, 216px);
-}
-toolbar[iconsize="small"] #toolbar-button {
-    -moz-image-region: rect(24px, 160px, 40px, 144px);
-}
-
-
-/**
-	MENUS
-		die Icons der Sidebarpanels im Sidebarmenü funktionieren nur mit
-		der Klasse 'menuitem-iconic' und ohne das Attribut 'observes'
-			=> dafür müssten drei einzelne Observer für 'label', 'tooltiptext', und 'oncommand' hinzugefügt werden
-*/
-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(80px, 16px, 96px, 0px);
-}
-
-menuitem[key="aiosKey_panelTab2"] {
-    -moz-image-region: rect(80px, 32px, 96px, 16px);
-}
-
-menuitem#aios-sidebar-mitem-hide {
-    -moz-image-region: rect(80px, 48px, 96px, 32px);
-}
-
-menuitem#aios-sidebar-mitem-show {
-    -moz-image-region: rect(80px, 64px, 96px, 48px);
-}
-
-menuitem[key="aiosKey_prefs"] {
-    -moz-image-region: rect(64px, 16px, 80px, 0px);
-}
-
-
-/**
-	vertical bookmark bar on AiOS toolbar
-*/
-#bookmarksBarContent,
-#bookmarksBarContent hbox,
-#bookmarksBarContent scrollbox {
-    -moz-box-orient: horizontal;
-}
-
-#aios-toolbar[orient="vertical"] #bookmarksBarContent,
-#aios-toolbar[orient="vertical"] #bookmarksBarContent hbox,
-#aios-toolbar[orient="vertical"] #bookmarksBarContent scrollbox {
-    -moz-box-orient: vertical;
-}
-
-#aios-toolbar[orient="vertical"] .bookmark-item,
-#aios-toolbar[orient="vertical"] toolbarseparator {
-    visibility: visible;
-}
-
-#aios-toolbar[orient="vertical"][mode="icons"] .chevron label {
-    display: block !important;
-}
-
-#aios-toolbar[orient="vertical"][mode="icons"] label,
-#aios-toolbar[orient="vertical"][mode="icons"] .chevron > label {
-    display: none !important;
-}
-
-#aios-toolbar[orient="vertical"][mode="icons"] .bookmark-item > image {
-    margin: 0px;
-}
-
-#aios-toolbar[mode="icons"]:not([iconsize="small"]) .bookmark-item > image {
-    width: 22px;
-    height: 22px;
-    margin: 3px;
-}
-
-#aios-toolbar[orient="vertical"][mode="icons"] menupopup label {
-    display: block !important;
-}
-
-
-/**
-	FIX FOR CONSOLE2
-*/
-#console2-button,
-menuitem[observes="viewConsole2Sidebar"]:not([id="console-mitem"]) {
-    display: none !important;
-}
-
-
-/**
-	FIX FOR MR Tech Local Install & Download Manager Tweak
-, menuitem[key="key_dmSidebar"]
-*/
-#emSidebar, #tmSidebar {
-    display: none !important;
-}
\ No newline at end of file
diff --git a/skin/aios_buttons_fx4.css b/skin/aios_buttons_fx4.css
deleted file mode 100644
index bdba809..0000000
--- a/skin/aios_buttons_fx4.css
+++ /dev/null
@@ -1,282 +0,0 @@
-
-#aios-toolbar[orient="vertical"] toolbarbutton {
-    margin: 2px 1px;
-    padding-top: 2px;
-    padding-bottom: 2px;
-}
-
-/** Toolbarbutton mit Dropmarker */
-#aios-toolbar[orient="vertical"] toolbarbutton toolbarbutton {
-    margin: 0px;
-}
-
-#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;
-}
-
-#aios-sbhtoolbar[iconsize="small"] toolbarbutton {
-    padding: 1px 2px;
-}
-
-
-
-/** Icons deaktiviert */
-.aios-noIcons > .menu-iconic-left image {
-    display: none;
-}
-
-/*
-    WINNT
-*/
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker,
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1 {
-  -moz-appearance: none;
-  padding: 1px 5px;
-  background: rgba(151,152,153,.05)
-              -moz-linear-gradient(rgba(251,252,253,.95), rgba(246,247,248,.47) 49%,
-                                   rgba(231,232,233,.45) 51%, rgba(225,226,229,.3));
-  background-clip: padding-box;
-  border-radius: 4.5px;
-  border: 1px solid;
-  border-color: rgba(0,0,0,.12) rgba(0,0,0,.19) rgba(0,0,0,.38);
-  box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset,
-              0 0 0 2px rgba(255,255,255,.1) inset,
-              0 1px 0 rgba(0,0,0,.15);
-  color: black;
-  text-shadow: 0 0 2px white;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker,
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar[iconsize="small"][mode="icons"] .toolbarbutton-1 > .toolbarbutton-menubutton-button,
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar[iconsize="small"][mode="icons"] .toolbarbutton-1 {
-  padding-left: 3px;
-  padding-right: 3px;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1[type="menu-button"] {
-  -moz-appearance: none;
-  padding: 0;
-  background: none !important;
-  border: none !important;
-  box-shadow: none !important;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1 {
-  margin: 1px 3px;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar[iconsize="small"][mode="icons"] .toolbarbutton-1 {
-  margin-left: 2px;
-  margin-right: 2px;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  -moz-border-start-style: none;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:-moz-locale-dir(ltr),
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-locale-dir(rtl) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:-moz-locale-dir(rtl),
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-locale-dir(ltr) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1[disabled="true"] {
-  opacity: .8;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1[disabled="true"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1[disabled="true"] > .toolbarbutton-icon {
-  opacity: .5;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled="true"]):not(:active):hover,
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1:not([open="true"]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled="true"]),
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1:not([type="menu-button"]):not([disabled="true"]):not([checked="true"]):not([open="true"]):not(:active):hover {
-  background-color: hsla(190,60%,70%,.5);
-  border-color: hsla(190,50%,65%,.8) hsla(190,50%,50%,.8) hsla(190,50%,40%,.8);
-  box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset,
-              0 0 0 1.5px rgba(255,255,255,.1) inset,
-              0 1px 0 rgba(0,0,0,.1),
-              0 0 3.5px hsl(190,90%,80%);
-  -moz-transition: background-color .4s ease-in,
-                   border-color .3s ease-in,
-                   box-shadow .3s ease-in;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled="true"]):hover:active,
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1:hover:active > .toolbarbutton-menubutton-dropmarker:not([disabled="true"]),
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1[open="true"] > .toolbarbutton-menubutton-dropmarker,
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1:not([type="menu-button"]):not([disabled="true"]):hover:active,
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1:not([type="menu-button"])[checked="true"],
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1[open="true"] {
-  background-color: transparent;
-  border-color: rgba(0,0,0,.65) rgba(0,0,0,.55) rgba(0,0,0,.5);
-  box-shadow: 0 0 6.5px rgba(0,0,0,.4) inset,
-              0 0 2px rgba(0,0,0,.4) inset,
-              0 1px 0 rgba(255,255,255,.4);
-  text-shadow: none;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1[checked="true"]:not(:active):hover {
-  background-color: rgba(90%,90%,90%,.4);
-  -moz-transition: background-color .4s;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-nav-bar .toolbarbutton-1 > .toolbarbutton-icon {
-  margin: 1px;
-  width: 16px;
-  height: 16px;
-}
-
-/* Firefox 4 auf WINNT: Aktivierter Toolbarbutton (type = menu-button) */
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-tbutton[checked="true"] .toolbarbutton-menubutton-button,
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] .aios-tbutton[checked="true"] .toolbarbutton-menubutton-dropmarker {
-    background-color: transparent !important;
-    border-color: rgba(0,0,0,.65) rgba(0,0,0,.55) rgba(0,0,0,.5) !important;
-    -moz-box-shadow: 0 0 9px rgba(0,0,0,.4) inset, 0 0 3px rgba(0,0,0,.4) inset, 0 1px 0 rgba(255,255,255,.4) !important;
-    text-shadow: none !important;
-}
-
-/* Firefox 4 auf Darwin: Aktivierter Toolbarbutton (type = menu-button) => Style aus browser.css Zeile 404 */
-window[aios_appOS="Darwin"] .aios-tbutton[type="menu-button"] {
-    border: none;
-}
-
-window[aios_appOS="Darwin"] .aios-tbutton[checked="true"] .toolbarbutton-menubutton-button,
-window[aios_appOS="Darwin"] .aios-tbutton[checked="true"] .toolbarbutton-menubutton-dropmarker {
-    background: #606060;
-    -moz-box-shadow: inset #2A2A2A 0 3px 5px, 0 1px rgba(255, 255, 255, .4);
-}
-
-
-/**
-    B U T T O N - I C O N S
-*/
-toolbarbutton.aios-tbutton:not([type="menu-button"]),
-toolbarbutton.aios-tbutton[type="menu-button"] {
-    list-style-image: url(icons/toolbar_windows.png);
-}
-
-/** Addons */
-#addons-button {
-    -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-/** MultiPanel */
-#multipanel-button {
-    -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-/** PageInfo */
-#pageinfo-button {
-    -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-
-/** Console-Button */
-#console-button {
-    -moz-image-region: rect(0px, 80px, 16px, 64px);
-}
-
-/** PanelTab */
-#paneltab-button {
-    -moz-image-region: rect(0px, 96px, 16px, 80px);
-}
-
-/** Sidebars-Menu */
-#sidebars-button {
-    -moz-image-region: rect(0px, 112px, 16px, 96px);
-}
-
-#sidebars-button dropmarker {
-    display: none;
-}
-
-/** Sidebars */
-#sidebars-togglebutton {
-    -moz-image-region: rect(0px, 128px, 16px, 112px);
-}
-
-/** Autohide */
-#autohide-button {
-    -moz-image-region: rect(0px, 144px, 16px, 128px);
-}
-
-/** Toolbar */
-#toolbar-button {
-    -moz-image-region: rect(0px, 160px, 16px, 144px);
-}
-
-
-/*
-    M E N U - I C O N S
-*/
-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, 0px);
-}
-
-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(0px, 16px, 16px, 0px);
-}
-
-
-/**
-	Vertikale Lesezeichen auf der AiOS-Toolbar
-            => ergänzt durch document.getElementById('PlacesToolbarItems').removeAttribute('orient'); in aios.js
-*/
-#personal-bookmarks,
-#PlacesToolbarItems {
-    -moz-box-orient: horizontal;
-}
-
-#aios-toolbar[orient="vertical"] #personal-bookmarks,
-#aios-toolbar[orient="vertical"] #PlacesToolbarItems {
-    -moz-box-orient: vertical;
-}
-
-#aios-toolbar[orient="vertical"][mode="icons"] label,
-#aios-toolbar[orient="vertical"][mode="icons"] .chevron > label {
-    display: none !important;
-}
-
-#aios-toolbar[mode="icons"]:not([iconsize="small"]) .bookmark-item > image {
-    width: 22px;
-    height: 22px;
-    margin: 1px;
-}
-
-#aios-toolbar[orient="vertical"][mode="icons"] menupopup label {
-    display: block !important;
-}
\ No newline at end of file
diff --git a/skin/aios_grippies.css b/skin/aios_grippies.css
deleted file mode 100644
index 7ebb464..0000000
--- a/skin/aios_grippies.css
+++ /dev/null
@@ -1,37 +0,0 @@
-
-#aios-toggle-toolbox grippy,
-#sidebar-splitter grippy {
-    -moz-binding: url("chrome://aios/content/aios.xml#aiosGrippy");
-    cursor: pointer;
-    background: transparent none no-repeat center;
-
-    visibility: visible !important;                 /* EZ Sidebar-Fix */
-}
-
-#sidebar-splitter[orient="horizontal"] grippy {
-    min-width: 5px;
-    min-height: 119px;
-}
-
-#aios-toggle-toolbox grippy:hover {
-    background-color: -moz-MenuHover;
-}
-
-#sidebar-splitter grippy:hover {
-    background-color: -moz-MenuHover;
-}
-
-#sidebar-splitter[orient="horizontal"] grippy,
-#aios-toggle-toolbox grippy,
-window[aiosOrient="right"][aiosOpen="false"] #sidebar-splitter[orient="horizontal"] grippy,
-window[aiosOrient="right"][aiosOpen="false"] #aios-toggle-toolbox grippy {
-    background-image: url(images/grippy-left.gif);
-    
-}
-
-window[aiosOpen="false"] #sidebar-splitter[orient="horizontal"] grippy,
-window[aiosOpen="false"] #aios-toggle-toolbox grippy,
-window[aiosOrient="right"] #sidebar-splitter[orient="horizontal"] grippy,
-window[aiosOrient="right"] #aios-toggle-toolbox grippy {
-    background-image: url(images/grippy-right.gif);
-}
\ No newline at end of file
diff --git a/skin/aios_theme_darwin.css b/skin/aios_theme_darwin.css
deleted file mode 100644
index 4ee0baf..0000000
--- a/skin/aios_theme_darwin.css
+++ /dev/null
@@ -1,717 +0,0 @@
-
-/**
-	Properties for default Firefox theme on Darwin (Mac OS X)
-		dynamically loaded in aios.js => aios_initSidebar()
-*/
-
-
-window[active="true"] #aios-toggle-toolbar,
-window[active="true"] #aios-toolbar {
-    background-color: -moz-mac-chrome-active;
-}
-
-window:not([active="true"]) #aios-toggle-toolbar,
-window:not([active="true"]) #aios-toolbar {
-    background-color: -moz-mac-chrome-inactive;
-}
-
-#aios-toolbar[orient="horizontal"] {
-    padding: 0px 0px 1px 0px;
-}
-
-
-/**
-	SIDEBAR SWITCH
-*/
-#aios-toggle-toolbar {
-    border-top: 1px solid #c0c0c0;
-    border-right: 1px solid #515151 !important;
-}
-
-window:not([active="true"]) #aios-toggle-toolbar {
-    border-top: 1px solid #f0f0f0;
-    border-right: 1px solid #999999 !important;
-}
-
-window[aiosOrient="right"] #aios-toggle-toolbox,
-window[aiosOrient="right"][aiosOpen="false"] #aios-toggle-toolbox{
-    border-left: 1px solid #515151;
-}
-
-window[aiosOrient="right"]:not([active="true"]) #aios-toggle-toolbox,
-window[aiosOrient="right"][aiosOpen="false"]:not([active="true"]) #aios-toggle-toolbox {
-    border-left: 1px solid #999999;
-}
-
-window[aiosOrient="right"] #aios-toggle-toolbar,
-window[aiosOrient="right"][aiosOpen="false"] #aios-toggle-toolbar {
-    border-left: 1px solid #c0c0c0;
-}
-
-window[aiosOrient="right"]:not([active="true"]) #aios-toggle-toolbar,
-window[aiosOrient="right"][aiosOpen="false"]:not([active="true"]) #aios-toggle-toolbar {
-    border-left: 1px solid #f0f0f0;
-}
-
-
-/**
-	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 #515151;
-}
-
-window:not([active="true"]) #aios-toolbar[posMode="1"] {
-    border-top: 1px solid #f0f0f0;
-    border-left: 1px solid #f0f0f0;
-    border-right: 1px solid #999999;
-}
-
-window[aiosOrient="right"] #aios-toolbar[posMode="1"] {
-    border-right: 1px solid #515151;
-    border-left: 1px solid #515151;
-}
-
-window[aiosOrient="right"]:not([active="true"]) #aios-toolbar[posMode="1"] {
-    border-right: 1px solid #999999;
-    border-left: 1px solid #999999;
-}
-
-window[aiosOrient="right"][aiosOpen="false"] #aios-toolbar[posMode="1"] {
-    border-left: 1px solid #515151;
-}
-
-window[aiosOrient="right"][aiosOpen="false"]:not([active="true"]) #aios-toolbar[posMode="1"] {
-    border-left: 1px solid #999999;
-    border-right: none;
-}
-
-/* Toolbar rechts neben der Sidebar */
-#aios-toolbar[posMode="2"] {
-    border-top: 1px solid #c0c0c0;
-    border-left: 1px solid #515151;
-    border-right: 1px solid #515151;
-}
-
-window:not([active="true"]) #aios-toolbar[posMode="2"] {
-    border-top: 1px solid #f0f0f0;
-    border-left: 1px solid #999999;
-    border-right: 1px solid #999999;
-}
-
-window[aiosOpen="false"] #aios-toolbar[posMode="2"] {
-    border-left: 1px solid #c0c0c0;
-    border-right: 1px solid #515151;
-}
-
-window[aiosOpen="false"]:not([active="true"]) #aios-toolbar[posMode="2"] {
-    border-left: 1px solid #f0f0f0;
-    border-right: 1px solid #999999;
-}
-
-window[aiosOrient="right"] #aios-toolbar[posMode="2"],
-window[aiosOpen="false"][aiosOrient="right"] #aios-toolbar[posMode="2"] {
-    border-right: none;
-}
-
-window[aiosOpen="false"][aiosOrient="right"] #aios-toolbar[posMode="2"] {
-    border-left: 1px solid #515151;
-}
-
-window[aiosOpen="false"][aiosOrient="right"]:not([active="true"]) #aios-toolbar[posMode="2"] {
-    border-left: 1px solid #999999;
-}
-
-/* Toolbar über der Sidebar */
-#aios-toolbar[posMode="3"] {
-    border-right: 1px solid #515151;
-    border-top: 1px solid #c0c0c0 !important;
-    border-bottom: 1px solid #515151;
-    border-left: 1px solid #c0c0c0;
-}
-
-window:not([active="true"]) #aios-toolbar[posMode="3"] {
-    border-top: 1px solid #f0f0f0 !important;
-    border-right: 1px solid #999999;
-    border-bottom: 1px solid #999999;
-    border-left: 1px solid #f0f0f0;
-}
-
-window[aiosOrient="right"] #aios-toolbar[posMode="3"] {
-    border-right: none;
-    border-left: 1px solid #515151;
-}
-
-window[aiosOrient="right"]:not([active="true"]) #aios-toolbar[posMode="3"] {
-    border-right: none;
-    border-left: 1px solid #999999;
-}
-
-/* Toolbar unter der Sidebar-Kopfleiste */
-#aios-toolbar[posMode="4"] {
-    border-top: 1px solid #c0c0c0 !important;
-    border-right: 1px solid #515151;
-    border-bottom: 1px solid #515151;
-    border-left: 1px solid #c0c0c0;
-}
-
-window:not([active="true"]) #aios-toolbar[posMode="4"] {
-    border-top: 1px solid #f0f0f0 !important;
-    border-right: 1px solid #999999;
-    border-bottom: 1px solid #999999;
-    border-left: 1px solid #f0f0f0;
-}
-
-window[aiosOrient="right"] #aios-toolbar[posMode="4"] {
-    border-right: none;
-    border-left: 1px solid #515151;
-}
-
-window:not([active="true"]) window[aiosOrient="right"] #aios-toolbar[posMode="4"] {
-    border-right: none;
-    border-left: 1px solid #999999;
-}
-
-/* Toolbar unter der Sidebar */
-#aios-toolbar[posMode="5"] {
-    border-top: 1px solid #c0c0c0 !important;
-    border-right: 1px solid #515151;
-    border-left: 1px solid #c0c0c0;
-}
-
-window:not([active="true"]) #aios-toolbar[posMode="5"] {
-    border-top: 1px solid #f0f0f0 !important;
-    border-right: 1px solid #999999;
-    border-left: 1px solid #f0f0f0;
-}
-
-window[aiosOrient="right"] #aios-toolbar[posMode="5"] {
-    border-right: none;
-    border-left: 1px solid #515151;
-}
-
-window[aiosOrient="right"]:not([active="true"]) #aios-toolbar[posMode="5"] {
-    border-right: none;
-    border-left: 1px solid #999999;
-}
-
-
-/**
-	DIVIDER
-*/
-#aios-sidebardivider-2 {
-    border-top: none;
-    border-bottom: 1px solid #515151;
-}
-
-window:not([active="true"]) #aios-sidebardivider-2 {
-    border-bottom: 1px solid #999999;
-}
-
-#aios-sidebardivider-3 {
-    border-top: none;
-}
-
-#aios-sidebardivider-4 {
-    border-bottom: 1px solid #515151;
-}
-
-window:not([active="true"]) #aios-sidebardivider-4 {
-    border-bottom: 1px solid #999999;
-}
-
-
-/**
-	SIDEBARHEADER-TOOLBAR
-*/
-#sidebarheader #sidebarclose-button image {
-    margin: 3px 0px 2px 0px;
-    padding: 0px;
-    width: 16px;
-    height: 16px;
-    max-width: 16px;
-    max-height: 16px;
-}
-
-
-/**
-    SIDEBAR
-*/
-#sidebar-box {
-    border: none;
-}
-
-
-/**
-	GRIPPY & SIDEBAR-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-top: 1px solid #D4DDE5;
-    border-right: 1px solid #515151;
-    background-color: #D4DDE5;
-}
-
-#sidebar-splitter[orient="horizontal"] hbox,
-window[aiosOrient="right"] #sidebar-splitter[orient="horizontal"] hbox {
-    border: none;
-}
-
-window:not([active="true"]) #sidebar-splitter[orient="horizontal"] {
-    background-color: #e8e8e8;
-    border-right: 1px solid #999999;
-}
-
-#sidebar-splitter[orient="horizontal"][grippy="false"],
-#sidebar-splitter[orient="horizontal"][grippy="false"] hbox {
-    min-width: 3px;
-}
-
-#sidebar-splitter[orient="horizontal"][grippy="true"],
-#sidebar-splitter[orient="horizontal"][grippy="true"] hbox {
-    min-width: 6px;
-}
-
-window[aiosOrient="right"] #sidebar-splitter[orient="horizontal"] {
-    border-left: 1px solid #515151 !important;
-    border-right: none;
-}
-
-window[aiosOrient="right"]:not([active="true"]) #sidebar-splitter[orient="horizontal"] {
-    border-left: 1px solid #999999 !important;
-}
-
-
-/**
-    Toolbarseparator auf der Toolbar und im Konfigurationsmodus
-*/
-#aios-toolbar toolbarseparator,
-#aios-toolbar toolbarpaletteitem[id^="wrapper-separator"] {
-    margin: 0px 1px;
-    border-left: 1px dotted #808080;
-}
-
-#aios-toolbar[orient="vertical"] toolbarseparator,
-#aios-toolbar[orient="vertical"] toolbarpaletteitem[id^="wrapper-separator"] {
-    margin: 4px 2px 3px 2px;
-    border-top: 1px dotted #808080;
-    border-bottom: none;
-}
-
-
-/**
-	BUTTONS
-*/
-#downloads-button, toolbar[iconsize="small"] #downloads-button,
-#addons-button, toolbar[iconsize="small"] #addons-button,
-#multipanel-button, toolbar[iconsize="small"] #multipanel-button,
-#pageinfo-button, toolbar[iconsize="small"] #pageinfo-button,
-#console-button, toolbar[iconsize="small"] #console-button,
-#paneltab-button, toolbar[iconsize="small"] #paneltab-button,
-#sidebars-button, toolbar[iconsize="small"] #sidebars-button,
-#sidebars-togglebutton, toolbar[iconsize="small"] #sidebars-togglebutton,
-#autohide-button, toolbar[iconsize="small"] #autohide-button,
-#toolbar-button, toolbar[iconsize="small"] #toolbar-button {
-    list-style-image: url(icons/toolbar_darwin_fx3.png);
-}
-#downloads-button:hover:active, #downloads-button[checked="true"],
-#addons-button:hover:active, #addons-button[checked="true"],
-#multipanel-button:hover:active, #multipanel-button[checked="true"],
-#pageinfo-button:hover:active, #pageinfo-button[checked="true"],
-#console-button:hover:active, #console-button[checked="true"],
-#sidebars-togglebutton:hover:active, #sidebars-togglebutton[checked="true"],
-#autohide-button:hover:active, #autohide-button[checked="true"],
-#toolbar-button:hover:active, #toolbar-button[checked="true"] {
-    background-color: transparent;
-    border-color: transparent;
-}
-
-
-#downloads-button {
-    -moz-image-region: rect(0px, 36px, 23px, 0px);
-}
-#palette-box #downloads-button {
-    -moz-image-region: rect(0px, 36px, 23px, 0px) !important;
-}
-#downloads-button[disabled="true"] {
-    -moz-image-region: rect(23px, 36px, 46px, 0px);
-}
-#downloads-button:hover:active {
-    -moz-image-region: rect(46px, 36px, 69px, 0px);
-}
-#downloads-button[checked="true"] {
-    -moz-image-region: rect(69px, 36px, 92px, 0px);
-}
-#downloads-button[checked="true"]:hover:active {
-    -moz-image-region: rect(92px, 36px, 115px, 0px);
-}
-
-
-#addons-button {
-    -moz-image-region: rect(0px, 72px, 23px, 36px);
-}
-#addons-button[disabled="true"] {
-    -moz-image-region: rect(23px, 72px, 46px, 36px);
-}
-#addons-button:hover:active {
-    -moz-image-region: rect(46px, 72px, 69px, 36px);
-}
-#addons-button[checked="true"] {
-    -moz-image-region: rect(69px, 72px, 92px, 36px);
-}
-#addons-button[checked="true"]:hover:active {
-    -moz-image-region: rect(92px, 72px, 115px, 36px);
-}
-
-
-#multipanel-button {
-    -moz-image-region: rect(0px, 108px, 23px, 72px);
-}
-#multipanel-button[disabled="true"] {
-    -moz-image-region: rect(23px, 108px, 46px, 72px);
-}
-#multipanel-button:hover:active {
-    -moz-image-region: rect(46px, 108px, 69px, 72px);
-}
-#multipanel-button[checked="true"] {
-    -moz-image-region: rect(69px, 108px, 92px, 72px);
-}
-#multipanel-button[checked="true"]:hover:active {
-    -moz-image-region: rect(92px, 108px, 115px, 72px);
-}
-
-
-#pageinfo-button {
-    -moz-image-region: rect(0px, 144px, 23px, 108px);
-}
-#pageinfo-button[disabled="true"] {
-    -moz-image-region: rect(23px, 144px, 46px, 108px);
-}
-#pageinfo-button:hover:active {
-    -moz-image-region: rect(46px, 144px, 69px, 108px);
-}
-#pageinfo-button[checked="true"] {
-    -moz-image-region: rect(69px, 144px, 92px, 108px);
-}
-#pageinfo-button[checked="true"]:hover:active {
-    -moz-image-region: rect(92px, 144px, 115px, 108px);
-}
-
-
-
-#console-button {
-    -moz-image-region: rect(0px, 216px, 23px, 180px);
-}
-#console-button[disabled="true"] {
-    -moz-image-region: rect(23px, 216px, 46px, 180px);
-}
-#console-button:hover:active {
-    -moz-image-region: rect(46px, 216px, 69px, 180px);
-}
-#console-button[checked="true"] {
-    -moz-image-region: rect(69px, 216px, 92px, 180px);
-}
-#console-button[checked="true"]:hover:active {
-    -moz-image-region: rect(92px, 216px, 115px, 180px);
-}
-
-
-
-
-#paneltab-button {
-    -moz-image-region: rect(0px, 252px, 23px, 216px);
-}
-#paneltab-button:hover:active {
-    -moz-image-region: rect(46px, 252px, 69px, 216px);
-}
-
-#sidebars-button {
-    -moz-image-region: rect(0px, 288px, 23px, 252px);
-}
-#sidebars-button:hover:active {
-    -moz-image-region: rect(46px, 288px, 69px, 252px);
-}
-
-#sidebars-togglebutton {
-    -moz-image-region: rect(0px, 324px, 23px, 288px);
-}
-#palette-box #sidebars-togglebutton {
-    -moz-image-region: rect(0px, 324px, 23px, 288px) !important;
-}
-#sidebars-togglebutton:hover:active {
-    -moz-image-region: rect(46px, 324px, 69px, 288px);
-}
-#sidebars-togglebutton[checked="true"] {
-    -moz-image-region: rect(69px, 324px, 92px, 288px);
-}
-#sidebars-togglebutton[checked="true"]:hover:active {
-    -moz-image-region: rect(92px, 324px, 115px, 288px);
-}
-
-#autohide-button {
-    -moz-image-region: rect(0px, 360px, 23px, 324px);
-}
-#palette-box #autohide-button {
-    -moz-image-region: rect(0px, 360px, 23px, 324px) !important;
-}
-#autohide-button:hover:active {
-    -moz-image-region: rect(46px, 360px, 69px, 324px);
-}
-#autohide-button[checked="true"] {
-    -moz-image-region: rect(69px, 360px, 92px, 324px);
-}
-#autohide-button[checked="true"]:hover:active {
-    -moz-image-region: rect(92px, 360px, 115px, 324px);
-}
-
-#toolbar-button {
-    -moz-image-region: rect(0px, 396px, 23px, 360px);
-}
-#palette-box #toolbar-button {
-    -moz-image-region: rect(0px, 396px, 23px, 360px) !important;
-}
-#toolbar-button:hover:active {
-    -moz-image-region: rect(46px, 396px, 69px, 360px);
-}
-#toolbar-button[checked="true"] {
-    -moz-image-region: rect(69px, 396px, 92px, 360px);
-}
-#toolbar-button[checked="true"]:hover:active {
-    -moz-image-region: rect(92px, 396px, 115px, 360px);
-}
-
-
-/*
-	KLEINE ICONS
-*/
-#aios-toolbar[iconsize="small"] #downloads-button, #aios-sbhtoolbox[iconsize="small"] #downloads-button,
-#aios-toolbar[iconsize="small"] #addons-button, #aios-sbhtoolbox[iconsize="small"] #addons-button,
-#aios-toolbar[iconsize="small"] #multipanel-button, #aios-sbhtoolbox[iconsize="small"] #multipanel-button,
-#aios-toolbar[iconsize="small"] #pageinfo-button, #aios-sbhtoolbox[iconsize="small"] #pageinfo-button,
-#aios-toolbar[iconsize="small"] #console-button, #aios-sbhtoolbox[iconsize="small"] #console-button,
-#aios-toolbar[iconsize="small"] #paneltab-button, #aios-sbhtoolbox[iconsize="small"] #paneltab-button,
-#aios-toolbar[iconsize="small"] #sidebars-button, #aios-sbhtoolbox[iconsize="small"] #sidebars-button,
-#aios-toolbar[iconsize="small"] #sidebars-togglebutton, #aios-sbhtoolbox[iconsize="small"] #sidebars-togglebutton,
-#aios-toolbar[iconsize="small"] #autohide-button, #aios-sbhtoolbox[iconsize="small"] #autohide-button,
-#aios-toolbar[iconsize="small"] #toolbar-button, #aios-sbhtoolbox[iconsize="small"] #toolbar-button,
-#aios-toolbar[iconsize="small"] #history-button, #aios-sbhtoolbox[iconsize="small"] #history-button,
-#aios-toolbar[iconsize="small"] #bookmarks-button, #aios-sbhtoolbox[iconsize="small"] #bookmarks-button {
-    list-style-image: url(icons/toolbar_s_darwin_fx3.png);
-}
-
-#aios-toolbar[iconsize="small"] #downloads-button, #aios-sbhtoolbox[iconsize="small"] #downloads-button {
-    -moz-image-region: rect(0px, 22px, 18px, 0px);
-}
-#aios-toolbar[iconsize="small"] #downloads-button[disabled="true"], #aios-sbhtoolbox[iconsize="small"] #downloads-button[disabled="true"] {
-    -moz-image-region: rect(18px, 22px, 36px, 0px);
-}
-#aios-toolbar[iconsize="small"] #downloads-button:hover:active, #aios-sbhtoolbox[iconsize="small"] #downloads-button:hover:active {
-    -moz-image-region: rect(36px, 22px, 54px, 0px);
-}
-#aios-toolbar[iconsize="small"] #downloads-button[checked="true"], #aios-sbhtoolbox[iconsize="small"] #downloads-button[checked="true"] {
-    -moz-image-region: rect(54px, 22px, 72px, 0px);
-}
-#aios-toolbar[iconsize="small"] #downloads-button[checked="true"]:hover:active, #aios-sbhtoolbox[iconsize="small"] #downloads-button[checked="true"]:hover:active {
-    -moz-image-region: rect(72px, 22px, 90px, 0px);
-}
-
-
-#aios-toolbar[iconsize="small"] #addons-button, #aios-sbhtoolbox[iconsize="small"] #addons-button {
-    -moz-image-region: rect(0px, 44px, 18px, 22px);
-}
-#aios-toolbar[iconsize="small"] #addons-button[disabled="true"], #aios-sbhtoolbox[iconsize="small"] #addons-button[disabled="true"] {
-    -moz-image-region: rect(18px, 44px, 36px, 22px);
-}
-#aios-toolbar[iconsize="small"] #addons-button:hover:active, #aios-sbhtoolbox[iconsize="small"] #addons-button:hover:active {
-    -moz-image-region: rect(36px, 44px, 54px, 22px);
-}
-#aios-toolbar[iconsize="small"] #addons-button[checked="true"], #aios-sbhtoolbox[iconsize="small"] #addons-button[checked="true"] {
-    -moz-image-region: rect(54px, 44px, 72px, 22px);
-}
-#aios-toolbar[iconsize="small"] #addons-button[checked="true"]:hover:active, #aios-sbhtoolbox[iconsize="small"] #addons-button[checked="true"]:hover:active {
-    -moz-image-region: rect(72px, 44px, 90px, 22px);
-}
-
-
-#aios-toolbar[iconsize="small"] #multipanel-button, #aios-sbhtoolbox[iconsize="small"] #multipanel-button {
-    -moz-image-region: rect(0px, 66px, 18px, 44px);
-}
-#aios-toolbar[iconsize="small"] #multipanel-button[disabled="true"], #aios-sbhtoolbox[iconsize="small"] #multipanel-button[disabled="true"] {
-    -moz-image-region: rect(18px, 66px, 36px, 44px);
-}
-#aios-toolbar[iconsize="small"] #multipanel-button:hover:active, #aios-sbhtoolbox[iconsize="small"] #multipanel-button:hover:active {
-    -moz-image-region: rect(36px, 66px, 54px, 44px);
-}
-#aios-toolbar[iconsize="small"] #multipanel-button[checked="true"], #aios-sbhtoolbox[iconsize="small"] #multipanel-button[checked="true"] {
-    -moz-image-region: rect(54px, 66px, 72px, 44px);
-}
-#aios-toolbar[iconsize="small"] #multipanel-button[checked="true"]:hover:active, #aios-sbhtoolbox[iconsize="small"] #multipanel-button[checked="true"]:hover:active {
-    -moz-image-region: rect(72px, 66px, 90px, 44px);
-}
-
-
-#aios-toolbar[iconsize="small"] #pageinfo-button, #aios-sbhtoolbox[iconsize="small"] #pageinfo-button {
-    -moz-image-region: rect(0px, 88px, 18px, 66px);
-}
-#aios-toolbar[iconsize="small"] #pageinfo-button[disabled="true"], #aios-sbhtoolbox[iconsize="small"] #pageinfo-button[disabled="true"] {
-    -moz-image-region: rect(18px, 88px, 36px, 66px);
-}
-#aios-toolbar[iconsize="small"] #pageinfo-button:hover:active, #aios-sbhtoolbox[iconsize="small"] #pageinfo-button:hover:active {
-    -moz-image-region: rect(36px, 88px, 54px, 66px);
-}
-#aios-toolbar[iconsize="small"] #pageinfo-button[checked="true"], #aios-sbhtoolbox[iconsize="small"] #pageinfo-button[checked="true"] {
-    -moz-image-region: rect(54px, 88px, 72px, 66px);
-}
-#aios-toolbar[iconsize="small"] #pageinfo-button[checked="true"]:hover:active, #aios-sbhtoolbox[iconsize="small"] #pageinfo-button[checked="true"]:hover:active {
-    -moz-image-region: rect(72px, 88px, 90px, 66px);
-}
-
-
-#aios-toolbar[iconsize="small"] #console-button, #aios-sbhtoolbox[iconsize="small"] #console-button {
-    -moz-image-region: rect(0px, 132px, 18px, 110px);
-}
-#aios-toolbar[iconsize="small"] #console-button[disabled="true"], #aios-sbhtoolbox[iconsize="small"] #console-button[disabled="true"] {
-    -moz-image-region: rect(18px, 132px, 36px, 110px);
-}
-#aios-toolbar[iconsize="small"] #console-button:hover:active, #aios-sbhtoolbox[iconsize="small"] #console-button:hover:active {
-    -moz-image-region: rect(36px, 132px, 54px, 110px);
-}
-#aios-toolbar[iconsize="small"] #console-button[checked="true"], #aios-sbhtoolbox[iconsize="small"] #console-button[checked="true"] {
-    -moz-image-region: rect(54px, 132px, 72px, 110px);
-}
-#aios-toolbar[iconsize="small"] #console-button[checked="true"]:hover:active, #aios-sbhtoolbox[iconsize="small"] #console-button[checked="true"]:hover:active {
-    -moz-image-region: rect(72px, 132px, 90px, 110px);
-}
-
-
-
-
-#aios-toolbar[iconsize="small"] #paneltab-button, #aios-sbhtoolbox[iconsize="small"] #paneltab-button {
-    -moz-image-region: rect(0px, 154px, 18px, 132px);
-}
-#aios-toolbar[iconsize="small"] #paneltab-button:hover:active, #aios-sbhtoolbox[iconsize="small"] #paneltab-button:hover:active {
-    -moz-image-region: rect(36px, 154px, 54px, 132px);
-}
-
-#aios-toolbar[iconsize="small"] #sidebars-button, #aios-sbhtoolbox[iconsize="small"] #sidebars-button {
-    -moz-image-region: rect(0px, 176px, 18px, 154px);
-}
-#aios-toolbar[iconsize="small"] #sidebars-button:hover:active, #aios-sbhtoolbox[iconsize="small"] #sidebars-button:hover:active {
-    -moz-image-region: rect(36px, 176px, 54px, 154px);
-}
-
-#aios-toolbar[iconsize="small"] #sidebars-togglebutton, #aios-sbhtoolbox[iconsize="small"] #sidebars-togglebutton {
-    -moz-image-region: rect(0px, 198px, 18px, 176px);
-}
-#aios-toolbar[iconsize="small"] #sidebars-togglebutton:hover:active, #aios-sbhtoolbox[iconsize="small"] #sidebars-togglebutton:hover:active {
-    -moz-image-region: rect(36px, 198px, 54px, 176px);
-}
-#aios-toolbar[iconsize="small"] #sidebars-togglebutton[checked="true"], #aios-sbhtoolbox[iconsize="small"] #sidebars-togglebutton[checked="true"] {
-    -moz-image-region: rect(54px, 198px, 72px, 176px);
-}
-#aios-toolbar[iconsize="small"] #sidebars-togglebutton[checked="true"]:hover:active, #aios-sbhtoolbox[iconsize="small"] #sidebars-togglebutton[checked="true"]:hover:active {
-    -moz-image-region: rect(72px, 198px, 90px, 176px);
-}
-
-#aios-toolbar[iconsize="small"] #autohide-button, #aios-sbhtoolbox[iconsize="small"] #autohide-button {
-    -moz-image-region: rect(0px, 220px, 18px, 198px);
-}
-#aios-toolbar[iconsize="small"] #autohide-button:hover:active, #aios-sbhtoolbox[iconsize="small"] #autohide-button:hover:active {
-    -moz-image-region: rect(36px, 220px, 54px, 198px);
-}
-#aios-toolbar[iconsize="small"] #autohide-button[checked="true"], #aios-sbhtoolbox[iconsize="small"] #autohide-button[checked="true"] {
-    -moz-image-region: rect(54px, 220px, 72px, 198px);
-}
-#aios-toolbar[iconsize="small"] #autohide-button[checked="true"]:hover:active, #aios-sbhtoolbox[iconsize="small"] #autohide-button[checked="true"]:hover:active {
-    -moz-image-region: rect(72px, 220px, 90px, 198px);
-}
-
-#aios-toolbar[iconsize="small"] #toolbar-button, #aios-sbhtoolbox[iconsize="small"] #toolbar-button {
-    -moz-image-region: rect(0px, 242px, 18px, 220px);
-}
-#aios-toolbar[iconsize="small"] #toolbar-button:hover:active, #aios-sbhtoolbox[iconsize="small"] #toolbar-button:hover:active {
-    -moz-image-region: rect(36px, 242px, 54px, 220px);
-}
-#aios-toolbar[iconsize="small"] #toolbar-button[checked="true"], #aios-sbhtoolbox[iconsize="small"] #toolbar-button[checked="true"] {
-    -moz-image-region: rect(54px, 242px, 72px, 220px);
-}
-#aios-toolbar[iconsize="small"] #toolbar-button[checked="true"]:hover:active, #aios-sbhtoolbox[iconsize="small"] #toolbar-button[checked="true"]:hover:active {
-    -moz-image-region: rect(72px, 242px, 90px, 220px);
-}
-
-
-#aios-toolbar[iconsize="small"] #history-button, #aios-sbhtoolbox[iconsize="small"] #history-button {
-    -moz-image-region: rect(0px, 264px, 18px, 242px);
-}
-#aios-toolbar[iconsize="small"] #history-button[disabled="true"], #aios-sbhtoolbox[iconsize="small"] #history-button[disabled="true"] {
-    -moz-image-region: rect(18px, 264px, 36px, 242px);
-}
-#aios-toolbar[iconsize="small"] #history-button:hover:active, #aios-sbhtoolbox[iconsize="small"] #history-button:hover:active {
-    -moz-image-region: rect(36px, 264px, 54px, 242px);
-}
-#aios-toolbar[iconsize="small"] #history-button[checked="true"], #aios-sbhtoolbox[iconsize="small"] #history-button[checked="true"] {
-    -moz-image-region: rect(54px, 264px, 72px, 242px);
-}
-#aios-toolbar[iconsize="small"] #history-button[checked="true"]:hover:active, #aios-sbhtoolbox[iconsize="small"] #history-button[checked="true"]:hover:active {
-    -moz-image-region: rect(72px, 264px, 90px, 242px);
-}
-
-#aios-toolbar[iconsize="small"] #bookmarks-button, #aios-sbhtoolbox[iconsize="small"] #bookmarks-button {
-    -moz-image-region: rect(0px, 286px, 18px, 264px);
-}
-#aios-toolbar[iconsize="small"] #bookmarks-button[disabled="true"], #aios-sbhtoolbox[iconsize="small"] #bookmarks-button[disabled="true"] {
-    -moz-image-region: rect(18px, 286px, 36px, 264px);
-}
-#aios-toolbar[iconsize="small"] #bookmarks-button:hover:active, #aios-sbhtoolbox[iconsize="small"] #bookmarks-button:hover:active {
-    -moz-image-region: rect(36px, 286px, 54px, 264px);
-}
-#aios-toolbar[iconsize="small"] #bookmarks-button[checked="true"], #aios-sbhtoolbox[iconsize="small"] #bookmarks-button[checked="true"] {
-    -moz-image-region: rect(54px, 286px, 72px, 264px);
-}
-#aios-toolbar[iconsize="small"] #bookmarks-button[checked="true"]:hover:active, #aios-sbhtoolbox[iconsize="small"] #bookmarks-button[checked="true"]:hover:active {
-    -moz-image-region: rect(72px, 286px, 90px, 264px);
-}
-
-
-/**
-        MENU-ICONS
-*/
-menuitem[key="aiosKey_panelTab1"] {
-    -moz-image-region: rect(48px, 16px, 64px, 0px);
-}
-
-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, 0px);
-}
-
-#viewSidebarMenu #aios-sidebar-mitem-paneltab1,
-#viewSidebarMenu #aios-sidebar-mitem-paneltab2,
-#viewSidebarMenu #aios-sidebar-mitem-show,
-#viewSidebarMenu #aios-sidebar-mitem-hide,
-#viewSidebarMenu #aios-sidebar-mitem-prefs {
-    list-style-image: none;
-}
\ No newline at end of file
diff --git a/skin/aios_theme_darwin_fx4.css b/skin/aios_theme_darwin_fx4.css
deleted file mode 100644
index 4dc661a..0000000
--- a/skin/aios_theme_darwin_fx4.css
+++ /dev/null
@@ -1,478 +0,0 @@
-
-/**
-	Properties for default Firefox theme on Darwin (Mac OS X)
-		dynamically loaded in aios.js => aios_initSidebar()
-*/
-
-
-#aios-toggle-toolbar,
-#aios-toolbar {
-    background-color: -moz-mac-chrome-active;
-}
-
-#aios-toggle-toolbar:-moz-window-inactive,
-#aios-toolbar:-moz-window-inactive {
-    background-color: -moz-mac-chrome-inactive;
-}
-
-#aios-toolbar[orient="horizontal"] {
-    padding: 3px 0px 4px 0px;
-}
-
-
-/**
-	SIDEBAR SWITCH
-*/
-#aios-toggle-toolbar {
-    border-top: 1px solid #c0c0c0;
-    border-right: 1px solid #484848 !important;
-}
-
-#aios-toggle-toolbar:-moz-window-inactive {
-    border-top: 1px solid #e1e1e1;
-    border-right: 1px solid #929292 !important;
-}
-
-window[aiosOrient="right"] #aios-toggle-toolbox,
-window[aiosOrient="right"][aiosOpen="false"] #aios-toggle-toolbox{
-    border-left: 1px solid #484848;
-}
-
-window[aiosOrient="right"] #aios-toggle-toolbox:-moz-window-inactive,
-window[aiosOrient="right"][aiosOpen="false"] #aios-toggle-toolbox:-moz-window-inactive {
-    border-left: 1px solid #929292;
-}
-
-window[aiosOrient="right"] #aios-toggle-toolbar,
-window[aiosOrient="right"][aiosOpen="false"] #aios-toggle-toolbar {
-    border-left: 1px solid #c0c0c0;
-}
-
-window[aiosOrient="right"] #aios-toggle-toolbar:-moz-window-inactive,
-window[aiosOrient="right"][aiosOpen="false"] #aios-toggle-toolbar:-moz-window-inactive {
-    border-left: 1px solid #e1e1e1;
-}
-
-
-/**
-	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;
-}
-
-#aios-toolbar[posMode="1"]:-moz-window-inactive {
-    border-top: 1px solid #e1e1e1;
-    border-left: 1px solid #e1e1e1;
-    border-right: 1px solid #929292;
-}
-
-window[aiosOrient="right"] #aios-toolbar[posMode="1"] {
-    border-right: 1px solid #484848;
-    border-left: 1px solid #484848;
-}
-
-window[aiosOrient="right"] #aios-toolbar[posMode="1"]:-moz-window-inactive {
-    border-right: 1px solid #929292;
-    border-left: 1px solid #929292;
-}
-
-window[aiosOrient="right"][aiosOpen="false"] #aios-toolbar[posMode="1"] {
-    border-left: 1px solid #484848;
-}
-
-window[aiosOrient="right"][aiosOpen="false"] #aios-toolbar[posMode="1"]:-moz-window-inactive {
-    border-left: 1px solid #929292;
-    border-right: none;
-}
-
-/* Toolbar rechts neben der Sidebar */
-#aios-toolbar[posMode="2"] {
-    border-top: 1px solid #c0c0c0;
-    border-left: 1px solid #484848;
-    border-right: 1px solid #484848;
-}
-
-#aios-toolbar[posMode="2"]:-moz-window-inactive {
-    border-top: 1px solid #e1e1e1;
-    border-left: 1px solid #929292;
-    border-right: 1px solid #929292;
-}
-
-window[aiosOpen="false"] #aios-toolbar[posMode="2"] {
-    border-left: 1px solid #c0c0c0;
-    border-right: 1px solid #484848;
-}
-
-window[aiosOpen="false"] #aios-toolbar[posMode="2"]:-moz-window-inactive {
-    border-left: 1px solid #e1e1e1;
-    border-right: 1px solid #929292;
-}
-
-window[aiosOrient="right"] #aios-toolbar[posMode="2"],
-window[aiosOpen="false"][aiosOrient="right"] #aios-toolbar[posMode="2"] {
-    border-right: none;
-}
-
-window[aiosOpen="false"][aiosOrient="right"] #aios-toolbar[posMode="2"] {
-    border-left: 1px solid #484848;
-}
-
-window[aiosOpen="false"][aiosOrient="right"] #aios-toolbar[posMode="2"]:-moz-window-inactive {
-    border-left: 1px solid #929292;
-}
-
-/* Toolbar über der Sidebar */
-#aios-toolbar[posMode="3"] {
-    border-right: 1px solid #484848;
-    border-top: 1px solid #c0c0c0 !important;
-    border-bottom: 1px solid #484848;
-    border-left: 1px solid #c0c0c0;
-}
-
-#aios-toolbar[posMode="3"]:-moz-window-inactive {
-    border-top: 1px solid #e1e1e1 !important;
-    border-right: 1px solid #929292;
-    border-bottom: 1px solid #929292;
-    border-left: 1px solid #e1e1e1;
-}
-
-window[aiosOrient="right"] #aios-toolbar[posMode="3"] {
-    border-right: none;
-    border-left: 1px solid #484848;
-}
-
-window[aiosOrient="right"] #aios-toolbar[posMode="3"]:-moz-window-inactive {
-    border-right: none;
-    border-left: 1px solid #929292;
-}
-
-/* Toolbar unter der Sidebar-Kopfleiste */
-#aios-toolbar[posMode="4"] {
-    border-top: 1px solid #c0c0c0 !important;
-    border-right: 1px solid #484848;
-    border-bottom: 1px solid #484848;
-    border-left: 1px solid #c0c0c0;
-}
-
-#aios-toolbar[posMode="4"]:-moz-window-inactive {
-    border-top: 1px solid #e1e1e1 !important;
-    border-right: 1px solid #929292;
-    border-bottom: 1px solid #929292;
-    border-left: 1px solid #e1e1e1;
-}
-
-window[aiosOrient="right"] #aios-toolbar[posMode="4"] {
-    border-right: none;
-    border-left: 1px solid #484848;
-}
-
-window[aiosOrient="right"] #aios-toolbar[posMode="4"]:-moz-window-inactive {
-    border-right: none;
-    border-left: 1px solid #929292;
-}
-
-/* Toolbar unter der Sidebar */
-#aios-toolbar[posMode="5"] {
-    border-top: 1px solid #c0c0c0 !important;
-    border-right: 1px solid #484848;
-    border-left: 1px solid #c0c0c0;
-}
-
-#aios-toolbar[posMode="5"]:-moz-window-inactive {
-    border-top: 1px solid #e1e1e1 !important;
-    border-right: 1px solid #929292;
-    border-left: 1px solid #e1e1e1;
-}
-
-window[aiosOrient="right"] #aios-toolbar[posMode="5"] {
-    border-right: none;
-    border-left: 1px solid #484848;
-}
-
-window[aiosOrient="right"] #aios-toolbar[posMode="5"]:-moz-window-inactive {
-    border-right: none;
-    border-left: 1px solid #929292;
-}
-
-
-/**
-	DIVIDER
-*/
-#aios-sidebardivider-2 {
-    border-top: none;
-    border-bottom: 1px solid #484848;
-}
-
-#aios-sidebardivider-2:-moz-window-inactive {
-    border-bottom: 1px solid #929292;
-}
-
-#aios-sidebardivider-3 {
-    border-top: none;
-}
-
-#aios-sidebardivider-4 {
-    border-bottom: 1px solid #484848;
-}
-
-#aios-sidebardivider-4:-moz-window-inactive {
-    border-bottom: 1px solid #929292;
-}
-
-
-/**
-    SIDEBAR
-*/
-#sidebar-box {
-    border: none;
-}
-
-
-/**
-	GRIPPY & SIDEBAR-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-top: 1px solid #D4DDE5;
-    border-right: 1px solid #484848;
-    background-color: #D4DDE5;
-}
-
-#sidebar-splitter[orient="horizontal"] hbox,
-window[aiosOrient="right"] #sidebar-splitter[orient="horizontal"] hbox {
-    border: none;
-}
-
-#sidebar-splitter[orient="horizontal"]:-moz-window-inactive {
-    background-color: #e8e8e8;
-    border-right: 1px solid #929292;
-}
-
-#sidebar-splitter[orient="horizontal"][grippy="false"],
-#sidebar-splitter[orient="horizontal"][grippy="false"] hbox {
-    min-width: 3px;
-}
-
-#sidebar-splitter[orient="horizontal"][grippy="true"],
-#sidebar-splitter[orient="horizontal"][grippy="true"] hbox {
-    min-width: 6px;
-}
-
-window[aiosOrient="right"] #sidebar-splitter[orient="horizontal"] {
-    border-left: 1px solid #484848 !important;
-    border-right: none;
-}
-
-window[aiosOrient="right"] #sidebar-splitter[orient="horizontal"]:-moz-window-inactive {
-    border-left: 1px solid #929292 !important;
-}
-
-
-/**
-    Toolbarseparator auf der Toolbar und im Konfigurationsmodus
-*/
-#aios-toolbar toolbarseparator,
-#aios-toolbar toolbarpaletteitem[id^="wrapper-separator"] {
-    margin: 0px 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;
-}
-
-
-/**
-	BUTTONS
-*/
-
-#aios-toolbar[orient="vertical"] toolbarbutton {
-    margin: 2px 1px;
-}
-
-#aios-sbhtoolbar[iconsize="small"] toolbarbutton {
-    margin: 0px 2px;
-    padding: 0px;
-    min-width: 0px;
-    max-height: 20px;
-}
-
-#aios-sbhtoolbar[iconsize="small"] toolbarbutton image {
-    margin: 0px 3px;
-}
-
-
-/**
-        BUTTON-ICONS
-*/
-#downloads-button,
-toolbarbutton.aios-tbutton:not([type="menu-button"]),
-toolbarbutton.aios-tbutton[type="menu-button"] {
-    list-style-image: url(icons/toolbar_darwin.png);
-}
-
-/** Downloads */
-#downloads-button {
-    -moz-image-region: rect(0px, 16px, 16px, 0px) !important;
-}
-
-#downloads-button[checked="true"] {
-    -moz-image-region: rect(16px, 16px, 32px, 0px) !important;
-}
-
-#downloads-button[checked="true"]:active:hover {
-    -moz-image-region: rect(32px, 16px, 48px, 0px) !important;
-}
-
-/** Addons */
-#addons-button {
-    -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-#addons-button[checked="true"] {
-    -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-
-#addons-button[checked="true"]:active:hover {
-    -moz-image-region: rect(32px, 32px, 48px, 16px);
-}
-
-/** MultiPanel */
-#multipanel-button {
-    -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-
-#multipanel-button[checked="true"] {
-    -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
-
-#multipanel-button[checked="true"]:active:hover {
-    -moz-image-region: rect(32px, 48px, 48px, 32px);
-}
-
-/** PageInfo */
-#pageinfo-button {
-    -moz-image-region: rect(0px, 64px, 16px, 48px);
-}
-
-#pageinfo-button[checked="true"] {
-    -moz-image-region: rect(16px, 64px, 32px, 48px);
-}
-
-#pageinfo-button[checked="true"]:active:hover {
-    -moz-image-region: rect(32px, 64px, 48px, 48px);
-}
-
-/** Console-Button */
-#console-button {
-    -moz-image-region: rect(0px, 96px, 16px, 80px);
-}
-
-#console-button[checked="true"] {
-    -moz-image-region: rect(16px, 96px, 32px, 80px);
-}
-
-#console-button[checked="true"]:active:hover {
-    -moz-image-region: rect(32px, 96px, 48px, 80px);
-}
-
-/** PanelTab */
-#paneltab-button {
-    -moz-image-region: rect(0px, 112px, 16px, 96px);
-}
-
-/** Sidebars-Menu */
-#sidebars-button {
-    -moz-image-region: rect(0px, 128px, 16px, 112px);
-}
-
-#sidebars-button dropmarker {
-    display: none;
-}
-
-/** Sidebars */
-#sidebars-togglebutton {
-    -moz-image-region: rect(0px, 144px, 16px, 128px);
-    border: none;
-}
-
-#sidebars-togglebutton[checked="true"] {
-    -moz-image-region: rect(16px, 144px, 32px, 128px);
-}
-
-#sidebars-togglebutton[checked="true"] .toolbarbutton-menubutton-button,
-#sidebars-togglebutton[checked="true"] .toolbarbutton-menubutton-dropmarker {
-    background: #606060;
-    box-shadow: inset #2A2A2A 0 3px 3.5px, 0 1px rgba(255, 255, 255, .4);
-}
-
-#sidebars-togglebutton[checked="true"]:active:hover {
-    -moz-image-region: rect(32px, 144px, 48px, 128px);
-}
-
-
-/** Autohide */
-#autohide-button {
-    -moz-image-region: rect(0px, 160px, 16px, 144px);
-}
-
-#autohide-button[checked="true"] {
-    -moz-image-region: rect(16px, 160px, 32px, 144px);
-}
-
-#autohide-button[checked="true"]:active:hover {
-    -moz-image-region: rect(32px, 160px, 48px, 144px);
-}
-
-/** Toolbar */
-#toolbar-button {
-    -moz-image-region: rect(0px, 176px, 16px, 160px);
-}
-
-#toolbar-button[checked="true"] {
-    -moz-image-region: rect(16px, 176px, 32px, 160px);
-}
-
-#toolbar-button[checked="true"]:active:hover {
-    -moz-image-region: rect(32px, 176px, 48px, 160px);
-}
-
-
-/**
-        MENU-ICONS
-*/
-menuitem[key="aiosKey_panelTab1"] {
-    -moz-image-region: rect(48px, 16px, 64px, 0px);
-}
-
-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, 0px);
-}
diff --git a/skin/aios_theme_default.css b/skin/aios_theme_default.css
deleted file mode 100644
index fd78ecf..0000000
--- a/skin/aios_theme_default.css
+++ /dev/null
@@ -1,154 +0,0 @@
-
-/*
-	Properties for default Firefox theme
-		dynamically loaded in aios.js => aios_initSidebar()
-*/
-
-
-/**
-	SIDEBAR SWITCH
-*/
-#aios-toggle-toolbar {
-    border-top: 1px solid ThreedHighlight;
-    border-right: 1px solid ThreedShadow;
-}
-
-window[aiosOrient="right"] #aios-toggle-toolbar {
-    border-left: 1px solid ThreedHighlight;
-    border-right: none;
-}
-
-window[aiosOrient="right"][aiosOpen="false"] #aios-toggle-toolbox {
-    border-left: 1px solid ThreedShadow;
-}
-
-
-/**
-	AiOS-TOOLBAR
-*/
-/* Buttons auf vertikalen Toolbar
-#aios-toolbar[orient="vertical"][iconsize="small"] toolbarbutton:not([type="menu-button"]):not([id="go-button"]):not([anonid="search-go-button"]){
-    padding: 4px !important;
-}*/
-
-/* links neben der Sidebar */
-#aios-toolbar[posMode="1"] {
-    border-top: 1px solid ThreedHighlight;
-    border-left: 1px solid ThreedHighlight;
-    border-right: 1px solid ThreedShadow;
-}
-
-window[aiosOpen="false"][aiosOrient="right"] #aios-toolbar[posMode="1"] {
-    border-right: none;
-    border-left: 1px solid ThreedShadow;
-}
-
-/* rechts neben der Sidebar */
-#aios-toolbar[posMode="2"] {
-    border-top: 1px solid ThreedHighlight;
-    border-left: 1px solid ThreedHighlight;
-    border-right: 1px solid ThreedShadow;
-}
-
-window[aiosOpen="false"] #aios-toolbar[posMode="2"] {
-    border-left: 1px solid ThreedHighlight;
-    border-right: 1px solid ThreedShadow;
-}
-
-window[aiosOpen="false"][aiosOrient="right"] #aios-toolbar[posMode="2"] {
-    border-left: 1px solid ThreedShadow;
-    border-right: none;
-}
-
-/*window[aiosOpen="false"][aiosOrient="right"] #aios-toolbox-right[posMode="2"] {
-    border-left: 1px solid ThreedShadow;
-}*/
-
-/* über der Sidebar */
-#aios-toolbar[posMode="3"] {
-    border-top: 1px solid ThreedHighlight !important;
-    border-bottom: 1px solid ThreedShadow;
-}
-
-/* unter der Sidebar-Kopfleiste */
-#aios-toolbar[posMode="4"] {
-    border-top: none !important;
-    border-bottom: 1px solid ThreedShadow;
-}
-
-/* unter der Sidebar */
-#aios-toolbar[posMode="5"] {
-    border-top: 1px solid ThreedHighlight !important;
-}
-
-
-/**
-	SIDEBAR
-*/
-#sidebar-box {
-    border-left: 1px solid ThreedHighlight;
-    border-right: 1px solid ThreedShadow;
-}
-
-#aios-sidebardivider-2 {
-    border-top: 1px solid ThreedHighlight;
-}
-
-#aios-sidebardivider-3 {
-    border-top: 1px solid ThreedHighlight;
-}
-
-#aios-sidebardivider-4 {
-    border-top: 1px solid ThreedShadow;
-}
-
-
-/*
-	SIDEBAR-SPLITTER
-*/
-#sidebar-splitter[orient="horizontal"] {
-    border: none;
-}
-
-#sidebar-splitter[orient="horizontal"] hbox {
-    min-width: 6px;
-    border-top: 1px solid ThreedHighlight;
-    border-left: 1px solid ThreedHighlight;
-    border-right: 1px solid ThreedShadow;
-}
-
-window[aiosOrient="right"] #sidebar-splitter[orient="horizontal"] {
-    border-left: 1px solid ThreedShadow !important;
-}
-
-window[aiosOrient="right"] #sidebar-splitter[orient="horizontal"] hbox {
-    border-left: 1px solid ThreedHighlight;
-}
-
-#sidebar-splitter[orient="horizontal"][grippy="false"],
-#sidebar-splitter[orient="horizontal"][grippy="false"] hbox {
-    min-width: 4px;
-}
-
-
-/**
-	TOOLTIPS
-*/
-#aiosPopupset tooltip label:not([class="odd"]) {
-    border-top: 1px dotted ThreedDarkShadow;
-    border-bottom: 1px dotted ThreedDarkShadow;
-}
-
-#aiosPopupset tooltip > label:not([class="odd"]) {
-    border-top: none;
-    border-bottom: 1px solid ThreedDarkShadow;
-}
-
-
-/**
-	FIX FOR CONTEXTMENUS IN WinXP Classic Theme
-*/
-window:not(:-moz-system-metric(windows-default-theme))[aios_appOSVersion="Windows NT 5.1"] #aios-toolbar-contextmenu menuitem:hover,
-window:not(:-moz-system-metric(windows-default-theme))[aios_appOSVersion="Windows NT 5.1"] #aios-sbhtoolbar-contextmenu menuitem:hover {
-    color: HighlightText;
-}
\ No newline at end of file
diff --git a/skin/aios_theme_linux.css b/skin/aios_theme_linux.css
deleted file mode 100644
index 1e1dddd..0000000
--- a/skin/aios_theme_linux.css
+++ /dev/null
@@ -1,170 +0,0 @@
-
-/*
-	Properties for default Firefox theme on Linux
-		dynamically loaded in aios.js => aios_initSidebar()
-*/
-
-/**
-        Toolbarseparator auf der Toolbar und im Konfigurationsmodus
-*/
-#aios-toolbar[orient="vertical"] toolbarseparator {
-    -moz-appearance: none !important;
-    margin-left: 6px;
-    margin-right: 6px;
-    border-bottom: 1px solid -moz-ButtonHoverFace;
-}
-
-#aios-toolbar[orient="vertical"][iconsize="small"] toolbarseparator {
-    margin-left: 5px;
-    margin-right: 5px;
-}
-
-/**
-        SIDEBAR SWITCH, TOOLBAR
-*/
-#aios-toggle-toolbar {
-    border-top: none;
-    border-right: 1px solid ThreedShadow;
-}
-
-window[aiosOrient="right"] #aios-toggle-toolbar {
-    border-left: none;
-    border-left: 1px solid ThreedShadow;
-}
-
-#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;
-}
-
-window[aiosOrient="left"] #aios-toolbar[posMode="2"] {
-    border-right: 1px solid ThreedShadow;
-}
-
-window[aiosOrient="right"] #aios-toolbar[posMode="1"] {
-    border-left: 1px solid ThreedShadow;
-}
-
-
-/**
-	SIDEBAR
-*/
-#sidebar-box {
-    border: none;
-}
-
-#aios-sidebardivider-1,
-#aios-sidebardivider-2,
-#aios-sidebardivider-3,
-#aios-sidebardivider-4 {
-    display: none;
-}
-
-/**
-	SIDEBAR-SPLITTER
-*/
-#sidebar-splitter[orient="horizontal"],
-#sidebar-splitter[orient="horizontal"] hbox {
-    border: none !important;
-}
-
-
-/**
-	B U T T O N - I C O N S
-*/
-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_linux.png);
-}
-
-/** Addons */
-#addons-button {
-    -moz-image-region: rect(0px, 24px, 24px, 0px);
-}
-toolbar[iconsize="small"] #addons-button {
-    -moz-image-region: rect(24px, 16px, 40px, 0px);
-}
-
-/** MultiPanel */
-#multipanel-button {
-    -moz-image-region: rect(0px, 48px, 24px, 24px);
-}
-toolbar[iconsize="small"] #multipanel-button {
-    -moz-image-region: rect(24px, 32px, 40px, 16px);
-}
-
-/** PageInfo */
-#pageinfo-button {
-    -moz-image-region: rect(0px, 72px, 24px, 48px);
-}
-toolbar[iconsize="small"] #pageinfo-button {
-    -moz-image-region: rect(24px, 48px, 40px, 32px);
-}
-
-/** Console-Button */
-#console-button {
-    -moz-image-region: rect(0px, 120px, 24px, 96px);
-}
-toolbar[iconsize="small"] #console-button {
-    -moz-image-region: rect(24px, 80px, 40px, 64px);
-}
-
-/** PanelTab */
-#paneltab-button {
-    -moz-image-region: rect(0px, 144px, 24px, 120px);
-}
-toolbar[iconsize="small"] #paneltab-button {
-    -moz-image-region: rect(24px, 96px, 40px, 80px);
-}
-
-/** Sidebars-Menu */
-#sidebars-button {
-    -moz-image-region: rect(0px, 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 */
-#sidebars-togglebutton {
-    padding: 0px !important;
-    -moz-image-region: rect(0px, 192px, 24px, 168px);
-}
-toolbar[iconsize="small"] #sidebars-togglebutton {
-    -moz-image-region: rect(24px, 128px, 40px, 112px);
-}
-
-/** Autohide */
-#autohide-button {
-    -moz-image-region: rect(0px, 216px, 24px, 192px);
-}
-toolbar[iconsize="small"] #autohide-button {
-    -moz-image-region: rect(24px, 144px, 40px, 128px);
-}
-
-/** Toolbar */
-#toolbar-button {
-    -moz-image-region: rect(0px, 240px, 24px, 216px);
-}
-toolbar[iconsize="small"] #toolbar-button {
-    -moz-image-region: rect(24px, 160px, 40px, 144px);
-}
\ No newline at end of file
diff --git a/skin/aios_theme_linux_alt.css b/skin/aios_theme_linux_alt.css
deleted file mode 100644
index 6b52f5c..0000000
--- a/skin/aios_theme_linux_alt.css
+++ /dev/null
@@ -1,49 +0,0 @@
-
-/*
-	Properties for default Firefox theme on Linux
-		dynamically loaded in aios.js => aios_initSidebar()
-*/
-
-/* Toolbarseparator auf der Toolbar und im Konfigurationsmodus */
-#aios-toolbar[orient="vertical"] toolbarseparator {
-    -moz-appearance: none !important;
-    margin-left: 6px;
-    margin-right: 6px;
-    border-bottom: 1px solid ThreedHighlight;
-}
-
-#aios-toolbar[orient="vertical"][iconsize="small"] toolbarseparator {
-    margin-left: 5px;
-    margin-right: 5px;
-}
-
-
-/* Toolbar unter der Sidebar-Kopfleiste */
-#aios-toolbar[posMode="4"] {
-    border-top: 1px solid ThreedHighlight !important;
-}
-
-
-/**
-	SIDEBAR
-*/
-#aios-sidebardivider-1,
-#aios-sidebardivider-3 {
-    border-top: 1px solid ThreedHighlight;
-}
-
-#aios-sidebardivider-2,
-#aios-sidebardivider-4 {
-    border-top: 1px solid ThreedShadow;
-}
-
-
-/*
-	SIDEBARHEADER-TOOLBAR
-
-#sidebars-titlebutton > label,
-sidebarheader[iconsize="large"] #sidebars-titlebutton > label {
-    padding-top: 0px;
-    padding-bottom: 0px;
-    background: url(images/arrow.gif) no-repeat right 7px;
-}*/
\ No newline at end of file
diff --git a/skin/aios_theme_winnt.css b/skin/aios_theme_winnt.css
deleted file mode 100644
index 5e8525f..0000000
--- a/skin/aios_theme_winnt.css
+++ /dev/null
@@ -1,177 +0,0 @@
-
-/*
-	Properties for default Firefox theme on Win XP/Vista (Luna, Royale, Zune)
-		dynamically loaded in aios.js => aios_initSidebar()
-*/
-
-/*
-        Firefox 4: Firefox- und Windows-Standard-Theme auf XP
-*/
-window:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"][aios_appVersion^="4"] #aios-toggle-toolbox,
-window:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"][aios_appVersion^="4"] #aios-toolbox-left,
-window:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"][aios_appVersion^="4"] #aios-toolbox-right,
-window:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"][aios_appVersion^="4"] #sidebar-splitter[orient="horizontal"] hbox {
-    -moz-appearance: none;
-    background-image: -moz-linear-gradient(135deg, rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0));
-}
-
-window:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"][aios_appVersion^="4"] #aios-toolbox-sidebartop,
-window:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"][aios_appVersion^="4"] #aios-toolbox-sidebartop2,
-window:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"][aios_appVersion^="4"] #aios-toolbox-sidebarbottom,
-window:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"][aios_appVersion^="4"] sidebarheader {
-    -moz-appearance: none;
-    border-top: none;
-    border-bottom: none;
-    background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0));
-}
-
-
-/*
-	BROWSER
-*/
-window:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"]:not([aios_appVersion^="4"]) #browser {
-    border-top: 1px solid ActiveBorder;
-}
-
-
-/**
-	SIDEBAR SWITCH
-*/
-window:-moz-system-metric(windows-default-theme)[aiosOrient="left"]:not([aios_appVersion^="4"]) #aios-toggle-toolbar {
-    border-right: 1px solid ActiveBorder;
-}
-
-window:-moz-system-metric(windows-default-theme)[aiosOrient="right"]:not([aios_appVersion^="4"]) #aios-toggle-toolbar {
-    border-left: 1px solid ActiveBorder;
-}
-
-window:-moz-system-metric(windows-default-theme):not([aios_appOSVersion="Windows NT 5.1"])[aiosOpen="false"][aiosOrient="right"] #aios-toggle-toolbar {
-    border-left: 1px solid ActiveBorder;
-}
-
-
-/**
-	AiOS-TOOLBAR
-*/
-/* Toolbar links neben der Sidebar */
-window:-moz-system-metric(windows-default-theme):not([aios_appVersion^="4"]) #aios-toolbar[posMode="1"] {
-    border-right: 1px solid ActiveBorder;
-}
-
-window:-moz-system-metric(windows-default-theme):not([aios_appVersion^="4"])[aiosOpen="false"][aiosOrient="right"] #aios-toolbar[posMode="1"] {
-    border-left: 1px solid ActiveBorder;
-    border-right: none;
-}
-
-/* Toolbar rechts neben der Sidebar */
-window:-moz-system-metric(windows-default-theme):not([aios_appOSVersion="Windows NT 5.1"])[aiosOrient="left"] #aios-toolbar[posMode="2"] {
-    padding-right: 4px;
-}
-
-window:-moz-system-metric(windows-default-theme):not([aios_appVersion^="4"])[aiosOpen="false"] #aios-toolbar[posMode="2"] {
-    border-left: none;
-    border-right: 1px solid ActiveBorder;
-}
-
-window:-moz-system-metric(windows-default-theme):not([aios_appVersion^="4"])[aiosOrient="right"] #aios-toolbar[posMode="2"] {
-    border-left: 1px solid ActiveBorder;
-    border-right: none;
-}
-
-window:-moz-system-metric(windows-default-theme):not([aios_appVersion^="4"])[aiosOpen="false"][aiosOrient="right"] #aios-toolbar[posMode="2"] {
-    border-left: 1px solid ActiveBorder;
-    border-right: none;
-}
-
-/* Toolbar über der Sidebar */
-window:-moz-system-metric(windows-default-theme):not([aios_appVersion^="4"]) #aios-toolbar[posMode="3"] {
-    border-top: 1px solid ThreedHighlight;
-    border-bottom: 1px solid ActiveBorder;
-}
-
-/* Toolbar unter der Sidebar-Kopfleiste */
-window:-moz-system-metric(windows-default-theme):not([aios_appVersion^="4"]) #aios-toolbar[posMode="4"] {
-    border-top: 1px solid ThreedHighlight !important;
-    border-bottom: 1px solid ActiveBorder;
-}
-
-window:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"]:not([aios_appVersion^="4"]) #aios-toolbar[posMode="4"] {
-    border-top: none !important;
-}
-
-/* Toolbar unter der Sidebar */
-window:-moz-system-metric(windows-default-theme):not([aios_appVersion^="4"]) #aios-toolbar[posMode="5"] {
-    border-top: 1px solid ThreedHighlight;
-}
-
-/* Toolbarseparator auf der Toolbar und im Konfigurationsmodus */
-window:-moz-system-metric(windows-default-theme):not([aios_appVersion^="4"]) #aios-toolbar[orient="vertical"] toolbarseparator,
-window:-moz-system-metric(windows-default-theme):not([aios_appVersion^="4"]) #aios-toolbar[orient="vertical"] toolbarpaletteitem[id^="wrapper-separator"] {
-    border-top: 1px solid ActiveBorder;
-}
-
-
-/**
-	SIDEBAR
-*/
-window:-moz-system-metric(windows-default-theme):not([aios_appVersion^="4"]) #sidebar-box {
-    border-right: 1px solid ActiveBorder;
-}
-
-window:-moz-system-metric(windows-default-theme):not([aios_appVersion^="4"])[aiosOrient="right"] #sidebar-box {
-    border-right: none;
-}
-
-window:-moz-system-metric(windows-default-theme):not([aios_appOSVersion="Windows NT 5.1"])[aios_appVersion^="4"] sidebarheader {
-    border-bottom: none !important;
-}
-
-window:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"][aios_appVersion^="4"] sidebarheader {
-    border-bottom: 1px solid Threedshadow;
-}
-
-window:-moz-system-metric(windows-default-theme) #aios-sidebardivider-1,
-window:-moz-system-metric(windows-default-theme) #aios-sidebardivider-3 {
-    border-top: 1px solid ThreedHighlight;
-}
-
-window:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"]:not([aios_appVersion^="4"]) #aios-sidebardivider-4 {
-    border-top: 1px solid ActiveBorder;
-}
-
-window:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"]:not([aios_appVersion^="4"]) #aios-sidebardivider-2 {
-    border-top: 1px solid ActiveBorder;
-    border-bottom: 1px solid ThreedHighlight;
-}
-
-
-/*
-	SIDEBAR-SPLITTER
-*/
-window:-moz-system-metric(windows-default-theme):not([aios_appVersion^="4"]) #sidebar-splitter[orient="horizontal"] hbox,
-window:-moz-system-metric(windows-default-theme):not([aios_appVersion^="4"])[aiosOpen="false"][aiosOrient="right"] #sidebar-splitter[orient="horizontal"] hbox {
-    border-left: 1px solid ActiveBorder;
-}
-
-window:-moz-system-metric(windows-default-theme):not([aios_appVersion^="4"]) #sidebar-splitter[orient="horizontal"],
-window:-moz-system-metric(windows-default-theme):not([aios_appVersion^="4"]) #sidebar-splitter[orient="horizontal"] hbox {
-    border-left: none;
-}
-
-window:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"]:not([aios_appVersion^="4"]) #sidebar-splitter[orient="horizontal"] hbox {
-    border-left: 1px solid ThreedHighlight;
-}
-
-/* Vista & 7 */
-window:-moz-system-metric(windows-default-theme):not([aios_appOSVersion="Windows NT 5.1"]) #sidebar-splitter[orient="horizontal"] {
-    border-left: 1px solid ActiveBorder;
-    border-right: 1px solid ActiveBorder;
-}
-
-window:-moz-system-metric(windows-default-theme):not([aios_appOSVersion="Windows NT 5.1"]) #sidebar-splitter[orient="horizontal"] hbox {
-    -moz-appearance: toolbox;
-}
-
-window:-moz-system-metric(windows-default-theme):not([aios_appOSVersion="Windows NT 5.1"])[aiosOpen="true"][aiosOrient="right"] #appcontent {
-    margin-right: 3px;
-}
\ No newline at end of file
diff --git a/skin/bmhi_layout.css b/skin/bmhi_layout.css
deleted file mode 100644
index e6fce54..0000000
--- a/skin/bmhi_layout.css
+++ /dev/null
@@ -1,144 +0,0 @@
-
-/* tree#bookmarks-view f. einige themes, z.B. NASA Night Launch */
-#bookmarksPanel, #bookmarks-view, tree#bookmarks-view,
-#history-panel, #historyTree {
-    margin: 0px;
-    padding: 0px;
-    border: none;
-}
-
-tree {
-    -moz-appearance: none;
-}
-
-label[control="search-box"] {
-    display: none;
-}
-
-
-/**
-        ICONS
-*/
-#closeFolder,
-#viewButton {
-    list-style-image: url(icons/panels_menus.png);
-}
-
-#closeFolder {
-    -moz-image-region: rect(64px, 32px, 80px, 16px);
-}
-
-#viewButton {
-    -moz-image-region: rect(64px, 16px, 80px, 0px);
-}
-
-page[aios_appVersion^="4"][aios_appOS="WINNT"] #closeFolder {
-    -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-page[aios_appVersion^="4"][aios_appOS="WINNT"] #viewButton {
-    -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-page[aios_appOS="Darwin"] #closeFolder {
-    -moz-image-region: rect(32px, 32px, 48px, 16px);
-}
-
-page[aios_appOS="Darwin"] #viewButton {
-    -moz-image-region: rect(32px, 16px, 48px, 0px);
-}
-
-#closeFolder image {
-    margin-right: 2px;
-}
-
-#closeFolder label {
-    display: none;
-}
-
-
-/**
-	Firefox-Standard-Theme
-*/
-page[aios_appDefTheme="true"] {
-    -moz-appearance: toolbox;
-}
-
-page[aios_appDefTheme="true"][aios_appOS="WINNT"] #places-toolbar {
-    padding: 0px 1px 1px 1px;
-    border-bottom: 1px solid ThreedShadow;
-}
-
-page[aios_appDefTheme="true"]:not([aios_appOS="Darwin"]) #places-toolbar > * {
-    margin: 1px;
-}
-
-page[aios_appDefTheme="true"] #search-box.blur {
-    color: #ACA899;
-}
-
-page[aios_appDefTheme="true"] #viewButton dropmarker image {
-    margin: 0px 1px 0px 2px;
-}
-
-
-/**
-	Firefox- und Windows-Standard-Theme
-*/
-page[aios_appDefTheme="true"]:-moz-system-metric(windows-default-theme) #places-toolbar {
-    border-bottom: 1px solid ActiveBorder;
-}
-
-page[aios_appDefTheme="true"]:-moz-system-metric(windows-default-theme)[aios_appVersion^="4"] #places-toolbar {
-    border-bottom: 1px solid Threedshadow;
-}
-
-page#history-panel[aios_appDefTheme="true"]:-moz-system-metric(windows-default-theme) #places-toolbar {
-    padding: 0px 1px 1px 1px;
-}
-
-page[aios_appDefTheme="true"]:-moz-system-metric(windows-default-theme):not([aios_appOSVersion="Windows NT 5.1"]) #places-toolbar {
-    padding-right: 3px !important;
-}
-
-page[aios_appDefTheme="true"]:-moz-system-metric(windows-default-theme) #bookmarks-view,
-page[aios_appDefTheme="true"]:-moz-system-metric(windows-default-theme) #historyTree {
-   background-color: #FFFFFF;
-}
-
-
-/**
-        Firefox 4: Firefox- und Windows-Standard-Theme auf XP
-*/
-page[aios_appDefTheme="true"][aios_appOSVersion="Windows NT 5.1"][aios_appVersion^="4"]:-moz-system-metric(windows-default-theme) {
-    -moz-appearance: none !important;
-}
-
-page[aios_appDefTheme="true"][aios_appOSVersion="Windows NT 5.1"][aios_appVersion^="4"]:-moz-system-metric(windows-default-theme) #places-toolbar {
-    -moz-appearance: none;
-    background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0));
-}
-
-
-/**
-	Firefox-Standard-Theme und Darwin
-*/
-page[aios_appDefTheme="true"][aios_appOS="Darwin"] #places-toolbar {
-    padding-bottom: 10px;
-}
-
-page[aios_appDefTheme="true"][aios_appOS="Darwin"] #closeFolder {
-    margin-left: 4px;
-}
-
-page[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewButton {
-    margin-left: 3px;
-}
-
-page[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewButton label {
-    margin-right: 1px;
-}
-
-page[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewButton dropmarker image {
-    margin: 3px 5px 0px 0px;
-}
\ No newline at end of file
diff --git a/skin/console_layout.css b/skin/console_layout.css
deleted file mode 100644
index acdbefd..0000000
--- a/skin/console_layout.css
+++ /dev/null
@@ -1,309 +0,0 @@
-
-window#JSConsoleWindow,
-#ConsoleBox {
-    margin: 0px;
-    padding: 0px;
-    border: none;
-}
-
-toolbox {
-    border: none;	/* Windows-Classic-Theme-Fix */
-}
-
-#ToolbarMode {
-    padding: 0px 1px 1px 1px;
-}
-
-toolbar#ToolbarMode toolbarbutton {
-    min-width: 0px;
-    padding: 1px 4px !important;
-}
-
-#ToolbarMode[hideLabel=true] toolbarbutton[id="Console:modeAll"] label,
-#ToolbarMode[hideLabel=true] toolbarbutton[id="Console:modeErrors"] label,
-#ToolbarMode[hideLabel=true] toolbarbutton[id="Console:modeWarnings"] label,
-#ToolbarMode[hideLabel=true] toolbarbutton[id="Console:modeMessages"] label {
-    display: none;
-}
-
-#ToolbarMode[hideLabel=true] toolbarbutton[id="Console:modeAll"] image,
-#ToolbarMode[hideLabel=true] toolbarbutton[id="Console:modeErrors"] image,
-#ToolbarMode[hideLabel=true] toolbarbutton[id="Console:modeWarnings"] image,
-#ToolbarMode[hideLabel=true] toolbarbutton[id="Console:modeMessages"] image {
-    margin: 0px;
-}
-
-toolbarbutton[id="Console:clear"] label {
-    padding-right: 0px !important;
-}
-
-.console-row-msg {
-    padding-left: 2px;
-}
-
-.console-error-source,
-.console-error-source label,
-.console-row-code label {
-    -moz-box-flex: 1;
-}
-
-/* Zeilenangabe des Fehlers in extra Zeile */
-.console-row[selected=true] .console-row-file {
-    -moz-box-orient: vertical !important;
-}
-
-.lineNumberRow {
-    margin-top: 1px;
-    padding-left: 1px;
-}
-
-
-/*
-	Firefox-Standard-Theme
-*/
-*[aios_appDefTheme="true"][aios_appOS="WINNT"] #ToolbarMode,
-*[aios_appDefTheme="true"][aios_appOS="WINNT"] #ToolbarExt,
-*[aios_appDefTheme="true"][aios_appOS="WINNT"] #ToolbarEval {
-    -moz-appearance: none;
-    border-bottom: 1px solid ThreedShadow;
-}
-
-*[aios_appDefTheme="true"] .console-row {
-    border-bottom: 1px dotted #C0C0C0 !important;
-}
-
-
-/*
-	Firefox- und Windows-Standard-Theme
-*/
-*:-moz-system-metric(windows-default-theme)[aios_appDefTheme="true"] #ToolbarMode, 
-*:-moz-system-metric(windows-default-theme)[aios_appDefTheme="true"] #ToolbarExt, 
-*:-moz-system-metric(windows-default-theme)[aios_appDefTheme="true"] #ToolbarEval {
-    border-bottom: 1px solid ActiveBorder;
-}
-
-*:-moz-system-metric(windows-default-theme)[aios_appVersion^="4"][aios_appDefTheme="true"] #ToolbarMode, 
-*:-moz-system-metric(windows-default-theme)[aios_appVersion^="4"][aios_appDefTheme="true"] #ToolbarExt, 
-*:-moz-system-metric(windows-default-theme)[aios_appVersion^="4"][aios_appDefTheme="true"] #ToolbarEval {
-    border-bottom: 1px solid Threedshadow;
-}
-
-*:-moz-system-metric(windows-default-theme)[aios_appDefTheme="true"] .console-row {
-    border-bottom: 1px solid ActiveBorder;
-}
-
-*:-moz-system-metric(windows-default-theme)[aios_appVersion^="4"][aios_appDefTheme="true"] .console-row {
-    border-bottom: 1px solid Threedshadow;
-}
-
-*:-moz-system-metric(windows-default-theme)[aios_appDefTheme="true"]:not([aios_appOSVersion="Windows NT 5.1"]) #ToolbarMode {
-    padding-right: 4px;
-}
-
-
-/*
-        Firefox 4: Firefox- und Windows-Standard-Theme auf XP
-*/
-*:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"][aios_appDefTheme="true"][aios_appVersion^="4"] #console-toolbox {
-    -moz-appearance: none;
-    background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0));
-}
-
-
-/*
-	Firefox-Standard-Theme und Darwin
-*/
-*[aios_appDefTheme="true"][aios_appOS="Darwin"] window#JSConsoleWindow:-moz-window-inactive,
-*[aios_appDefTheme="true"][aios_appOS="Darwin"] #ConsoleBox:-moz-window-inactive,
-*[aios_appDefTheme="true"][aios_appOS="Darwin"] #ToolbarExt:-moz-window-inactive,
-*[aios_appDefTheme="true"][aios_appOS="Darwin"] #ToolbarEval:-moz-window-inactive {
-    background-color: #E8E8E8;
-}
-
-*[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) window#JSConsoleWindow,
-*[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) #ConsoleBox, 
-*[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) #ToolbarExt, 
-*[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) #ToolbarEval {
-    background-color: #E8E8E8;
-}
-
-*[aios_appDefTheme="true"][aios_appOS="Darwin"] window#JSConsoleWindow:not(:-moz-window-inactive),
-*[aios_appDefTheme="true"][aios_appOS="Darwin"] #ConsoleBox:not(:-moz-window-inactive),
-*[aios_appDefTheme="true"][aios_appOS="Darwin"] #ToolbarExt:not(:-moz-window-inactive),
-*[aios_appDefTheme="true"][aios_appOS="Darwin"] #ToolbarEval:not(:-moz-window-inactive) {
-    background-color: #D4DDE5;
-}
-
-*[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"] window#JSConsoleWindow,
-*[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"] #ConsoleBox,
-*[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"] #ToolbarExt, 
-*[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"] #ToolbarEval {
-    background-color: #D4DDE5;
-}
-
-*[aios_appDefTheme="true"][aios_appOS="Darwin"] #ToolbarMode, 
-*[aios_appDefTheme="true"][aios_appOS="Darwin"] #ToolbarExt, 
-*[aios_appDefTheme="true"][aios_appOS="Darwin"] #ToolbarEval {
-    border-top: none;
-    border-bottom: none;
-    background-image: none;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][aios_appVersion^="4"] #console-toolbox {
-    border-top: 1px solid #484848;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][aios_appVersion^="4"] #console-toolbox:-moz-window-inactive {
-    border-top: 1px solid #929292;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([aios_appVersion^="4"])[active="true"] #console-toolbox {
-    -moz-appearance: none;
-    border-top: 1px solid #484848;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([aios_appVersion^="4"]):not([active="true"]) #console-toolbox {
-    -moz-appearance: none;
-    border-top: 1px solid #929292;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][aios_appVersion^="4"] #ToolbarMode {
-    -moz-appearance: none;
-    padding: 0px 2px 1px 2px;
-    border-left: 1px solid #c0c0c0;
-    border-top: 1px solid #c0c0c0;
-    border-bottom: 1px solid #484848;
-    border-right: 1px solid #484848;
-    background-color: -moz-mac-chrome-active;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][aios_appVersion^="4"] #ToolbarMode:-moz-window-inactive {
-    border-left: 1px solid #e1e1e1;
-    border-top: 1px solid #e1e1e1;
-    border-bottom: 1px solid #929292;
-    border-right: 1px solid #929292;
-    background-color: -moz-mac-chrome-inactive;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([aios_appVersion^="4"])[active="true"] #ToolbarMode {
-    -moz-appearance: none;
-    padding: 0px 2px 1px 2px;
-    border-left: 1px solid #c0c0c0;
-    border-top: 1px solid #c0c0c0;
-    border-bottom: 1px solid #484848;
-    border-right: 1px solid #484848;
-    background-color: -moz-mac-chrome-active;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([aios_appVersion^="4"]):not([active="true"]) #ToolbarMode {
-    -moz-appearance: none;
-    border-left: 1px solid #e1e1e1;
-    border-top: 1px solid #e1e1e1;
-    border-bottom: 1px solid #929292;
-    border-right: 1px solid #929292;
-    background-color: -moz-mac-chrome-inactive;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #ToolbarMode spacer {
-    display: none;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewGroup {
-    margin: 1px 0px;
-    padding: 0px;
-    border: 1px solid #575757 !important;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewGroup toolbarbutton, /* sonst wird das Label nicht per CSS versteckt */
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewGroup toolbarbutton image,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] toolbarbutton[id="Console:clear"],
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] toolbarbutton[id="Console:clear"] image {
-    margin: 0px;
-    padding: 0px;
-    display: -moz-box !important;
-    list-style-image: url("icons/topbar_darwin.png");
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewGroup toolbarbutton image {
-    margin: 6px 2px;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] toolbarbutton[id="Console:modeAll"] {
-    -moz-image-region: rect(48px, 24px, 72px, 0px);
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] toolbarbutton[id="Console:modeErrors"] {
-    -moz-image-region: rect(48px, 48px, 72px, 24px);
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] toolbarbutton[id="Console:modeWarnings"] {
-    -moz-image-region: rect(48px, 72px, 72px, 48px);
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] toolbarbutton[id="Console:modeMessages"] {
-    -moz-image-region: rect(48px, 96px, 72px, 72px);
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] toolbarbutton[id="Console:clear"] image {
-    -moz-image-region: rect(48px, 120px, 72px, 96px);
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] toolbarbutton[id="Console:clear"] {
-    margin: 0px !important;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] toolbarbutton[id="Console:clear"] image {
-    margin: 0px 4px;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] toolbarbutton[id="Console:clear"] label {
-    display: none;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] toolbarbutton[checked="true"] image,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] toolbarbutton:not([checked="true"]):hover image {
-    opacity: 1;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] toolbarbutton:not([checked="true"]) image {
-    opacity: 0.5;
-}
-
-
-/*
-	Firefox-Standard-Theme und Darwin
-*/
-*[aios_appDefTheme="true"][aios_appOS="Linux"] #ToolbarMode, 
-*[aios_appDefTheme="true"][aios_appOS="Linux"] #ToolbarExt, 
-*[aios_appDefTheme="true"][aios_appOS="Linux"] #ToolbarEval {
-    -moz-appearance: none;
-}
-
-
-
-/*
-	Console2
-*/
-#ConsoleBox, 
-#ConsoleBox scrollbox {
-    -moz-appearance: none;
-    margin: 0px;
-    padding: 0px;
-}
-
-.console-row-number {
-    margin-top: 1px;
-}
-
-/* Zeilenangabe des Fehlers in extra Zeile */
-richlistitem[selected=true] box + box {
-    -moz-box-orient: vertical !important;
-}
-
-#Console2Window[aiosSlim=true] .console-row[category~="CSS"]:not([selected=true]) .console-row-icon box {
-    background: url("images/console_css.png") no-repeat center;
-}
-
-#Console2Window[aiosSlim=true] .console-row[category]:not([category~="javascript"]):not([category~="JavaScript"]):not([category~="CSS"]):not([selected=true]) .console-row-icon box {
-    background: url("images/console_xml.png") no-repeat center;
-}
\ No newline at end of file
diff --git a/skin/css/aboutconfig.css b/skin/css/aboutconfig.css
new file mode 100644
index 0000000..b234a1d
--- /dev/null
+++ b/skin/css/aboutconfig.css
@@ -0,0 +1,5 @@
+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"]:-moz-system-metric(windows-default-theme){}window[aios-appDefTheme="true"]:-moz-system-metric(windows-default-theme)[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));}
+window[aios-appDefTheme="true"][aios-appOS="Darwin"] #filterRow{padding-bottom:5px;background-color:#D4DDE5;background-image:none;}window[aios-appDefTheme="true"][aios-appOS="Darwin"] #filterRow:-moz-window-inactive{background-color:#e8e8e8;}
diff --git a/skin/css/addons.css b/skin/css/addons.css
new file mode 100644
index 0000000..1356d61
--- /dev/null
+++ b/skin/css/addons.css
@@ -0,0 +1,93 @@
+#addons-page{padding:0;}
+#addons-page>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;}
+#header{margin:0;padding:4px;}
+#header-utils-btn{margin:0 5px;min-width:0;}
+#updates-container{padding:5px 0;}#updates-container .button-box{padding-left:0;padding-right:0;}
+#updates-container button.button-link{margin-left:5px;}
+#updates-container #close-btn{display:block !important;}
+.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;}
+button.button-link{margin:0;padding:0;}
+#view-port richlistbox richlistitem{-moz-binding:url("chrome://aios/content/addons.xml#richlistitem");}
+.addon{padding:5px;}.addon *{margin:0;}
+.addon .warning,.addon .error,.addon .pending{margin-bottom:5px;}
+.addon .pending>vbox{margin-left:10px;}
+.addon .pending .button-box{padding-left:0;padding-right:0;}
+.addon .icon-container,.addon .warning-icon,.addon .error-icon,.addon .pending-icon{margin-right:10px !important;}
+.addon .name-container{font-size:11px;font-weight:normal;}.addon .name-container .name{font-weight:bold;}
+.addon .name-container .version{margin-left:10px;}
+.addon .name-container spacer,.addon .creator,.addon .date-updated{display:none;}
+.addon:not([selected="true"]) .icon-container,.addon:not([selected="true"]) .icon{height:16px;width:16px;}
+.addon:not([selected="true"]) .disabled-postfix,.addon:not([selected="true"]) .update-postfix{margin-left:5px;}
+.addon:not([selected="true"]) .control-container,.addon:not([selected="true"]) .addon-control,.addon:not([selected="true"]) .description-container,.addon:not([selected="true"]) .relnotes-container,.addon:not([selected="true"]) .relnotes-toggle{display:none;}
+.addon[selected="true"]{}.addon[selected="true"] .icon-container,.addon[selected="true"] .icon{height:32px;width:32px;}
+.addon[selected="true"] .name-container{font-size:13px;font-weight:bold;}
+.addon[selected="true"] .warning-icon,.addon[selected="true"] .error-icon,.addon[selected="true"] .pending-icon{margin:0 18px 0 8px;}
+.addon[selected="true"] .aios-container>vbox,.addon[selected="true"] .install-status,.addon[selected="true"] .relnotes-toggle{margin-top:5px;}
+.addon[selected="true"] .description-container{-moz-box-orient:vertical;float:left;}.addon[selected="true"] .description-container .description{display:block;}
+.addon[selected="true"] .description-container .details{margin-left:-2px;padding:0;}
+.addon[selected="true"] .control-container>*{margin-left:2px;min-width:0;}.addon[selected="true"] .control-container>*:first-child{margin-left:0;}
+#detail-view .text-link{-moz-binding:url("chrome://aios/content/addons.xml#textlink");}
+#detail-view vbox{font-size:1em;}
+#detail-view .detail-view-container{padding:10px;}
+#detail-view #detail-notifications{margin:0;padding:0;}
+#detail-view #warning-container,#detail-view #error-container,#detail-view #pending-container{margin-bottom:9px;padding-bottom:10px;}
+#detail-view #pending-container .button-box{padding-left:0;padding-right:0;}
+#detail-view #pending-container>vbox{margin-left:10px;}
+#detail-view #detail-header{margin-bottom:15px;padding-bottom:10px;}#detail-view #detail-header>*{margin:0;padding:0;}
+#detail-view #detail-icon{margin:0 10px 0 0;width:64px;height:64px;}
+#detail-view spacer{display:none;}
+#detail-view #detail-name{margin-bottom:0;}
+#detail-view #detail-version{margin-bottom:5px;}
+#detail-view #detail-name,#detail-view #detail-version,#detail-view .disabled-postfix,#detail-view .update-postfix{font-size:14px;}
+#detail-view #detail-restart-btn,#detail-view #detail-undo-btn,#detail-view #detail-name,#detail-view #detail-version,#detail-view #detail-creator,#detail-view #detail-desc,#detail-view #detail-fulldesc,#detail-view #detail-grid *{margin-left:0;margin-right:0;}
+#detail-view #detail-name,#detail-view #detail-desc{font-weight:bold;}
+#detail-view #detail-screenshot{margin-top:5px;max-width:none;}
+#detail-view #detail-contributions>hbox{-moz-box-orient:vertical;-moz-box-align:end;}
+#detail-view #detail-updates-row radio{margin-right:6px;}#detail-view #detail-updates-row radio .radio-icon{margin-right:3px;}
+#detail-view #detail-rating-row>hbox{-moz-box-orient:vertical;}
+#detail-view #detail-controls button{margin-left:0;}
+#addons-page[aios-appDefTheme="true"]{background-image:none;}#addons-page[aios-appDefTheme="true"] .addon:not([selected="true"]){background-color:#FFFFFF;}
+#addons-page[aios-appDefTheme="true"] #categories{border-top:none;border-bottom:1px solid ThreedShadow;background-color:#ffffff;}
+#addons-page[aios-appDefTheme="true"] .category,#addons-page[aios-appDefTheme="true"] .category:not([disabled]){border:none;border-radius:0;}#addons-page[aios-appDefTheme="true"] .category[selected="true"],#addons-page[aios-appDefTheme="true"] .category:not([disabled])[selected="true"]{background-color:#C1D2EE;}
+#addons-page[aios-appDefTheme="true"] .category:hover,#addons-page[aios-appDefTheme="true"] .category:not([disabled]):hover{background-color:#E0E8F6;}
+#addons-page[aios-appDefTheme="true"] #header{border-top:1px solid ThreedHighlight;border-bottom:1px solid ThreedShadow;}
+#addons-page[aios-appDefTheme="true"] #updates-container{color:infotext;background-color:infobackground;border-bottom:1px solid ThreedShadow;}
+#addons-page[aios-appDefTheme="true"] .view-header,#addons-page[aios-appDefTheme="true"] #search-filter{background-color:-moz-dialog;border-top:1px solid ThreedHighlight;border-bottom:1px solid ThreedShadow;}
+#addons-page[aios-appDefTheme="true"] #view-port-container{border:0;border-radius:0;}
+#addons-page[aios-appDefTheme="true"] .addon:not([selected="true"])[active=false]:not([pending]){opacity:0.6;}#addons-page[aios-appDefTheme="true"] .addon:not([selected="true"])[active=false]:not([pending]):not([notification]){background-image:none;}
+#addons-page[aios-appDefTheme="true"] #detail-view #warning-container,#addons-page[aios-appDefTheme="true"] #detail-view #error-container,#addons-page[aios-appDefTheme="true"] #detail-view #pending-container,#addons-page[aios-appDefTheme="true"] #detail-view #detail-header{border-bottom:2px solid;-moz-border-bottom-colors:rgba(255, 255, 255, 0.2) rgba(28, 31, 37, 0.2);}
+#addons-page[aios-appDefTheme="true"] #detail-view #detail-screenshot{border:5px solid #ffffff;border-radius:5px;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"]{}#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"] .sorter{color:black;}#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"] .sorter[checkState="1"],#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"] .sorter[checkState="2"]{background-color:grey;color:white;box-shadow:none;text-shadow:none;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"] .sorter[checkState="1"]{list-style-image:url("../img/arrow-dn.png");}
+#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"] .sorter[checkState="2"]{list-style-image:url("../img/arrow-up.png");}
+#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"] .addon{border-top:none;border-bottom-width:1px;border-bottom-style:dotted;border-bottom-color:rgba(0, 0, 0, 0.3);}#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"] .addon:not([selected="true"])[active=true]:nth-child(odd){background-color:rgba(255, 255, 255, 0.6);}
+#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"] #view-port-container{background-color:transparent;background-image:none;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"]{background-color:#efedea;}#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] #header{background-color:-moz-dialog;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme){}#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"]{background-color:#EDECEF;}#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #header{background-image:-moz-linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0));}
+#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]){background-color:#EEF3FA;}#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) .view-header,#addons-page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) #search-filter{background-color:#ccd9ea;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"]{background-color:#D4DDE5;}#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"]:-moz-window-inactive{background-color:#e8e8e8;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"]>hbox{border-top:1px solid #484848;}#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"]>hbox:-moz-window-inactive{border-top:1px solid #929292;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #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;}#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories:-moz-window-inactive{background-color:-moz-mac-chrome-inactive;border-top:1px solid #e1e1e1;border-left:1px solid #e1e1e1;border-bottom:1px solid #929292;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .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;}#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .scrollbox-innerbox:-moz-window-inactive{background-color:-moz-mac-chrome-inactive;border-top:1px solid #929292;border-right:1px solid #929292;border-bottom:1px solid #929292;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category,#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category:not([disabled]){margin:0;padding:5px;border-left:1px solid #484848;background:-moz-linear-gradient(top, #ffffff, #adadad) repeat-x;}#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category:-moz-window-inactive,#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category:not([disabled]):-moz-window-inactive{border-left:1px solid #929292;background:-moz-linear-gradient(top, #ffffff, #adadad) repeat-x;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category[selected="true"],#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category:not([disabled])[selected="true"]{background:#606060;box-shadow:inset #2a2a2a 0 3px 3px;}#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category[selected="true"]:-moz-window-inactive,#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category:not([disabled])[selected="true"]:-moz-window-inactive{background:#bababa;box-shadow:inset rgba(42, 42, 42, 0.6) 0 2px 2px;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category .category-icon,#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category:not([disabled]) .category-icon{max-width:24px;max-height:24px;opacity:0.5;}#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category .category-icon:-moz-window-inactive,#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category:not([disabled]) .category-icon:-moz-window-inactive{opacity:0.3;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category:hover .category-icon,#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category:not([disabled]):hover .category-icon,#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category[selected="true"] .category-icon,#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category:not([disabled])[selected="true"] .category-icon{opacity:1;}#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category:hover .category-icon:-moz-window-inactive,#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category:not([disabled]):hover .category-icon:-moz-window-inactive,#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category[selected="true"] .category-icon:-moz-window-inactive,#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #categories .category:not([disabled])[selected="true"] .category-icon:-moz-window-inactive{opacity:0.8;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #header{padding:11px 3px 6px 5px;border-top:none;border-bottom:none;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #updates-container{margin:5px 0 0 0;}#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #updates-container #close-btn{margin:0;padding:0;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] .view-header,#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #search-filter{background-color:#D4DDE5;background-image:none;border:none;}#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] .view-header:-moz-window-inactive,#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #search-filter:-moz-window-inactive{background-color:#e8e8e8;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #view-port-container{background-color:#D4DDE5;background-image:none;}#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #view-port-container:-moz-window-inactive{background-color:#e8e8e8;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] #view-port richlistbox{margin-top:5px;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] .addon{padding:7px 5px;border:none;}#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] .addon:not([selected="true"])[active=true]:nth-child(odd){background-color:-moz-oddtreerow;}
+#addons-page[aios-appDefTheme="true"][aios-appOS="Darwin"] .addon .details{margin-left:-3px;}
+#addons-page[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) #categories{padding:1px;border:1px solid ThreedShadow;}
+#addons-page[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) #header{border:none;}
+#addons-page[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) category,#addons-page[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) .category:not([disabled]){margin:0 0 1px 0;}#addons-page[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) category[selected="true"],#addons-page[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) .category:not([disabled])[selected="true"]{background-color:highlight;}
+#addons-page[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) category:hover,#addons-page[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) .category:not([disabled]):hover{background-color:transparent;}
+richlistitem[type="user-script"] hbox.pending>vbox button:first-child{display:none !important;}
diff --git a/skin/css/aios.css b/skin/css/aios.css
new file mode 100644
index 0000000..5d9dfd1
--- /dev/null
+++ b/skin/css/aios.css
@@ -0,0 +1,53 @@
+ 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{padding:0;border:none;}
+#aios-toggle-toolbar{-moz-appearance:none;}
+#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;}#aios-toolbar[orient="vertical"]{-moz-box-orient:vertical;}
+#aios-toolbar[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;}
+#aios-toolbar[flexbuttons="true"] toolbarbutton{-moz-box-flex:1;}
+window[aiosVButtons="false"] #aios-toolbar[orient="vertical"] toolbarbutton{-moz-box-orient:horizontal !important;}
+window[aiosVButtons="true"] #aios-toolbar[orient="vertical"] toolbarbutton{-moz-box-orient:vertical !important;}
+#aios-toolbar[orient="vertical"][mode="text"] toolbarbutton{-moz-box-orient:horizontal;}#aios-toolbar[orient="vertical"][mode="text"] toolbarbutton .toolbarbutton-text{text-align:left;}
+#aios-toolbar[orient="vertical"] toolbarspacer,#aios-toolbar[orient="vertical"] toolbarpaletteitem[id^="wrapper-spacer"]{height:21px;}
+#aios-toolbar toolbarspring,#aios-toolbar toolbarpaletteitem[id^="wrapper-spring"]{-moz-box-flex:1000;}
+#aios-toolbar toolbarseparator,#aios-toolbar toolbarpaletteitem[id^="wrapper-separator"]{margin:0 0 1px 1px;}
+#aios-toolbar[orient="vertical"] toolbarseparator,#aios-toolbar[orient="vertical"] 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;}
+#aios-toolbar[orient="vertical"] toolbarpaletteitem{margin:-2px 0;border:none;border-top:2px solid transparent;border-bottom:2px solid transparent;}#aios-toolbar[orient="vertical"] toolbarpaletteitem[dragover="left"]{border-color:transparent;border-top-color:#000000;}
+#aios-toolbar[orient="vertical"] toolbarpaletteitem[dragover="right"]{border-color:transparent;border-bottom-color:#000000;}
+#aios-toggle-toolbox grippy,#sidebar-splitter grippy{-moz-binding:url("chrome://aios/content/aios.xml#aiosGrippy");cursor:pointer;background:transparent none no-repeat center;}#aios-toggle-toolbox grippy:hover,#sidebar-splitter grippy: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);}
+.aios-noIcons>.menu-iconic-left image{display:none;}
+#personal-bookmarks,#PlacesToolbarItems{-moz-box-orient:horizontal;}
+#aios-toolbar[orient="vertical"] #personal-bookmarks,#aios-toolbar[orient="vertical"] #PlacesToolbarItems{-moz-box-orient:vertical;}
+#aios-toolbar[orient="vertical"][mode="icons"] label,#aios-toolbar[orient="vertical"][mode="icons"] .chevron>label{display:none !important;}
+#aios-toolbar[orient="vertical"][mode="icons"] menupopup label{display:block !important;}
+#aios-toolbar[mode="icons"]:not([iconsize="small"]) .bookmark-item>image{width:22px;height:22px;margin:1px;}
+#sidebar,#sidebar-box{margin:0;padding:0;max-width:none !important;}
+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;}
+#aios-sbhtoolbox,#aios-sbhtoolbar{-moz-appearance:none;min-width:30px;background-color:transparent;background-image:none !important;border:none;}
+window[aiosOrient="left"][aiosMode="rtl"] #browser{direction:ltr;}window[aiosOrient="left"][aiosMode="rtl"] #browser *{direction:rtl;}
+window[aiosOrient="right"][aiosMode="ltr"] #browser{direction:rtl;}window[aiosOrient="right"][aiosMode="ltr"] #browser *{direction:ltr;}
+#aiosPopupset tooltip{padding:1px;}#aiosPopupset tooltip box{-moz-binding:url(chrome://aios/content/aios.xml#aiosTooltips);}
+#aiosPopupset tooltip label{margin:0;padding:1px 3px;}#aiosPopupset tooltip label[value=""],#aiosPopupset tooltip labellabel:not([value]){display:none;}
+#aiosPopupset tooltip label:not([class="odd"]){border-top:1px dotted ThreedDarkShadow;border-bottom:1px dotted ThreedDarkShadow;}
+#aiosPopupset tooltip>label:not([class="odd"]){margin-bottom:5px;padding:2px 3px 4px 3px;border-top:none;border-bottom:1px solid ThreedDarkShadow;}
+window[onclose="PrintUtils.exitPrintPreview(); return false;"] #aios-toggle-toolbox,window[onclose="PrintUtils.exitPrintPreview(); return false;"] #sidebar-box,window[onclose="PrintUtils.exitPrintPreview(); return false;"] #aios-toolbox-left,window[onclose="PrintUtils.exitPrintPreview(); return false;"] #aios-toolbox-right,window[onclose="PrintUtils.exitPrintPreview(); return false;"] #sidebar-splitter{display:none;}
+sidebarheader #tt-toolbox-sidebarheader{display:none;}
+#console2-button,menuitem[observes="viewConsole2Sidebar"]:not([id="console-mitem"]){display:none !important;}
+#emSidebar,#tmSidebar{display:none !important;}
+menuitem[id="menu_dmtSidebar"]{display:none !important;}
+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;}
+window[persona] #browser,window[lwtheme="true"] #browser{border-top:none !important;}
+window[persona] #aios-toggle-toolbar,window[lwtheme="true"] #aios-toggle-toolbar,window[persona] #aios-toolbar,window[lwtheme="true"] #aios-toolbar,window[persona] sidebarheader,window[lwtheme="true"] sidebarheader,window[persona]:-moz-system-metric(windows-default-theme) #aios-toolbar[posMode="4"],window[lwtheme="true"]:-moz-system-metric(windows-default-theme) #aios-toolbar[posMode="4"],window[persona] #sidebar-splitter[orient="horizontal"] hbox,window[lwtheme="true"] #sidebar-splitter[orient="horizontal"] hbox{border:none !important;background-color:transparent !important;}
+window[persona] #sidebar-splitter[orient="horizontal"],window[lwtheme="true"] #sidebar-splitter[orient="horizontal"]{-moz-appearance:none !important;}
diff --git a/skin/css/aios_buttons_darwin.css b/skin/css/aios_buttons_darwin.css
new file mode 100644
index 0000000..9b6c365
--- /dev/null
+++ b/skin/css/aios_buttons_darwin.css
@@ -0,0 +1,26 @@
+#aios-toolbar[orient="vertical"] toolbarbutton{margin:2px 1px;}
+#aios-sbhtoolbar[iconsize="small"] toolbarbutton{margin:0 2px;padding:0;min-width:0;max-height:none;}#aios-sbhtoolbar[iconsize="small"] toolbarbutton image{margin:0;}
+#downloads-button,toolbarbutton.aios-tbutton[type="menu-button"],toolbarbutton.aios-tbutton:not([type="menu-button"]){list-style-image:url(../icons/toolbar_darwin.png);}#downloads-button image.toolbarbutton-icon,toolbarbutton.aios-tbutton[type="menu-button"] image.toolbarbutton-icon,toolbarbutton.aios-tbutton:not([type="menu-button"]) image.toolbarbutton-icon,#downloads-button:hover image.toolbarbutton-icon:-moz-window-inactive,toolbarbutton.aios-tbutton[type="menu-button"]:hover image.toolbarbutton-icon:-moz-window-inactive,toolbarbutton.aios-tbutton:not([type="menu-button"]):hover image.toolbarbutton-icon:-moz-window-inactive{opacity:0.75;}
+#downloads-button image.toolbarbutton-icon:-moz-window-inactive,toolbarbutton.aios-tbutton[type="menu-button"] image.toolbarbutton-icon:-moz-window-inactive,toolbarbutton.aios-tbutton:not([type="menu-button"]) image.toolbarbutton-icon:-moz-window-inactive{opacity:0.3;}
+#downloads-button[checked="true"] image.toolbarbutton-icon,toolbarbutton.aios-tbutton[type="menu-button"][checked="true"] image.toolbarbutton-icon,toolbarbutton.aios-tbutton:not([type="menu-button"])[checked="true"] image.toolbarbutton-icon,#downloads-button[checked="true"]:hover image.toolbarbutton-icon:-moz-window-inactive,toolbarbutton.aios-tbutton[type="menu-button"][checked="true"]:hover image.toolbarbutton-icon:-moz-window-inactive,toolbarbutton.aios-tbutton:not([type="menu-button"])[checked="true"]:hover image.toolbarbutton-icon:-moz-window-inactive{opacity:1;}
+#downloads-button[checked="true"] image.toolbarbutton-icon:-moz-window-inactive,toolbarbutton.aios-tbutton[type="menu-button"][checked="true"] image.toolbarbutton-icon:-moz-window-inactive,toolbarbutton.aios-tbutton:not([type="menu-button"])[checked="true"] image.toolbarbutton-icon:-moz-window-inactive{opacity:0.5;}
+#downloads-button{-moz-image-region:rect(0, 16px, 16px, 0);}#downloads-button[checked="true"]{-moz-image-region:rect(16px, 16px, 32px, 0);}
+toolbar[mode="full"] #downloads-button label{margin-top:5px;}
+#addons-button{-moz-image-region:rect(0, 32px, 16px, 16px);}#addons-button[checked="true"]{-moz-image-region:rect(16px, 32px, 32px, 16px);}
+#multipanel-button{-moz-image-region:rect(0, 48px, 16px, 32px);}#multipanel-button[checked="true"]{-moz-image-region:rect(16px, 48px, 32px, 32px);}
+#pageinfo-button{-moz-image-region:rect(0, 64px, 16px, 48px);}#pageinfo-button[checked="true"]{-moz-image-region:rect(16px, 64px, 32px, 48px);}
+#console-button{-moz-image-region:rect(0, 96px, 16px, 80px);}#console-button[checked="true"]{-moz-image-region:rect(16px, 96px, 32px, 80px);}
+#paneltab-button{-moz-image-region:rect(0, 112px, 16px, 96px);}
+#sidebars-button{-moz-image-region:rect(0, 128px, 16px, 112px);}#sidebars-button dropmarker{display:none;}
+#sidebars-togglebutton{-moz-image-region:rect(0, 144px, 16px, 128px);border:none;}#sidebars-togglebutton[checked="true"]{-moz-image-region:rect(16px, 144px, 32px, 128px);}
+#sidebars-togglebutton .toolbarbutton-menubutton-button label{margin-left:2px;margin-right:3px;}
+toolbar[mode="icons"]:not([orient="vertical"]) #sidebars-togglebutton[checked="true"]{-moz-appearance:toolbarbutton;}toolbar[mode="icons"]:not([orient="vertical"]) #sidebars-togglebutton[checked="true"] .toolbarbutton-menubutton-button,toolbar[mode="icons"]:not([orient="vertical"]) #sidebars-togglebutton[checked="true"] .toolbarbutton-menubutton-dropmarker{-moz-appearance:none;min-width:0;}
+toolbar[mode="full"]:not([orient="vertical"]) #sidebars-togglebutton{-moz-box-orient:horizontal;}toolbar[mode="full"]:not([orient="vertical"]) #sidebars-togglebutton .toolbarbutton-menubutton-button{-moz-box-orient:horizontal;}
+#autohide-button{-moz-image-region:rect(0, 160px, 16px, 144px);}#autohide-button[checked="true"]{-moz-image-region:rect(16px, 160px, 32px, 144px);}
+#toolbar-button{-moz-image-region:rect(0, 176px, 16px, 160px);}#toolbar-button[checked="true"]{-moz-image-region:rect(16px, 176px, 32px, 160px);}
+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);}
diff --git a/skin/css/aios_buttons_generic.css b/skin/css/aios_buttons_generic.css
new file mode 100644
index 0000000..39d59f0
--- /dev/null
+++ b/skin/css/aios_buttons_generic.css
@@ -0,0 +1,28 @@
+#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;}
+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);}
+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;}
diff --git a/skin/css/aios_buttons_winnt.css b/skin/css/aios_buttons_winnt.css
new file mode 100644
index 0000000..19ab9f5
--- /dev/null
+++ b/skin/css/aios_buttons_winnt.css
@@ -0,0 +1,34 @@
+#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"]{}window[aios-appDefTheme="true"] toolbar[mode="icons"] toolbarbutton[type="menu-button"][checked="true"] .toolbarbutton-menubutton-button,window[aios-appDefTheme="true"] toolbar[mode="icons"] toolbarbutton[type="menu-button"][checked="true"] .toolbarbutton-menubutton-dropmarker{background-color:transparent !important;border-color:rgba(0, 0, 0, 0.65) rgba(0, 0, 0, 0.55) rgba(0, 0, 0, 0.5) !important;box-shadow:0 0 6.5px rgba(0, 0, 0, 0.4) inset,0 0 2px rgba(0, 0, 0, 0.4) inset,0 1px 0 rgba(255, 255, 255, 0.4) !important;text-shadow:none !important;}
+window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"],window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"]{}window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1,window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1{margin:2px 2px 2px 3px;}window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1,window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1,window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1>.toolbarbutton-menubutton-button,window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1>.toolbarbutton-menubutton-button,window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1>.toolbarbutton-menubutton-dropmarker,window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1>.toolbarbutton-menubutton-dropmarker{-moz-appearance:none;padding:2px 5px;background:rgba(151, 152, 153, 0.05) -moz-linear-gradient(rgba(251, 252, 253, 0.95), rgba(246, 247, 248, 0.47) 49%, rgba(231, 232, 233, 0.45) 51%, rgba(225, 226, 229, 0.3));background-clip:padding-box;border-radius:2.5px;border:1px solid;border-color:rgba(0, 0, 0, 0.12) rgba(0, 0, 0, 0.19) rgba(0, 0, 0, 0.38);box-shadow:0 0 0 1px rgba(255, 255, 255, 0.3) inset,0 0 0 2px rgba(255, 255, 255, 0.1) inset;color:black;text-shadow:0 0 2px white;}
+window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1:hover:not(:active):not([disabled="true"]):not([checked="true"]):not([open="true"]):not([type="menu-button"]),window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1:hover:not(:active):not([disabled="true"]):not([checked="true"]):not([open="true"]):not([type="menu-button"]),window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1:hover:not(:active):not([disabled="true"]):not([checked="true"]):not([open="true"])>.toolbarbutton-menubutton-button,window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1:hover:not(:active):not([disabled="true"]):not([checked="true"]):not([open="true"])>.toolbarbutton-menubutton-button,window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1:hover:not(:active):not([disabled="true"]):not([checked="true"]):not([open="true"])>.toolbarbutton-menubutton-dropmarker,window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1:hover:not(:active):not([disabled="true"]):not([checked="true"]):not([open="true"])>.toolbarbutton-menubutton-dropmarker{background-color:rgba(133, 209, 224, 0.5);border-color:rgba(121, 195, 210, 0.8) rgba(64, 170, 191, 0.8) rgba(51, 136, 153, 0.8);box-shadow:0 0 0 1px rgba(255, 255, 255, 0.3) inset,0 0 0 1.5px rgba(255, 255, 255, 0.1) inset,0 1px 0 rgba(0, 0, 0, 0.1),0 0 3.5px #9eebfa;-moz-transition:background-color 0.4s ease-in,border-color 0.3s ease-in,box-shadow 0.3s ease-in;}
+window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1:active:not([type="menu-button"]),window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1:active:not([type="menu-button"]),window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1[open="true"]:not([type="menu-button"]),window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1[open="true"]:not([type="menu-button"]),window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1[checked="true"]:not([type="menu-button"]),window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1[checked="true"]:not([type="menu-button"]),window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1:active .toolbarbutton-menubutton-button,window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1:active .toolbarbutton-menubutton-button,window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1[open="true"] .toolbarbutton-menubutton-button,window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1[open="true"] .toolbarbutton-menubutton-button,window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1[checked="true"] .toolbarbutton-menubutton-button,window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1[checked="true"] .toolbarbutton-menubutton-button,window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1:active .toolbarbutton-menubutton-dropmarker,window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1:active .toolbarbutton-menubutton-dropmarker,window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1[open="true"] .toolbarbutton-menubutton-dropmarker,window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1[open="true"] .toolbarbutton-menubutton-dropmarker,window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1[checked="true"] .toolbarbutton-menubutton-dropmarker,window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1[checked="true"] .toolbarbutton-menubutton-dropmarker{background-color:transparent;border-color:rgba(0, 0, 0, 0.65) rgba(0, 0, 0, 0.55) rgba(0, 0, 0, 0.5);box-shadow:0 0 6.5px rgba(0, 0, 0, 0.4) inset,0 0 2px rgba(0, 0, 0, 0.4) inset,0 1px 0 rgba(255, 255, 255, 0.4);text-shadow:none;}
+window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1[type="menu-button"],window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1[type="menu-button"]{padding:0;background:none;border:none;box-shadow:none;}
+window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1>.toolbarbutton-icon,window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1>.toolbarbutton-icon,window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1>.toolbarbutton-menubutton-button>.toolbarbutton-icon,window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"] .toolbarbutton-1>.toolbarbutton-menubutton-button>.toolbarbutton-icon{margin:1px;width:16px;height:16px;}
+window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"][orient="vertical"] .toolbarbutton-1[type="menu-button"]>.toolbarbutton-menubutton-button,window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"][orient="vertical"] .toolbarbutton-1[type="menu-button"]>.toolbarbutton-menubutton-button{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;}
+window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"][orient="vertical"] .toolbarbutton-1[type="menu-button"]>.toolbarbutton-menubutton-dropmarker,window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"][orient="vertical"] .toolbarbutton-1[type="menu-button"]>.toolbarbutton-menubutton-dropmarker{border-top-left-radius:0;border-top-right-radius:0;}
+window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"][orient="horizontal"] .toolbarbutton-1[type="menu-button"]>.toolbarbutton-menubutton-button :-moz-locale-dir(ltr),window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"][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;}
+window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"][orient="horizontal"] .toolbarbutton-1[type="menu-button"]>.toolbarbutton-menubutton-button :-moz-locale-dir(rtl),window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"][orient="horizontal"] .toolbarbutton-1[type="menu-button"]>.toolbarbutton-menubutton-button :-moz-locale-dir(rtl){border-left:none;border-top-left-radius:0;border-bottom-left-radius:0;}
+window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"][orient="horizontal"] .toolbarbutton-1[type="menu-button"]>.toolbarbutton-menubutton-dropmarker :-moz-locale-dir(ltr),window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"][orient="horizontal"] .toolbarbutton-1[type="menu-button"]>.toolbarbutton-menubutton-dropmarker :-moz-locale-dir(ltr){border-top-left-radius:0;border-bottom-left-radius:0;}
+window[aios-appDefTheme="true"] #aios-toolbar[iconsize="large"][mode="icons"][orient="horizontal"] .toolbarbutton-1[type="menu-button"]>.toolbarbutton-menubutton-dropmarker :-moz-locale-dir(rtl),window[aios-appDefTheme="true"] #aios-sbhtoolbar[iconsize="large"][mode="icons"][orient="horizontal"] .toolbarbutton-1[type="menu-button"]>.toolbarbutton-menubutton-dropmarker :-moz-locale-dir(rtl){border-top-right-radius:0;border-bottom-right-radius:0;}
+window[aios-appDefTheme="true"] #aios-toolbar[mode="full"] .toolbarbutton-1,window[aios-appDefTheme="true"] #aios-toolbar[mode="full"] .toolbarbutton-menubutton-button{padding:5px;}
+window[aios-appDefTheme="true"] #aios-toolbar[iconsize="small"] .toolbarbutton-1{margin:0 1px;padding:0 2px;}
+window[aios-appDefTheme="true"] #aios-toolbar[iconsize="small"][orient="horizontal"] .toolbarbutton-1{padding:0 3px;}
+toolbarbutton.aios-tbutton:not([type="menu-button"]),toolbarbutton.aios-tbutton[type="menu-button"]{list-style-image:url(../icons/toolbar_windows.png);}
+#addons-button{-moz-image-region:rect(0, 16px, 16px, 0);}
+#multipanel-button{-moz-image-region:rect(0, 32px, 16px, 16px);}
+#pageinfo-button{-moz-image-region:rect(0, 48px, 16px, 32px);}
+#console-button{-moz-image-region:rect(0, 80px, 16px, 64px);}
+#paneltab-button{-moz-image-region:rect(0, 96px, 16px, 80px);}
+#sidebars-button{-moz-image-region:rect(0, 112px, 16px, 96px);}#sidebars-button dropmarker{display:none;}
+#sidebars-togglebutton{-moz-image-region:rect(0, 128px, 16px, 112px);}
+#autohide-button{-moz-image-region:rect(0, 144px, 16px, 128px);}
+#toolbar-button{-moz-image-region:rect(0, 160px, 16px, 144px);}
+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);}
diff --git a/skin/css/aios_theme_darwin.css b/skin/css/aios_theme_darwin.css
new file mode 100644
index 0000000..0ca07da
--- /dev/null
+++ b/skin/css/aios_theme_darwin.css
@@ -0,0 +1,26 @@
+#aios-toggle-toolbar,#aios-toolbar{background-color:-moz-mac-chrome-active;}#aios-toggle-toolbar:-moz-window-inactive,#aios-toolbar:-moz-window-inactive{background-color:-moz-mac-chrome-inactive;}
+#aios-toolbar[orient="horizontal"]{padding:3px 0 4px 0;}
+#aios-toggle-toolbar{border-top:1px solid #c0c0c0;border-right:1px solid #484848;}#aios-toggle-toolbar:-moz-window-inactive{border-top:1px solid #e1e1e1;border-right:1px solid #929292;}
+window[aiosOrient="right"] #aios-toggle-toolbox{border-left:1px solid #484848;}window[aiosOrient="right"] #aios-toggle-toolbox:-moz-window-inactive{border-left:1px solid #929292;}
+window[aiosOrient="right"] #aios-toggle-toolbar{border-left:1px solid #c0c0c0;}window[aiosOrient="right"] #aios-toggle-toolbar:-moz-window-inactive{border-left:1px solid #e1e1e1;}
+#aios-toolbar[posMode="1"]{border-top:1px solid #c0c0c0;border-left:1px solid #c0c0c0;border-right:1px solid #484848;}#aios-toolbar[posMode="1"]:-moz-window-inactive{border-top:1px solid #e1e1e1;border-left:1px solid #e1e1e1;border-right:1px solid #929292;}
+window[aiosOrient="right"] #aios-toolbar[posMode="1"]{border-left:2px groove #484848;}window[aiosOrient="right"] #aios-toolbar[posMode="1"]:-moz-window-inactive{border-left:1px solid #929292;}
+window[aiosOrient="right"][aiosOpen="false"] #aios-toolbar[posMode="1"]{border-right:none;}window[aiosOrient="right"][aiosOpen="false"] #aios-toolbar[posMode="1"]:-moz-window-inactive{border-left:1px solid #929292;}
+#aios-toolbar[posMode="2"]{border-top:1px solid #c0c0c0;border-left:2px groove #484848;border-right:1px solid #484848;}#aios-toolbar[posMode="2"]:-moz-window-inactive{border-top:1px solid #e1e1e1;border-left:1px solid #929292;border-right:1px solid #929292;}
+window[aiosOpen="false"] #aios-toolbar[posMode="2"]{border-left:1px solid #c0c0c0;}window[aiosOpen="false"] #aios-toolbar[posMode="2"]:-moz-window-inactive{border-left:1px solid #e1e1e1;}
+window[aiosOrient="right"] #aios-toolbar[posMode="2"]{border-right:none;}
+window[aiosOrient="right"][aiosOpen="false"] #aios-toolbar[posMode="2"]{border-left:2px groove #484848;}window[aiosOrient="right"][aiosOpen="false"] #aios-toolbar[posMode="2"]:-moz-window-inactive{border-left:1px solid #929292;}
+#aios-toolbar[posMode="3"]{border-right:1px solid #484848;border-top:1px solid #c0c0c0;border-bottom:1px solid #484848;border-left:1px solid #c0c0c0;}#aios-toolbar[posMode="3"]:-moz-window-inactive{border-top:1px solid #e1e1e1;border-right:1px solid #929292;border-bottom:1px solid #929292;border-left:1px solid #e1e1e1;}
+window[aiosOrient="right"] #aios-toolbar[posMode="3"]{border-right:none;border-left:1px solid #484848;}window[aiosOrient="right"] #aios-toolbar[posMode="3"]:-moz-window-inactive{border-left:1px solid #929292;}
+#aios-toolbar[posMode="4"]{border-top:2px groove #c0c0c0;border-right:1px solid #484848;border-bottom:1px solid #484848;border-left:1px solid #c0c0c0;}#aios-toolbar[posMode="4"]:-moz-window-inactive{border-top:2px groove #e1e1e1;border-right:1px solid #929292;border-bottom:1px solid #929292;border-left:1px solid #e1e1e1;}
+window[aiosOrient="right"] #aios-toolbar[posMode="4"]{border-right:none;border-left:1px solid #484848;}window[aiosOrient="right"] #aios-toolbar[posMode="4"]:-moz-window-inactive{border-left:1px solid #929292;}
+#aios-toolbar[posMode="5"]{border-top:2px groove #c0c0c0;border-right:1px solid #484848;border-left:1px solid #c0c0c0;}#aios-toolbar[posMode="5"]:-moz-window-inactive{border-top:2px groove #e1e1e1;border-right:1px solid #929292;border-left:1px solid #e1e1e1;}
+window[aiosOrient="right"] #aios-toolbar[posMode="5"]{border-right:none;border-left:1px solid #484848;}window[aiosOrient="right"] #aios-toolbar[posMode="5"]:-moz-window-inactive{border-left:1px solid #929292;}
+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;}#sidebar-splitter[orient="horizontal"]:-moz-window-inactive{background-color:#e8e8e8;border-right:1px solid #929292;}
+#sidebar-splitter[orient="horizontal"][grippy="false"]{min-width:3px;}
+#sidebar-splitter[orient="horizontal"][grippy="true"]{min-width:6px;}
+window[aiosOrient="right"] #sidebar-splitter[orient="horizontal"]{border-left:1px solid #484848;border-right:none;}window[aiosOrient="right"] #sidebar-splitter[orient="horizontal"]:-moz-window-inactive{border-left:1px solid #929292;}
+#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;}
diff --git a/skin/css/aios_theme_generic.css b/skin/css/aios_theme_generic.css
new file mode 100644
index 0000000..212a850
--- /dev/null
+++ b/skin/css/aios_theme_generic.css
@@ -0,0 +1,7 @@
+#aios-toggle-toolbar{border-top:none;border-right:1px solid ThreedShadow;}
+window[aiosOrient="right"] #aios-toggle-toolbar{border-left:none;border-left:1px solid ThreedShadow;}
+#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;}
+window[aiosOrient="left"] #aios-toolbar[posMode="2"]{border-right:1px solid ThreedShadow;}
+window[aiosOrient="right"] #aios-toolbar[posMode="1"]{border-left:1px solid ThreedShadow;}
+#sidebar-splitter[orient="horizontal"]{border:none !important;}
diff --git a/skin/css/aios_theme_winnt.css b/skin/css/aios_theme_winnt.css
new file mode 100644
index 0000000..e41f7e2
--- /dev/null
+++ b/skin/css/aios_theme_winnt.css
@@ -0,0 +1,18 @@
+#aios-toggle-toolbar{border-top:1px solid ThreedHighlight;border-right:1px solid ThreedShadow;}
+window[aiosOrient="right"] #aios-toggle-toolbar{border-left:1px solid ThreedShadow;border-right:none;}
+#aios-toolbar[posMode="1"]{border-top:1px solid ThreedHighlight;border-left:1px solid ThreedHighlight;border-right:1px solid ThreedShadow;}
+window[aiosOpen="false"][aiosOrient="left"] #browser[posMode="1"] #sidebar-splitter[grippy="true"]{border-left:none;}
+window[aiosOpen="false"][aiosOrient="right"] #aios-toolbar[posMode="1"]{border-right:none;border-left:2px groove ThreedHighlight;}
+window[aiosOpen="false"][aiosOrient="right"] #browser[posMode="1"] #sidebar-splitter[grippy="true"]{border-right:none;}
+#aios-toolbar[posMode="2"]{border-top:1px solid ThreedHighlight;border-left:2px groove ThreedHighlight;}
+window[aiosOrient="right"] #aios-toolbar[posMode="2"]{border-left:2px groove ThreedHighlight;border-right:none;}
+window[aiosOpen="false"][aiosOrient="left"] #aios-toolbar[posMode="2"]{border-left:1px solid ThreedHighlight;border-right:1px solid ThreedShadow;}
+window[aiosOpen="false"][aiosOrient="left"] #browser[posMode="2"] #sidebar-splitter[grippy="true"]{border-left:none;}
+window[aiosOpen="false"][aiosOrient="right"] #browser[posMode="2"] #sidebar-splitter[grippy="true"]{border-right:none;}
+#aios-toolbar[posMode="3"]{border-top:1px solid ThreedHighlight;border-bottom:1px solid ThreedShadow;}
+#aios-toolbar[posMode="4"]{border-top:1px solid ThreedHighlight;border-bottom:1px solid ThreedShadow;}
+#aios-toolbar[posMode="5"]{border-top:1px solid ThreedShadow;}
+window:-moz-system-metric(windows-default-theme){}window:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #aios-toggle-toolbox,window:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #aios-toolbox-left,window:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #aios-toolbox-right{-moz-appearance:none;background-image:-moz-linear-gradient(135deg, rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0));}
+window:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] sidebarheader,window:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #aios-toolbox-sidebartop,window:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #aios-toolbox-sidebartop2,window:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #aios-toolbox-sidebarbottom{-moz-appearance:none;background-image:-moz-linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0));}
+window:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"])[aiosOpen="true"][aiosOrient="left"] #aios-toolbar[posMode="2"]{padding-right:2px;}
+window:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) #sidebar-splitter[grippy="true"]{margin:0;}window:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) #sidebar-splitter[grippy="true"][orient="horizontal"]{background-color:#EEF3FA;border-left:1px solid #A9B7C9;}
diff --git a/skin/css/console.css b/skin/css/console.css
new file mode 100644
index 0000000..e815fe3
--- /dev/null
+++ b/skin/css/console.css
@@ -0,0 +1,61 @@
+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 .console-row-content>*:last-child{margin-bottom:0;}
+.console-row .console-row-icon image{width:16px;height:16px;min-width:16px;min-height:16px;margin-right:10px;}
+.console-row .console-error-source,.console-row .console-error-source label,.console-row .console-row-code label{-moz-box-flex:1;}
+.console-row .lineNumberRow label:first-child{margin-right:5px;}
+.console-row:not([selected=true]) .console-row-code{display:none;}
+.console-row:not([selected=true]) .lineNumberRow label:first-child{margin-left:5px;}
+.console-row[selected=true] .console-row-file{-moz-box-orient:vertical;}
+.console-row[selected=true] .lineNumberRow label{margin-top:3px;}
+*[aios-appDefTheme="true"] .console-row:not([selected=true])[type="error"],*[aios-appDefTheme="true"] .console-row:not([selected=true])[type="exception"]{background-color:#FFECEC;}
+*[aios-appDefTheme="true"] .console-row:not([selected=true])[type="warning"]{background-color:#FFFFEC;}
+*[aios-appDefTheme="true"] .console-row:not([selected=true])[type="message"]{background-color:#e8f0fb;}
+*[aios-appDefTheme="true"]{}*[aios-appDefTheme="true"] .console-row{border-bottom-width:1px;border-bottom-style:dotted !important;border-bottom-color:rgba(0, 0, 0, 0.3);}*[aios-appDefTheme="true"] .console-row[selected=true] *{color:#000;}
+*[aios-appDefTheme="true"] .console-row[selected=true] .console-row-msg,*[aios-appDefTheme="true"] .console-row[selected=true] .console-error-msg,*[aios-appDefTheme="true"] .console-row[selected=true] description{font-weight:bold;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"]{}*[aios-appDefTheme="true"][aios-appOS="WINNT"] #ToolbarMode,*[aios-appDefTheme="true"][aios-appOS="WINNT"] #ToolbarExt,*[aios-appDefTheme="true"][aios-appOS="WINNT"] #ToolbarEval{-moz-appearance:none;border-top:1px solid ThreedHighlight;border-bottom:1px solid ThreedShadow;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"] #ToolbarMode{padding-top:1px;background-color:#fff;}*[aios-appDefTheme="true"][aios-appOS="WINNT"] #ToolbarMode toolbarbutton:not([class="textonly"]){-moz-appearance:none;width:36px;height:36px;margin-right:1px;border:none;}*[aios-appDefTheme="true"][aios-appOS="WINNT"] #ToolbarMode toolbarbutton:not([class="textonly"])[checked="true"]{background-color:#c1d2ee;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"] #ToolbarMode toolbarbutton:not([class="textonly"]):hover{background-color:#e0e8f7;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"] .console-row,*[aios-appDefTheme="true"][aios-appOS="WINNT"] .console-row[selected="true"]{border-bottom:1px solid ThreedShadow;}*[aios-appDefTheme="true"][aios-appOS="WINNT"] .console-row .text-link,*[aios-appDefTheme="true"][aios-appOS="WINNT"] .console-row[selected="true"] .text-link{color:-moz-nativehyperlinktext !important;}*[aios-appDefTheme="true"][aios-appOS="WINNT"] .console-row .text-link:hover,*[aios-appDefTheme="true"][aios-appOS="WINNT"] .console-row[selected="true"] .text-link:hover{color:#3DA1FF !important;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] .console-box{background-color:#efedea;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] #ToolbarEval{padding-top:1px;padding-bottom:2px;}*[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] #ToolbarEval #TextboxEval{height:26px;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme){}*[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #console-toolbox{-moz-appearance:none;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #ToolbarEval{padding-top:1px;padding-bottom:2px;background-image:-moz-linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0));}*[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #ToolbarEval #TextboxEval{height:22px;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] .console-box{background-color:#EDECEF;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] .console-row[selected="true"]{background:#CAD3E1 none;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) #ToolbarEval,*[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) .console-box{background-color:#eef3fa;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) .console-row[selected="true"]{background:#CBD8E8 none;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"]{}*[aios-appDefTheme="true"][aios-appOS="Darwin"] window#JSConsoleWindow,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ConsoleBox,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarExt,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarEval{background-color:#D4DDE5;}*[aios-appDefTheme="true"][aios-appOS="Darwin"] window#JSConsoleWindow:-moz-window-inactive,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ConsoleBox:-moz-window-inactive,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarExt:-moz-window-inactive,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarEval:-moz-window-inactive{background-color:#E8E8E8;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarExt,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarEval{border-top:none;border-bottom:none;background-image:none;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarEval{padding-top:8px;padding-bottom:8px;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #console-toolbox,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ConsoleToolbox{border-top:1px solid #484848;}*[aios-appDefTheme="true"][aios-appOS="Darwin"] #console-toolbox:-moz-window-inactive,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ConsoleToolbox:-moz-window-inactive{border-top:1px solid #929292;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #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;}*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode:-moz-window-inactive{border-left:1px solid #e1e1e1;border-top:1px solid #e1e1e1;border-bottom:1px solid #929292;background-color:-moz-mac-chrome-inactive;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode spacer{display:none;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode #viewGroup{margin:1px 0;padding:0;border:1px solid #484848;border-left:none;}*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode #viewGroup:-moz-window-inactive{border-color:#929292;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"]){-moz-appearance:none;padding:5px;border-left:1px solid #484848;border-right:none;background:-moz-linear-gradient(top, #ffffff, #adadad) repeat-x;list-style-image:url("../icons/topbar_darwin.png");}*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"]):-moz-window-inactive{border-left:1px solid #929292;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[checked="true"]{background:#606060;box-shadow:inset #2a2a2a 0 3px 3px;}*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[checked="true"]:-moz-window-inactive{background:#bababa;box-shadow:inset rgba(42, 42, 42, 0.6) 0 2px 2px;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"]) image{margin:4px 2px;display:-moz-box;opacity:0.5;}*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"]) image:-moz-window-inactive{opacity:0.3;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"]):hover image,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[checked="true"] image{opacity:1;}*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"]):hover image:-moz-window-inactive,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[checked="true"] image:-moz-window-inactive{opacity:0.8;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="Console:modeAll"],*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="item_modeAll"]{-moz-image-region:rect(48px, 24px, 72px, 0);}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="Console:modeErrors"],*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="item_modeErrors"]{-moz-image-region:rect(48px, 96px, 72px, 72px);}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="Console:modeWarnings"],*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="item_modeWarnings"]{-moz-image-region:rect(48px, 72px, 72px, 48px);}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="Console:modeMessages"],*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="item_modeMessages"]{-moz-image-region:rect(48px, 48px, 72px, 24px);}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="Console:clear"]{margin:1px 0;border:1px solid #484848;-moz-image-region:rect(48px, 120px, 72px, 96px);}*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="Console:clear"]:-moz-window-inactive{border-color:#929292;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="item_clearConsole"]{-moz-image-region:rect(48px, 120px, 72px, 96px);}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="item_modeAll"],*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="item_modeErrors"],*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="item_modeWarnings"],*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="item_modeMessages"],*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="item_clearConsole"]{margin:1px;border:1px solid #484848;}*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="item_modeAll"]:-moz-window-inactive,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="item_modeErrors"]:-moz-window-inactive,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="item_modeWarnings"]:-moz-window-inactive,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="item_modeMessages"]:-moz-window-inactive,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #ToolbarMode toolbarbutton:not([class="textonly"])[id="item_clearConsole"]:-moz-window-inactive{border-color:#929292;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] .console-row .console-row-icon,*[aios-appDefTheme="true"][aios-appOS="Darwin"] .console-row .console-row-msg>label,*[aios-appDefTheme="true"][aios-appOS="Darwin"] .console-row .console-row-file>label{display:none;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] .console-row[selected=true]{background-color:#aab8c6 !important;}*[aios-appDefTheme="true"][aios-appOS="Darwin"] .console-row[selected=true] .console-row-msg,*[aios-appDefTheme="true"][aios-appOS="Darwin"] .console-row[selected=true] .console-error-msg,*[aios-appDefTheme="true"][aios-appOS="Darwin"] .console-row[selected=true] description{text-shadow:rgba(255, 255, 255, 0.4) 0 1px 0;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] .console-row[selected=true] .text-link{color:#0066CC !important;}*[aios-appDefTheme="true"][aios-appOS="Darwin"] .console-row[selected=true] .text-link:hover{color:#3DA1FF !important;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"][id="Console2Window"] #ToolbarExt{padding:2px 3px 2px 1px;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"][id="Console2Window"] #ToolbarEval{padding:2px 3px 3px 1px;}
+*[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) #ToolbarMode,*[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) #ToolbarExt,*[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) #ToolbarEval{-moz-appearance:none;}
+#Console2Window{}#Console2Window #ConsoleBox{-moz-appearance:none;}
+#Console2Window .console-row-number label:first-child{margin-right:5px;}
+#Console2Window richlistitem[selected=true] box+box{-moz-box-orient:vertical ;}#Console2Window richlistitem[selected=true] box+box .console-row-number{margin-top:3px;}
+#Console2Window .console-row[category~="CSS"] .console-row-icon box{background:url("../img/console_css.png") no-repeat left center;}
+#Console2Window .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;}
+#Console2Window .console-row-dupes,#Console2Window .console-row-timestamp{margin-left:10px;}
diff --git a/skin/css/downloads.css b/skin/css/downloads.css
new file mode 100644
index 0000000..a00c8e0
--- /dev/null
+++ b/skin/css/downloads.css
@@ -0,0 +1,30 @@
+#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);}
+richlistitem:not([selected=true])[state="1"],richlistitem:not([selected=true])[state="2"],richlistitem:not([selected=true])[state="3"]{min-height:0 !important;padding:5px;}
+richlistitem:not([selected=true])[state="1"] .downloadTypeIcon,richlistitem:not([selected=true])[state="2"] .downloadTypeIcon,richlistitem:not([selected=true])[state="3"] .downloadTypeIcon{width:16px;height:16px;min-width:16px;min-height:16px;}
+richlistitem:not([selected=true])[state="1"]>hbox>vbox>hbox:nth-child(even),richlistitem:not([selected=true])[state="1"] label.status,richlistitem:not([selected=true])[state="2"] label.status,richlistitem:not([selected=true])[state="3"] label.status,richlistitem:not([selected=true])[state="1"] .mini-button,richlistitem:not([selected=true])[state="2"] .mini-button,richlistitem:not([selected=true])[state="3"] .mini-button,richlistitem:not([selected=true])[state="1"] #dmtDoneShowBtn,richlistitem:not([selected=true])[state="2"] #dmtDoneShowBtn,richlistitem:not([selected=true])[state="3"] #dmtDoneShowBtn,richlistitem:not([selected=true])[state="1"] #dmtDoneReloadBtn,richlistitem:not([selected=true])[state="2"] #dmtDoneReloadBtn,richlistitem:not([selected=true])[state="3"] #dmtDoneReloadBtn,richlistitem:not([selected=true])[state="1"] #dmtDoneDeleteBtn,richlistitem:not([selected=true])[state="2"] #dmtDoneDeleteBtn,richlistitem:not([selected=true])[state="3"] #dmtDoneDeleteBtn,richlistitem:not([selected=true])[state="1"] #dmtDoneCleanUpBtn,richlistitem:not([selected=true])[state="2"] #dmtDoneCleanUpBtn,richlistitem:not([selected=true])[state="3"] #dmtDoneCleanUpBtn{display:none;}
+*[aios-appDefTheme="true"]{}*[aios-appDefTheme="true"] richlistitem .name{font-size:11px;font-weight:bold;}
+*[aios-appDefTheme="true"] richlistitem[selected=true] .name,*[aios-appDefTheme="true"] richlistitem[state="-1"] .name,*[aios-appDefTheme="true"] richlistitem[state="0"] .name,*[aios-appDefTheme="true"] richlistitem[state="4"] .name{font-size:13px;}
+*[aios-appDefTheme="true"] richlistitem[selected=true] .status,*[aios-appDefTheme="true"] richlistitem[selected=true] .dateTime{font-size:11px;}
+*[aios-appDefTheme="true"] richlistitem:not([selected=true]){}*[aios-appDefTheme="true"] richlistitem:not([selected=true])[state="-1"],*[aios-appDefTheme="true"] richlistitem:not([selected=true])[state="0"],*[aios-appDefTheme="true"] richlistitem:not([selected=true])[state="4"]{color:#006600;background-color:#ECFFEC;}
+*[aios-appDefTheme="true"] richlistitem:not([selected=true])[state="2"],*[aios-appDefTheme="true"] richlistitem:not([selected=true])[state="3"]{color:#660000;background-color:#FFECEC;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"]{}*[aios-appDefTheme="true"][aios-appOS="WINNT"] #search{padding:0 1px 1px 1px;border-top:1px solid ThreedHighlight;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"] richlistitem{border-bottom:1px dotted rgba(0, 0, 0, 0.3);}*[aios-appDefTheme="true"][aios-appOS="WINNT"] richlistitem[selected="true"]{outline:0;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"] richlistitem:not([selected="true"])[state="1"]{background-color:#FFFFFF;}*[aios-appDefTheme="true"][aios-appOS="WINNT"] richlistitem:not([selected="true"])[state="1"]:nth-child(odd){background-color:rgba(255, 255, 255, 0.6);}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] #downloadView{-moz-appearance:none;border-top:1px solid ThreedShadow;background-color:#efedea;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme){}*[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #search{background-image:-moz-linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0));}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #downloadView{background-color:#EDECEF;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] richlistitem[selected="true"]{background:#CAD3E1 none;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) #search{background-color:#eef3fa;border-bottom:1px solid ThreedShadow;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) #downloadView{background-color:#EEF3FA;}
+*[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) richlistitem[selected="true"]{color:#000000;background:#CBD8E8 none;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #downloadView,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #search{-moz-appearance:none;background-color:#d4dde5;}*[aios-appDefTheme="true"][aios-appOS="Darwin"] #downloadView:-moz-window-inactive,*[aios-appDefTheme="true"][aios-appOS="Darwin"] #search:-moz-window-inactive{background-color:#e8e8e8;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #search{padding:6px 1px 10px 3px;}*[aios-appDefTheme="true"][aios-appOS="Darwin"] #search #searchbox{margin-right:6px;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] #search #clearListButton{-moz-appearance:none;margin-top:2px;padding:1px 0 1px 5px;border:1px solid #7F7F7F;-moz-border-radius:10px;background:-moz-linear-gradient(top, #ffffff, #adadad) repeat-x;}*[aios-appDefTheme="true"][aios-appOS="Darwin"] #search #clearListButton[disabled="true"],*[aios-appDefTheme="true"][aios-appOS="Darwin"] #search #clearListButton:-moz-window-inactive{opacity:0.5;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] richlistitem[state="1"]:not([selected=true]){background-color:#FFFFFF;}*[aios-appDefTheme="true"][aios-appOS="Darwin"] richlistitem[state="1"]:not([selected=true]):nth-child(odd){background-color:#ECF3FE;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] richlistitem[selected=true]{color:#000;background-color:#aab8c6;}*[aios-appDefTheme="true"][aios-appOS="Darwin"] richlistitem[selected=true] .name{text-shadow:rgba(255, 255, 255, 0.4) 0 1px 0;}
+*[aios-appDefTheme="true"][aios-appOS="Darwin"] richlistitem[selected=true] .status,*[aios-appDefTheme="true"][aios-appOS="Darwin"] richlistitem[selected=true] .dateTime{color:#000 !important;}
diff --git a/skin/css/multipanel.css b/skin/css/multipanel.css
new file mode 100644
index 0000000..444c149
--- /dev/null
+++ b/skin/css/multipanel.css
@@ -0,0 +1,26 @@
+#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="WINNT"] #toolsButton{-moz-image-region:rect(0, 16px, 16px, 0);}
+page[aios-appOS="Darwin"] #page-button .toolbarbutton-menubutton-button{-moz-image-region:rect(32px, 80px, 48px, 64px);}
+page[aios-appOS="Darwin"] #about-button .toolbarbutton-menubutton-button{-moz-image-region:rect(32px, 96px, 48px, 80px);}
+page[aios-appOS="Darwin"] #toolsButton{-moz-image-region:rect(32px, 16px, 48px, 0);}
+page:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) #page-button .toolbarbutton-menubutton-button{-moz-image-region:rect(64px, 80px, 80px, 64px);}
+page:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) #about-button .toolbarbutton-menubutton-button{-moz-image-region:rect(64px, 96px, 80px, 80px);}
+page:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) #toolsButton{-moz-image-region:rect(64px, 16px, 80px, 0);}
+page[aios-appDefTheme="true"]{}page[aios-appDefTheme="true"][aios-appOS="WINNT"]{}page[aios-appDefTheme="true"][aios-appOS="WINNT"] #commandBar{border-top:1px solid ThreedHighlight;border-bottom:1px solid ThreedShadow;}
+page[aios-appDefTheme="true"][aios-appOS="WINNT"] #toolsButton dropmarker image{margin:0 2px 0 3px;}
+page[aios-appDefTheme="true"][aios-appOS="WINNT"] .toolbarbutton-1{margin-right:5px;}page[aios-appDefTheme="true"][aios-appOS="WINNT"] .toolbarbutton-1 label{padding-left:4px;padding-right:1px;}
+page[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] #commandBar{padding-top:2px;}
+page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme){}page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[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));}
+page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) #commandBar{background-color:#eef3fa;}
+page[aios-appDefTheme="true"][aios-appOS="Darwin"] #commandBar{padding:8px 0 11px 2px;background-color:#D4DDE5;}page[aios-appDefTheme="true"][aios-appOS="Darwin"] #commandBar:-moz-window-inactive{background-color:#e8e8e8;}
+page[aios-appDefTheme="true"][aios-appOS="Darwin"] toolbarbutton:-moz-window-inactive{opacity:0.5;}
+page[aios-appDefTheme="true"][aios-appOS="Darwin"] toolbarbutton.toolbarbutton-1{-moz-border-radius:5px;background:-moz-linear-gradient(top, #ffffff, #adadad) repeat-x;}page[aios-appDefTheme="true"][aios-appOS="Darwin"] toolbarbutton.toolbarbutton-1:-moz-window-inactive{opacity:0.8;}
+page[aios-appDefTheme="true"][aios-appOS="Darwin"] toolbarbutton.toolbarbutton-1[checked="true"]{padding-left:4px;padding-right:4px;box-shadow:inset #2a2a2a 0 3px 3.5px,0 1px rgba(255, 255, 255, 0.4);}page[aios-appDefTheme="true"][aios-appOS="Darwin"] toolbarbutton.toolbarbutton-1[checked="true"] .toolbarbutton-menubutton-button,page[aios-appDefTheme="true"][aios-appOS="Darwin"] toolbarbutton.toolbarbutton-1[checked="true"] .toolbarbutton-menubutton-dropmarker{-moz-appearance:none;}
+page[aios-appDefTheme="true"][aios-appOS="Darwin"] toolbarbutton.toolbarbutton-1 .toolbarbutton-icon{margin-top:2px;margin-bottom:0;}
+page[aios-appDefTheme="true"][aios-appOS="Darwin"] toolbarbutton#toolsButton{-moz-appearance:none;padding:1px 5px;border:1px solid #7F7F7F;-moz-border-radius:10px;background:-moz-linear-gradient(top, #ffffff, #adadad) repeat-x;}page[aios-appDefTheme="true"][aios-appOS="Darwin"] toolbarbutton#toolsButton image{margin-right:6px;}
+page[aios-appDefTheme="true"][aios-appOS="Darwin"] toolbarbutton#toolsButton label{margin:0;}
+page[aios-appDefTheme="true"][aios-appOS="Darwin"] toolbarbutton#toolsButton .dropmarker-icon{margin:2px 0 0 1px;}
diff --git a/skin/css/multipanel_ssr.css b/skin/css/multipanel_ssr.css
new file mode 100644
index 0000000..1c9adba
--- /dev/null
+++ b/skin/css/multipanel_ssr.css
@@ -0,0 +1,16 @@
+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 !important;top:auto !important;left:auto !important;float:none !important;padding:0 !important;margin:0 !important;white-space:normal !important;overflow:hidden !important;}
+table,tbody,thead,tfoot,tr,td,th,col,colgroup{display:block !important;}
+img[width="1"],img[height="1"],img[width="468"],img[height="600"]{display:none !important;}
+li{list-style-position:inside !important;}
+iframe{display:none !important;}
+embed[type*="shockwave"]{display:none !important;}
+html :-moz-any-link{text-decoration:underline !important;}
+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;}
diff --git a/skin/css/pageinfo.css b/skin/css/pageinfo.css
new file mode 100644
index 0000000..5f1f0aa
--- /dev/null
+++ b/skin/css/pageinfo.css
@@ -0,0 +1,30 @@
+#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;}#security-privacy-groupbox row :first-child{margin-top:0;padding-top:0;}
+window[aios-appDefTheme="true"]{}window[aios-appDefTheme="true"] #permList,window[aios-appDefTheme="true"] #security-privacy-groupbox row{border-top:1px solid ThreedShadow;}
+window[aios-appDefTheme="true"] #security-privacy-groupbox row:first-child{border-top:none;}
+window[aios-appDefTheme="true"][aios-appOS="WINNT"]{}window[aios-appDefTheme="true"][aios-appOS="WINNT"] #topBar{padding-top:1px;}
+window[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] deck,window[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] #feedListbox *,window[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] #permList{background-color:#efedea;}window[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] deck groupbox,window[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] #feedListbox * groupbox,window[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] #permList groupbox,window[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] deck groupbox caption,window[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] #feedListbox * groupbox caption,window[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] #permList groupbox caption{-moz-appearance:none;background-color:#efedea;}
+window[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme){}window[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme) #permList{border-top:1px solid Threedshadow;}
+window[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme) #topBar{border-bottom:1px solid Threedshadow;}
+window[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme) #mainDeck{border-top:1px solid ThreedHighlight;}
+window[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] deck,window[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #feedListbox *,window[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #permList{background-color:#EDECEF;}
+window[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) deck,window[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) #feedListbox *,window[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) #permList{background-color:#EEF3FA;}
+window[aios-appDefTheme="true"][aios-appOS="Darwin"]{-moz-appearance:none;border-top:1px solid #484848;}window[aios-appDefTheme="true"][aios-appOS="Darwin"]:-moz-window-inactive{-moz-appearance:none;border-top:1px solid #929292;}
+window[aios-appDefTheme="true"][aios-appOS="Darwin"] deck,window[aios-appDefTheme="true"][aios-appOS="Darwin"] #feedListbox *,window[aios-appDefTheme="true"][aios-appOS="Darwin"] #permList{background-color:#D4DDE5;}window[aios-appDefTheme="true"][aios-appOS="Darwin"] deck:-moz-window-inactive,window[aios-appDefTheme="true"][aios-appOS="Darwin"] #feedListbox *:-moz-window-inactive,window[aios-appDefTheme="true"][aios-appOS="Darwin"] #permList:-moz-window-inactive{background-color:#E8E8E8;}
+window[aios-appDefTheme="true"][aios-appOS="Darwin"] deck{padding-top:5px;}
+window[aios-appDefTheme="true"][aios-appOS="Darwin"] #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;}window[aios-appDefTheme="true"][aios-appOS="Darwin"] #topBar:-moz-window-inactive{border-left:1px solid #e1e1e1;border-top:1px solid #e1e1e1;border-bottom:1px solid #929292;background-color:-moz-mac-chrome-inactive;}
+window[aios-appDefTheme="true"][aios-appOS="Darwin"] #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;}window[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewGroup:-moz-window-inactive{background-color:-moz-mac-chrome-inactive;border-top:1px solid #929292;border-right:1px solid #929292;border-bottom:1px solid #929292;}
+window[aios-appDefTheme="true"][aios-appOS="Darwin"] #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, #ffffff, #adadad) repeat-x;}window[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewGroup radio:-moz-window-inactive{border-left:1px solid #929292;background:-moz-linear-gradient(top, #ffffff, #adadad) repeat-x;}
+window[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewGroup radio#generalTab{-moz-image-region:rect(24px, 24px, 48px, 0);}
+window[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewGroup radio#mediaTab{-moz-image-region:rect(24px, 48px, 48px, 24px);}
+window[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewGroup radio#feedTab{-moz-image-region:rect(24px, 72px, 48px, 48px);}
+window[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewGroup radio#permTab{-moz-image-region:rect(24px, 96px, 48px, 72px);}
+window[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewGroup radio#securityTab{-moz-image-region:rect(24px, 120px, 48px, 96px);}
+window[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewGroup radio[selected="true"]{background:#606060;box-shadow:inset #2a2a2a 0 3px 3px;}window[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewGroup radio[selected="true"]:-moz-window-inactive{background:#bababa;box-shadow:inset rgba(42, 42, 42, 0.6) 0 2px 2px;}
+window[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewGroup radio image{display:-moz-box;opacity:0.5;}window[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewGroup radio image:-moz-window-inactive{opacity:0.3;}
+window[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewGroup radio:hover image,window[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewGroup radio[selected="true"] image{opacity:1;}window[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewGroup radio:hover image:-moz-window-inactive,window[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewGroup radio[selected="true"] image:-moz-window-inactive{opacity:0.8;}
+window[aios-appDefTheme="true"]:not([aios-appOS="WINNT"]):not([aios-appOS="Darwin"]) #topBar{padding-top:1px;}
diff --git a/skin/css/places.css b/skin/css/places.css
new file mode 100644
index 0000000..9d199df
--- /dev/null
+++ b/skin/css/places.css
@@ -0,0 +1,25 @@
+#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;}
+#closeFolder,#viewButton{list-style-image:url(../icons/panels_menus.png);}
+#closeFolder{-moz-image-region:rect(64px, 32px, 80px, 16px);}#closeFolder image{margin-right:2px;}
+#closeFolder label{display:none;}
+#viewButton{-moz-image-region:rect(64px, 16px, 80px, 0);}
+page[aios-appOS="WINNT"] #closeFolder{-moz-image-region:rect(0, 32px, 16px, 16px);}
+page[aios-appOS="WINNT"] #viewButton{-moz-image-region:rect(0, 16px, 16px, 0);}
+page[aios-appOS="Darwin"] #closeFolder{-moz-image-region:rect(32px, 32px, 48px, 16px);}
+page[aios-appOS="Darwin"] #viewButton{-moz-image-region:rect(32px, 16px, 48px, 0);}
+page[aios-appDefTheme="true"]{}page[aios-appDefTheme="true"] #places-toolbar>*{margin:1px;}
+page[aios-appDefTheme="true"] #search-box.blur{color:#ACA899;}
+page[aios-appDefTheme="true"][aios-appOS="WINNT"]{}page[aios-appDefTheme="true"][aios-appOS="WINNT"] #places-toolbar{padding:0 1px 1px 1px;border-top:1px solid ThreedHighlight;border-bottom:1px solid ThreedShadow;}
+page[aios-appDefTheme="true"][aios-appOS="WINNT"] #viewButton dropmarker image{margin:0 2px 0 3px;}
+page[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] #bookmarks-view,page[aios-appDefTheme="true"][aios-appOS="WINNT"][aios-appOSVersion="Windows NT 5.1"] #historyTree{background-color:#efedea;}
+page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme){}page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"]{-moz-appearance:none !important;}page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #bookmarks-view,page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #historyTree{background-color:#EDECEF;}
+page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] #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));}
+page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) #bookmarks-view,page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) #historyTree{background-color:#EEF3FA;}
+page[aios-appDefTheme="true"][aios-appOS="WINNT"]:-moz-system-metric(windows-default-theme):not([aios-appOSVersion="Windows NT 5.1"]) #places-toolbar{background:#eef3fa;}
+page[aios-appDefTheme="true"][aios-appOS="Darwin"] #places-toolbar{padding:7px 1px 5px 3px;}page[aios-appDefTheme="true"][aios-appOS="Darwin"] #places-toolbar toolbarbutton:-moz-window-inactive{opacity:0.5;}
+page[aios-appDefTheme="true"][aios-appOS="Darwin"] #search-box{margin-top:-1px;}
+page[aios-appDefTheme="true"][aios-appOS="Darwin"] #closeFolder{margin-left:4px;}
+page[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewButton{margin-left:6px;}page[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewButton label{margin-right:1px;}
+page[aios-appDefTheme="true"][aios-appOS="Darwin"] #viewButton dropmarker image{margin:3px 5px 0 0;}
diff --git a/skin/css/prefs.css b/skin/css/prefs.css
new file mode 100644
index 0000000..146cc7e
--- /dev/null
+++ b/skin/css/prefs.css
@@ -0,0 +1,47 @@
+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-defWidthVal,#obj-maxWidthVal{width:45px;}
+#obj-minWidthUnit,#obj-defWidthUnit,#obj-maxWidthUnit{min-width:80px;}
+.arrow-lft{list-style-image:url(../img/arrow.gif);}.arrow-lft image{-moz-transform:rotate(90deg);margin-left:2px;}
+.arrow-lft label{padding-bottom:2px;}
+#aios-settings-button image{list-style-image:url(../img/arrow.gif);-moz-transform:rotate(180deg);margin-left:5px;}
+treechildren{}treechildren::-moz-tree-row(odd){background-color:ButtonFace;border-top:1px solid ButtonFace;border-bottom:1px solid ButtonFace;}
+treechildren::-moz-tree-row(selected),treechildren::-moz-tree-row(odd, selected){background-color:Highlight;}
+treechildren::-moz-tree-cell-text(hardcoded){color:GrayText;}
+treechildren::-moz-tree-cell-text(disabled){text-decoration:line-through;}
+treechildren::-moz-tree-cell-text(user){font-weight:bold;}
+treechildren::-moz-tree-cell-text(duplicate){color:#FF0000;font-weight:bold;}
+treechildren::-moz-tree-cell-text(custom){font-style:italic;}
+.indent{margin-left:1.8em;}
+.spacer{margin-top:10px;}
+.link{color:#0000FF;cursor:pointer;}.link:hover{text-decoration:underline;}
+#aiosKeys .link{margin:1px 0;}#aiosKeys .link:hover{margin:1px 0 0 0;border-bottom:1px solid #0000FF;text-decoration:none;}
+.bold{font-weight:bold;}
+.labelTipElem{-moz-box-orient:vertical;}.labelTipElem 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;}
+prefwindow:-moz-system-metric(windows-default-theme)[aios-appOSVersion="Windows NT 5.1"] .labelTipElem box{height:27px;background-position:0 -59px;}
+prefwindow[aios-appOS="Darwin"] .labelTipElem box{height:28px;background-position:-260px 0;}
+prefwindow: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);}toolbarbutton.info label{display:none;}
+.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;}
+#aiosDownloadsBox{margin-bottom:10px;}
+#aiosPreferences #aiosAbout #aboutHeader,#aiosPreferences #aiosAbout #aboutHeaderMac{display:none;}
+#aiosPreferences #aiosAbout #aboutHeader{margin:0;margin-bottom:10px;}
+#aiosPreferences #aiosAbout #aboutHeaderMac{margin:10px 0 15px 0;}#aiosPreferences #aiosAbout #aboutHeaderMac #macTitle{-moz-box-flex:1;font-size:150%;font-weight:bold;}
+#aiosPreferences #aiosAbout #aboutHeaderMac #macVersion{margin-top:6px;}
+#aiosPreferences #aiosAbout tabbox{margin-bottom:10px;}
+#aiosPreferences #aiosAbout tabpanels{margin:0;padding:0;}
+tabpanel.about{padding:13px;}tabpanel.about description{margin:0;line-height:1.3em;}
+tabpanel.about menuseparator{margin:10px 0;}
+vbox.websites toolbarbutton{-moz-appearance:none;margin:2px 0;border:none;cursor:pointer;list-style-image:url(../img/info.png);}vbox.websites toolbarbutton label{text-align:left;color:#0000FF;text-decoration:none;}
+vbox.websites toolbarbutton:hover label{text-decoration:underline;}
+#paypal{cursor:pointer;}#paypal image{margin-left:10px;}
+separator.groove{margin:10px 0 !important;}
+*[aios-appOS="Darwin"] tabpanel.about{padding-top:30px;}
+*[aios-appOS="Darwin"] description{font-size:13px;}
diff --git a/skin/downloads_layout.css b/skin/downloads_layout.css
deleted file mode 100644
index d328144..0000000
--- a/skin/downloads_layout.css
+++ /dev/null
@@ -1,157 +0,0 @@
-
- at import url("_alternate.css");
-
-#downloadManager, #downloadView {
-    margin: 0px;
-    padding: 0px;
-    border: none;
-}
-
-#downloadView {
-    -moz-appearance: none;	/* Win klassisches Theme */
-}
-
-
-/**
-	Toolbar
-*/
-#search {
-    direction: rtl;	/* Clear Button rechts in der Toolbar */
-}
-
-#search * {
-    direction: ltr;
-}
-
-#searchbox {
-    -moz-box-flex: 1000;
-}
-
-#windowResizer {
-    display: none;
-}
-
-richlistitem {
-    padding: 5px 0px 5px 5px;
-}
-
-/**
-        ICONS
-*/
-window:not([aios_appOS="Linux"]) #clearListButton {
-    list-style-image: url(icons/panels_menus.png);
-    -moz-image-region: rect(64px, 48px, 80px, 32px);
-}
-
-window[aios_appVersion^="4"][aios_appOS="WINNT"] #clearListButton {
-    -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-
-window[aios_appOS="Darwin"] #clearListButton {
-    -moz-image-region: rect(32px, 48px, 48px, 32px);
-}
-
-
-/**
-	Firefox-Standard-Theme
-*/
-window[aios_appDefTheme="true"][aios_appOSVersion="Windows NT 5.1"] #downloadView {
-    border-top: 1px solid ThreedShadow !important;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="WINNT"] #search {
-    -moz-appearance: toolbox;
-    padding: 1px;
-}
-
-#searchbox, #clearListButton {
-    margin: 1px;
-}
-
-window[aios_appDefTheme="true"]:not([aios_appOS="Darwin"]) richlistitem {
-    border-bottom: 1px dotted #C0C0C0;
-}
-
-window[aios_appDefTheme="true"] richlistitem label.name {
-    font-size: 11px;
-    font-weight: bold;
-}
-
-
-/*
-	Firefox- und Windows-Standard-Theme
-*/
-window:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"][aios_appDefTheme="true"]:not([aios_appVersion^="4"]) #downloadView {
-    border-top: 1px solid ActiveBorder !important;
-}
-
-window[aios_appDefTheme="true"]:-moz-system-metric(windows-default-theme) #search {
-    padding: 0px 1px 1px 1px;
-}
-
-window[aios_appDefTheme="true"]:-moz-system-metric(windows-default-theme):not([aios_appOSVersion="Windows NT 5.1"]) #search {
-    padding-right: 3px;
-}
-
-
-/**
-        Firefox 4: Firefox- und Windows-Standard-Theme auf XP
-*/
-window[aios_appDefTheme="true"][aios_appOSVersion="Windows NT 5.1"][aios_appVersion^="4"]:-moz-system-metric(windows-default-theme) #search {
-    -moz-appearance: none;
-    background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0));
-}
-
-
-/**
-	Firefox-Standard-Theme und Darwin
-*/
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"]:not([aios_appVersion^="4"]) #downloadView,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"]:not([aios_appVersion^="4"]) #search {
-    -moz-appearance: none;
-    background-color: #d4dde5;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([aios_appVersion^="4"]):not([active="true"]) #downloadView,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([aios_appVersion^="4"]):not([active="true"]) #search {
-    -moz-appearance: none;
-    background-color: #e8e8e8;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][aios_appVersion^="4"] #downloadView:not(:-moz-window-inactive),
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][aios_appVersion^="4"] #search:not(:-moz-window-inactive) {
-    -moz-appearance: none;
-    background-color: #d4dde5 !important;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][aios_appVersion^="4"] #downloadView:-moz-window-inactive,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][aios_appVersion^="4"] #search:-moz-window-inactive {
-    -moz-appearance: none;
-    background-color: #e8e8e8;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #downloadView {
-    padding-top: 5px !important;
-    border-top: none !important;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #search {
-    padding: 1px 1px 10px 3px;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #searchbox {
-    margin-right: 6px;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #clearListButton {
-  -moz-appearance: none;
-  margin-top: 2px;
-  padding: 1px 0px 1px 5px;
-  border: 1px solid #7F7F7F;
-  -moz-border-radius: 10px;
-  background: -moz-linear-gradient(top, #FFF, #ADADAD) repeat-x;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #clearListButton[disabled="true"] {
-    opacity: 0.5;
-}
\ No newline at end of file
diff --git a/skin/icons/icon64.png b/skin/icons/icon64.png
index f41dde4..433a1c5 100644
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
index 7664e09..8f36d84 100644
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
index 937082b..af203a6 100644
Binary files a/skin/icons/prefs.png and b/skin/icons/prefs.png differ
diff --git a/skin/icons/toolbar_darwin.png b/skin/icons/toolbar_darwin.png
index 7425f65..5dd539b 100644
Binary files a/skin/icons/toolbar_darwin.png and b/skin/icons/toolbar_darwin.png differ
diff --git a/skin/icons/toolbar_darwin_fx3.png b/skin/icons/toolbar_darwin_fx3.png
deleted file mode 100644
index 9b194eb..0000000
Binary files a/skin/icons/toolbar_darwin_fx3.png and /dev/null differ
diff --git a/skin/icons/toolbar_generic.png b/skin/icons/toolbar_generic.png
new file mode 100644
index 0000000..ca1f01a
Binary files /dev/null and b/skin/icons/toolbar_generic.png differ
diff --git a/skin/icons/toolbar_linux.png b/skin/icons/toolbar_linux.png
deleted file mode 100644
index acec3a2..0000000
Binary files a/skin/icons/toolbar_linux.png and /dev/null differ
diff --git a/skin/icons/toolbar_s_darwin_fx3.png b/skin/icons/toolbar_s_darwin_fx3.png
deleted file mode 100644
index 68391e5..0000000
Binary files a/skin/icons/toolbar_s_darwin_fx3.png and /dev/null differ
diff --git a/skin/icons/toolbar_windows.png b/skin/icons/toolbar_windows.png
index 3b68ee5..603c04b 100644
Binary files a/skin/icons/toolbar_windows.png and b/skin/icons/toolbar_windows.png differ
diff --git a/skin/icons/topbar_darwin.png b/skin/icons/topbar_darwin.png
index e228b96..f1d8ccc 100644
Binary files a/skin/icons/topbar_darwin.png and b/skin/icons/topbar_darwin.png differ
diff --git a/skin/images/arrow-dn.png b/skin/images/arrow-dn.png
deleted file mode 100644
index cb633df..0000000
Binary files a/skin/images/arrow-dn.png and /dev/null differ
diff --git a/skin/images/arrow-up.png b/skin/images/arrow-up.png
deleted file mode 100644
index adb8f52..0000000
Binary files a/skin/images/arrow-up.png and /dev/null differ
diff --git a/skin/images/console_css.png b/skin/images/console_css.png
deleted file mode 100644
index 681621f..0000000
Binary files a/skin/images/console_css.png and /dev/null differ
diff --git a/skin/images/console_xml.png b/skin/images/console_xml.png
deleted file mode 100644
index 7b900a8..0000000
Binary files a/skin/images/console_xml.png and /dev/null differ
diff --git a/skin/images/grippy-left.gif b/skin/images/grippy-left.gif
deleted file mode 100644
index 086b2cf..0000000
Binary files a/skin/images/grippy-left.gif and /dev/null differ
diff --git a/skin/images/info.png b/skin/images/info.png
deleted file mode 100644
index b9faaa6..0000000
Binary files a/skin/images/info.png and /dev/null differ
diff --git a/skin/images/itemSelected.png b/skin/images/itemSelected.png
deleted file mode 100644
index 84f7f8d..0000000
Binary files a/skin/images/itemSelected.png and /dev/null differ
diff --git a/skin/images/paypal.gif b/skin/images/paypal.gif
deleted file mode 100644
index 2ca03ea..0000000
Binary files a/skin/images/paypal.gif and /dev/null differ
diff --git a/skin/img/arrow-dn.png b/skin/img/arrow-dn.png
new file mode 100644
index 0000000..fb0f36a
Binary files /dev/null and b/skin/img/arrow-dn.png differ
diff --git a/skin/img/arrow-up.png b/skin/img/arrow-up.png
new file mode 100644
index 0000000..5dbb0eb
Binary files /dev/null and b/skin/img/arrow-up.png differ
diff --git a/skin/images/arrow.gif b/skin/img/arrow.gif
similarity index 100%
rename from skin/images/arrow.gif
rename to skin/img/arrow.gif
diff --git a/skin/img/console_css.png b/skin/img/console_css.png
new file mode 100644
index 0000000..64a48d1
Binary files /dev/null and b/skin/img/console_css.png differ
diff --git a/skin/img/console_xml.png b/skin/img/console_xml.png
new file mode 100644
index 0000000..0f4c555
Binary files /dev/null and b/skin/img/console_xml.png differ
diff --git a/skin/img/grippy-left.gif b/skin/img/grippy-left.gif
new file mode 100644
index 0000000..4f5d612
Binary files /dev/null and b/skin/img/grippy-left.gif differ
diff --git a/skin/images/grippy-right.gif b/skin/img/grippy-right.gif
similarity index 100%
rename from skin/images/grippy-right.gif
rename to skin/img/grippy-right.gif
diff --git a/skin/img/info.png b/skin/img/info.png
new file mode 100644
index 0000000..67c22cb
Binary files /dev/null and b/skin/img/info.png differ
diff --git a/skin/img/paypal.gif b/skin/img/paypal.gif
new file mode 100644
index 0000000..dc16f3a
Binary files /dev/null and b/skin/img/paypal.gif differ
diff --git a/skin/images/sidebarheader.gif b/skin/img/sidebarheader.gif
similarity index 100%
rename from skin/images/sidebarheader.gif
rename to skin/img/sidebarheader.gif
diff --git a/skin/multipanel.css b/skin/multipanel.css
deleted file mode 100644
index 08d2f57..0000000
--- a/skin/multipanel.css
+++ /dev/null
@@ -1,220 +0,0 @@
-
-#commandBar {
-    padding: 0px 2px 0px 2px;
-}
-
-page[aios_appVersion^="4"] #commandBar {
-    padding: 1px 2px 2px 2px;
-}
-
-#page-button .toolbarbutton-menubutton-button,
-#about-button .toolbarbutton-menubutton-button,
-#toolsButton {
-    -moz-box-orient: horizontal;
-}
-
-#ssrSidebar-mitem {
-    margin-left: 13px;
-}
-
-
-/**
-        ICONS
-*/
-#page-button .toolbarbutton-menubutton-button,
-#about-button .toolbarbutton-menubutton-button,
-#toolsButton {
-    list-style-image: url(icons/panels_menus.png);
-}
-
-#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, 0px);
-}
-
-page[aios_appVersion^="4"]:not([aios_appOS="Linux"]) #page-button .toolbarbutton-menubutton-button {
-    -moz-image-region: rect(0px, 80px, 16px, 64px);
-}
-
-page[aios_appVersion^="4"]:not([aios_appOS="Linux"]) #about-button .toolbarbutton-menubutton-button {
-    -moz-image-region: rect(0px, 96px, 16px, 80px);
-}
-
-page[aios_appVersion^="4"]:not([aios_appOS="Linux"]) #toolsButton {
-    -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-.toolbarbutton-menubutton-button image {
-    max-width: 16px;
-    max-height: 16px;
-    margin: 1px 3px 0px 0px !important;
-}
-
-page[aios_appOS="Darwin"] #page-button .toolbarbutton-menubutton-button {
-    -moz-image-region: rect(32px, 80px, 48px, 64px);
-}
-
-page[aios_appOS="Darwin"] #about-button .toolbarbutton-menubutton-button {
-    -moz-image-region: rect(32px, 96px, 48px, 80px);
-}
-
-page[aios_appOS="Darwin"] #toolsButton {
-    -moz-image-region: rect(32px, 16px, 48px, 0px);
-}
-
-page[aios_appOS="Darwin"] .toolbarbutton-menubutton-button image {
-    margin: 3px 3px 2px 0px !important;
-}
-
-
-/**
-	Firefox-Standard-Theme
-*/
-page[aios_appDefTheme="true"]:not([aios_appOS="Darwin"]):not([aios_appVersion^="4"])#webpanels-window {
-    -moz-appearance: toolbox;
-}
-
-page[aios_appDefTheme="true"] #web-panels-browser {
-    background-color: #FFFFFF;
-}
-
-page[aios_appDefTheme="true"][aios_appOS="WINNT"] #commandBar {
-    border-bottom: 1px solid ThreedShadow;
-}
-
-page[aios_appDefTheme="true"] #toolsButton dropmarker image {
-    margin: 0px 1px 0px 2px;
-}
-
-
-/**
-	Firefox- und Windows-Standard-Theme
-*/
-page:-moz-system-metric(windows-default-theme)[aios_appDefTheme="true"] #commandBar {
-    border-bottom: 1px solid ActiveBorder;
-}
-
-page:-moz-system-metric(windows-default-theme)[aios_appDefTheme="true"][aios_appVersion^="4"] #commandBar {
-    border-bottom: 1px solid Threedshadow;
-}
-
-page:-moz-system-metric(windows-default-theme)[aios_appDefTheme="true"][aios_appOSVersion="Windows NT 5.1"]:not([aios_appVersion^="4"]) #commandBar {
-    padding-bottom: 1px;
-}
-
-page:-moz-system-metric(windows-default-theme):not([aios_appOSVersion="Windows NT 5.1"])[aios_appDefTheme="true"] #commandBar {
-    -moz-appearance: toolbox;
-}
-
-page:-moz-system-metric(windows-default-theme):not([aios_appOSVersion="Windows NT 5.1"])[aios_appDefTheme="true"] #commandBar {
-    padding: 1px 4px 2px 1px !important;
-}
-
-page:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"][aios_appDefTheme="true"] #commandBar {
-    padding: 0px 2px 1px 1px !important;
-}
-
-page:-moz-system-metric(windows-default-theme)[aios_appDefTheme="true"]:not([aios_appVersion^="4"]) .toolbarbutton-1 {
-    padding: 0px !important;
-}
-
-page:-moz-system-metric(windows-default-theme)[aios_appDefTheme="true"] .toolbarbutton-1 {
-    margin-right: 5px;
-}
-
-page:-moz-system-metric(windows-default-theme):not([aios_appOSVersion="Windows NT 5.1"])[aios_appVersion^="4"] .toolbarbutton-1 toolbarbutton {
-    padding: 3px !important;
-}
-
-page:-moz-system-metric(windows-default-theme)[aios_appOSVersion="Windows NT 5.1"][aios_appVersion^="4"] .toolbarbutton-1 toolbarbutton {
-    padding: 2px !important;
-}
-
-page:-moz-system-metric(windows-default-theme)[aios_appVersion^="4"] .toolbarbutton-1 label {
-    padding-right: 3px;
-}
-
-
-/**
-	Firefox 4: Firefox- und Windows-Standard-Theme auf XP
-*/
-page[aios_appDefTheme="true"][aios_appOSVersion="Windows NT 5.1"][aios_appVersion^="4"]:-moz-system-metric(windows-default-theme) #commandBar {
-    background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0));
-}
-
-
-/**
-	Firefox-Standard-Theme und Darwin
-*/
-/* Firefox 4 auf Darwin: Aktivierter Toolbarbutton (type = menu-button) */
-page[aios_appOS="Darwin"][aios_appVersion^="4"] .aios-tbutton[checked="true"] .toolbarbutton-menubutton-button,
-page[aios_appOS="Darwin"][aios_appVersion^="4"] .aios-tbutton[checked="true"] .toolbarbutton-menubutton-dropmarker {
-    /*background: #606060;*/
-    box-shadow: inset #2A2A2A 0 3px 3.5px, 0 1px rgba(255, 255, 255, .4);
-}
-
-*[aios_appDefTheme="true"][aios_appOS="Darwin"][aios_appVersion^="4"] #commandBar:-moz-window-inactive {
-    background-color: #e8e8e8;
-}
-
-*[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([aios_appVersion^="4"]):not([active="true"]) #commandBar {
-    background-color: #e8e8e8;
-}
-
-*[aios_appDefTheme="true"][aios_appOS="Darwin"][aios_appVersion^="4"] #commandBar:not(:-moz-window-inactive) {
-    background-color: #D4DDE5 !important;
-}
-
-*[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([aios_appVersion^="4"])[active="true"] #commandBar {
-    background-color: #D4DDE5 !important;
-}
-
-page[aios_appOS="Darwin"] #commandBar {
-    padding: 3px 0px 10px 2px !important;
-    border: none !important;
-}
-
-page[aios_appOS="Darwin"] .toolbarbutton-1 {
-    padding: 0px;
-    border: none;
-}
-
-page[aios_appOS="Darwin"]:not([aios_appVersion^="4"]) .toolbarbutton-1 toolbarbutton {
-    padding: 1px 0px;
-}
-
-page[aios_appOS="Darwin"] toolbarbutton > image {
-    margin-right: 0px;
-}
-
-page[aios_appOS="Darwin"] toolbarbutton > label {
-    margin: 0px;
-    padding: 0px;
-}
-
-page[aios_appOS="Darwin"] .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-text {
-    margin-right: 3px;
-}
-
-page[aios_appOS="Darwin"] #toolsButton {
-  -moz-appearance: none;
-  padding: 1px 5px;
-  border: 1px solid #7F7F7F;
-  -moz-border-radius: 10px;
-  background: -moz-linear-gradient(top, #FFF, #ADADAD) repeat-x;
-}
-
-page[aios_appOS="Darwin"] #toolsButton image {
-    margin-right: 6px;
-}
-
-page[aios_appOS="Darwin"] #toolsButton .dropmarker-icon {
-    margin: 2px 0px 0px 1px;
-}
\ No newline at end of file
diff --git a/skin/multipanel_ssr.css b/skin/multipanel_ssr.css
deleted file mode 100644
index 424c7b6..0000000
--- a/skin/multipanel_ssr.css
+++ /dev/null
@@ -1,116 +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: 0px ! 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: 0px ! 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: 0px ! important;
-    margin: 0px ! 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: 0px ! 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/pageinfo_layout.css b/skin/pageinfo_layout.css
deleted file mode 100644
index 42a9ae0..0000000
--- a/skin/pageinfo_layout.css
+++ /dev/null
@@ -1,258 +0,0 @@
-
-#mainDeck, 
-#topStackBar,
-#topBar,
-#viewGroup {
-    margin: 0px;
-    padding: 0px;
-}
-
-#viewGroup {
-    padding: 0px 0px 1px 1px;
-}
-
-#viewGroup[hideLabel=true] radio {
-    min-width: 0px;
-    margin: 0px 2px 0px 0px;
-    padding: 2px;
-}
-
-#viewGroup[hideLabel=true] radio label {
-    display: none;
-}
-
-#generalPanel #titletext {
-    padding: 5px;
-}
-
-#permPanel > hbox {
-    padding-top: 5px;
-}
-
-#permList {
-    border: none;
-}
-
-#permList > vbox {
-    padding-left: 0px;
-    padding-right: 0px;
-}
-
-#permList > vbox hbox {
-    -moz-box-orient: vertical;
-}
-
-#security-privacy-groupbox row {
-    margin-top: 10px;
-    padding-top: 10px;
-}
-
-#security-privacy-groupbox row:first-child {
-    margin-top: 0px;
-    padding-top: 0px;
-}
-
-
-/*
-	Firefox-Standard-Theme
-*/
-window[aios_appDefTheme="true"] #topStackBar {
-    border-bottom: 1px solid ThreedHighlight;
-}
-
-window[aios_appDefTheme="true"] #permList,
-window[aios_appDefTheme="true"] #security-privacy-groupbox row {
-    border-top: 1px solid ThreedShadow;
-}
-
-window[aios_appDefTheme="true"] #security-privacy-groupbox row:first-child {
-    border-top: none;
-}
-
-
-/*
-	Firefox- und Windows-Standard-Theme
-*/
-window:-moz-system-metric(windows-default-theme)[aios_appDefTheme="true"] #permList {
-    border-top: 1px solid ActiveBorder;
-}
-
-window:-moz-system-metric(windows-default-theme)[aios_appVersion^="4"][aios_appDefTheme="true"] #permList {
-    border-top: 1px solid Threedshadow;
-}
-
-window:-moz-system-metric(windows-default-theme)[aios_appDefTheme="true"] #topBar {
-    border-bottom: 1px solid ActiveBorder;
-}
-
-window:-moz-system-metric(windows-default-theme)[aios_appVersion^="4"][aios_appDefTheme="true"] #topBar {
-    border-bottom: 1px solid Threedshadow;
-}
-
-window:-moz-system-metric(windows-default-theme)[aios_appDefTheme="true"] #mainDeck {
-    border-top: 1px solid ThreedHighlight;
-}
-
-
-/*
-	Firefox-Standard-Theme und Darwin
-*/
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) #topStackBar,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) deck,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) #feedListbox *,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([active="true"]) #permList {
-    background-color: #E8E8E8 !important;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #topStackBar:-moz-window-inactive,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] deck:-moz-window-inactive,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #feedListbox:-moz-window-inactive *,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #permList:-moz-window-inactive {
-    background-color: #E8E8E8 !important;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"] #topStackBar,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"] deck,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"] #feedListbox *,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][active="true"] #permList {
-    background-color: #D4DDE5 !important;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #topStackBar:not(:-moz-window-inactive),
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] deck:not(:-moz-window-inactive),
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #feedListbox:not(:-moz-window-inactive) *,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #permList:not(:-moz-window-inactive) {
-    background-color: #D4DDE5 !important;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] deck {
-    padding-top: 5px !important;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][aios_appVersion^="4"] {
-    -moz-appearance: none;
-    border-top: 1px solid #484848;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][aios_appVersion^="4"]:-moz-window-inactive {
-    -moz-appearance: none;
-    border-top: 1px solid #929292;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([aios_appVersion^="4"]) {
-    -moz-appearance: none;
-    border-top: 1px solid #484848;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([aios_appVersion^="4"]):not([active="true"]) {
-    -moz-appearance: none;
-    border-top: 1px solid #929292;
-}
-
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][aios_appVersion^="4"] #topBar {
-    -moz-appearance: none;
-    border-left: 1px solid #c0c0c0;
-    border-top: 1px solid #c0c0c0;
-    border-bottom: 1px solid #484848;
-    border-right: 1px solid #484848;
-    background-color: -moz-mac-chrome-active;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"][aios_appVersion^="4"] #topBar:-moz-window-inactive {
-    -moz-appearance: none;
-    border-left: 1px solid #e1e1e1;
-    border-top: 1px solid #e1e1e1;
-    border-bottom: 1px solid #929292;
-    border-right: 1px solid #929292;
-    background-color: -moz-mac-chrome-inactive;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([aios_appVersion^="4"]) #topBar {
-    -moz-appearance: none;
-    border-left: 1px solid #c0c0c0;
-    border-top: 1px solid #c0c0c0;
-    border-bottom: 1px solid #484848;
-    border-right: 1px solid #484848;
-    background-color: -moz-mac-chrome-active;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"]:not([aios_appVersion^="4"]):not([active="true"]) #topBar {
-    -moz-appearance: none;
-    border-left: 1px solid #e1e1e1;
-    border-top: 1px solid #e1e1e1;
-    border-bottom: 1px solid #929292;
-    border-right: 1px solid #929292;
-    background-color: -moz-mac-chrome-inactive;
-}
-
-/* View buttons */
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewGroup {
-    margin: 1px 0px 2px 0px;
-    padding: 1px;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewGroup radio {
-    width: 35px;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewGroup radio, /* sonst wird das Label nicht per CSS versteckt */
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewGroup radio image {
-    margin: 0px;
-    padding: 0px;
-    display: -moz-box;
-    list-style-image: url("icons/topbar_darwin.png");
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #viewGroup radio image {
-    margin: 7px 1px;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #generalTab {
-    -moz-image-region: rect(24px, 24px, 48px, 0px)
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #mediaTab {
-    -moz-image-region: rect(24px, 48px, 48px, 24px)
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #feedTab {
-    -moz-image-region: rect(24px, 72px, 48px, 48px)
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #permTab {
-    -moz-image-region: rect(24px, 96px, 48px, 72px)
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #securityTab {
-    -moz-image-region: rect(24px, 120px, 48px, 96px)
-}
-
-
-/*
-	Labels zusätzlich zur JS-Lösung (aios_sidebarLayout() in pageinfo.js) unsichtbar machen, 
-	da diese erst beim zweiten Laden des Panels funktioniert, JS-Lösung wegen Dritt-Erweiterungen trotzdem notwendig
-*/
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #generalTab label,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #mediaTab label,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #feedTab label,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #permTab label,
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] #securityTab label {
-    display: none;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio:not([selected="true"]):hover image {
-    opacity: 1;
-}
-
-window[aios_appDefTheme="true"][aios_appOS="Darwin"] radio:not([selected="true"]) image {
-    opacity: 0.5;
-}
-
-
-/*
-	Firefox-Standard-Theme und Linux
-*/
-window[aios_appDefTheme="true"][aios_appOS="Linux"] #topBar {
-    padding-top: 1px;
-}
\ No newline at end of file
diff --git a/skin/prefs.css b/skin/prefs.css
deleted file mode 100644
index e920ef8..0000000
--- a/skin/prefs.css
+++ /dev/null
@@ -1,297 +0,0 @@
-
-/*
-	Buttons
-*/
-radio[pane=aiosGeneral],
-radio[pane=aiosPanels],
-radio[pane=aiosMenus],
-radio[pane=aiosKeys] {
-    list-style-image: url(icons/prefs.png);
-}
-
-
-radio[pane=aiosGeneral] {
-    -moz-image-region: rect(0px, 32px, 32px, 0px);
-}
-
-radio[pane=aiosPanels] {
-    -moz-image-region: rect(0px, 64px, 32px, 32px);
-}
-
-radio[pane=aiosMenus] {
-    -moz-image-region: rect(0px, 96px, 32px, 64px);
-}
-
-radio[pane=aiosKeys] {
-    -moz-image-region: rect(0px, 128px, 32px, 96px);
-}
-
-
-#obj-minWidthVal, #obj-defWidthVal, #obj-maxWidthVal {
-    width: 45px;
-}
-
-#obj-minWidthUnit, #obj-defWidthUnit, #obj-maxWidthUnit {
-    min-width: 80px;
-}
-
-.arrow-lft {
-    list-style-image: url(images/arrow.gif);
-}
-
-.arrow-lft image {
-    -moz-transform: rotate(90deg);
-    margin-left: 2px;
-}
-
-.arrow-lft label {
-    padding-bottom: 2px;
-}
-
-#aios-settings-button image {
-    list-style-image: url(images/arrow.gif);
-    -moz-transform: rotate(180deg);
-    margin-left: 5px;
-}
-
-
-/*
-	Shortcuts Pane
-*/
-treechildren::-moz-tree-row(odd) {
-    background-color: ButtonFace;
-    border-top: 1px solid ButtonFace;
-    border-bottom: 1px solid ButtonFace;
-}
-
-treechildren::-moz-tree-row(selected),
-treechildren::-moz-tree-row(odd, selected)  {
-    background-color: Highlight;
-}
-
-/* Style different keys differently */
-treechildren::-moz-tree-cell-text(hardcoded) { color: GrayText; }
-treechildren::-moz-tree-cell-text(disabled) { text-decoration: line-through; }
-treechildren::-moz-tree-cell-text(user) { font-weight: bold; }
-treechildren::-moz-tree-cell-text(duplicate) {color: #FF0000; font-weight: bold; }
-treechildren::-moz-tree-cell-text(custom) { font-style: italic; }
-
-
-/*
-	Styles
-*/
-.indent {
-    margin-left: 1.8em;
-}
-
-.spacer {
-    margin-top: 10px;
-}
-
-.link {
-    color: #0000FF;
-    cursor: pointer;
-}
-
-.link:hover {
-    text-decoration: underline;
-}
-
-#aiosKeys .link {
-    margin: 1px 0px;
-}
-
-#aiosKeys .link:hover {
-    margin: 1px 0px 0px 0px;
-    border-bottom: 1px solid #0000FF;
-    text-decoration: none;
-}
-
-.bold {
-    font-weight: bold;
-}
-
-
-/*
-	Tooltips
-*/
-.labelTipElem {
-    -moz-box-orient: vertical;
-}
-
-.labelTip, .labelTip > label {
-    cursor: help;
-}
-
-.labelTip > label {
-    border-bottom: 1px dotted;
-}
-
-.labelTipElem box {
-    width: 260px;
-    max-width: 260px;
-    height: 31px;
-    margin-top: 10px;
-    background: url(images/sidebarheader.gif) no-repeat;
-}
-
-prefwindow[aios_appVersion^="4"]:-moz-system-metric(windows-default-theme) .labelTipElem box {
-    height: 27px;
-    background-position: 0px -31px;
-}
-
-prefwindow[aios_appVersion^="4"][aios_appOSVersion="Windows NT 5.1"]:-moz-system-metric(windows-default-theme) .labelTipElem box {
-    height: 27px;
-    background-position: 0px -59px;
-}
-
-prefwindow:not([aios_appVersion^="4"]) .labelTipElem box {
-    height: 31px;
-    background-position: 0px -86px;
-}
-
-prefwindow:not([aios_appVersion^="4"]):-moz-system-metric(windows-default-theme) .labelTipElem box {
-    height: 29px;
-    background-position: 0px -117px;
-}
-
-prefwindow[aios_appOS="Darwin"][aios_appVersion^="4"] .labelTipElem box {
-    height: 28px;
-    background-position: -260px 0px;
-}
-
-prefwindow[aios_appOS="Darwin"]:not([aios_appVersion^="4"]) .labelTipElem box {
-    height: 28px;
-    background-position: -260px -28px;
-}
-
-prefwindow[aios_appOS="Linux"] .labelTipElem box {
-    height: 30px;
-    background-position: -520px 0px;
-}
-
-toolbarbutton.info {
-    -moz-appearance: none;
-    margin: 0px;
-    padding: 0px;
-    border: none;
-    list-style-image: url(images/info.png);
-}
-
-toolbarbutton.info label {
-    display: none;
-}
-
-
-/*
-	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;
-}
-
-/*
-.aiosSizeBox {
-	background-color: #0000FF;
-}*/
-
-
-
-
-/*
-	Optionen-Overlay
-*/
-#aiosDownloadsBox {
-    margin-bottom: 10px;
-}
-
-
-
-
-/*
-	About
-*/
-#aiosAbout #header {
-    margin: 0px;
-    margin-bottom: 10px;
-}
-
-#aiosAbout #headerMac {
-    margin: 10px 0px 15px 0px;
-}
-
-window#aiosAbout[aios_appOS="Darwin"] #header {
-    display: none;
-}
-
-window#aiosAbout:not([aios_appOS="Darwin"]) #headerMac {
-    display: none;
-}
-
-#headerMac #title {
-    -moz-box-flex: 1;
-    font-size: 150%;
-    font-weight: bold;
-}
-
-#headerMac #version {
-    margin-top: 6px;
-}
-
-#aiosAbout tabbox {
-    margin-bottom: 10px;
-}
-
-#aiosAbout tabpanels {
-    margin: 0px;
-    padding: 0px;
-}
-
-tabpanel.about {
-    padding: 13px;
-}
-
-window[aios_appOS="Darwin"] tabpanel.about {
-    padding-top: 25px;
-}
-
-tabpanel.about description {
-    margin: 0px;
-    line-height: 1.3em;
-}
-
-tabpanel.about menuseparator {
-    margin: 10px 0px;
-}
-
-vbox.websites toolbarbutton {
-    -moz-appearance: none;
-    margin: 2px 0px;
-    border: none;
-    cursor: pointer;
-    list-style-image: url(smallIcons/page.png);
-}
-
-vbox.websites toolbarbutton label {
-    text-align: left;
-    color: #0000FF;
-    text-decoration: none;
-}
-
-vbox.websites toolbarbutton:hover label {
-    text-decoration: underline;
-}
-
-#paypal {
-    cursor: pointer;
-}
-
-#paypal image {
-    margin-left: 10px;
-}
diff --git a/skin/smallIcons/disable.png b/skin/smallIcons/disable.png
deleted file mode 100644
index f3c2c59..0000000
Binary files a/skin/smallIcons/disable.png and /dev/null differ
diff --git a/skin/smallIcons/ok.png b/skin/smallIcons/ok.png
deleted file mode 100644
index 0688fc4..0000000
Binary files a/skin/smallIcons/ok.png and /dev/null differ
diff --git a/skin/smallIcons/ok_dis.png b/skin/smallIcons/ok_dis.png
deleted file mode 100644
index fb7370a..0000000
Binary files a/skin/smallIcons/ok_dis.png and /dev/null differ
diff --git a/skin/smallIcons/options.png b/skin/smallIcons/options.png
deleted file mode 100644
index 5818b6d..0000000
Binary files a/skin/smallIcons/options.png and /dev/null differ
diff --git a/skin/smallIcons/options_dis.png b/skin/smallIcons/options_dis.png
deleted file mode 100644
index a8d9468..0000000
Binary files a/skin/smallIcons/options_dis.png and /dev/null differ

-- 
A sidebar extension for Iceweasel/Firefox



More information about the Pkg-mozext-commits mailing list