1 files changed, 146 insertions, 163 deletions

diff --git a/www/xpi-firebug/pkg-plist b/www/xpi-firebug/pkg-plist
index 732a9626da5a..db4baf210792 100644
--- a/www/xpi-firebug/pkg-plist
+++ b/www/xpi-firebug/pkg-plist
@@ -1,97 +1,140 @@
 %%XPI_XPIDIR%%/chrome.manifest
-%%XPI_XPIDIR%%/content/firebug/a11y.js
-%%XPI_XPIDIR%%/content/firebug/aboutOverlay.js
-%%XPI_XPIDIR%%/content/firebug/aboutOverlay.xul
-%%XPI_XPIDIR%%/content/firebug/activation.js
-%%XPI_XPIDIR%%/content/firebug/balloonNote.js
-%%XPI_XPIDIR%%/content/firebug/bindings.xml
+%%XPI_XPIDIR%%/content/firebug/accessible/a11y.js
 %%XPI_XPIDIR%%/content/firebug/blank.gif
 %%XPI_XPIDIR%%/content/firebug/branch.properties
-%%XPI_XPIDIR%%/content/firebug/breakpoint.js
 %%XPI_XPIDIR%%/content/firebug/browserOverlay.xul
-%%XPI_XPIDIR%%/content/firebug/callstack.js
-%%XPI_XPIDIR%%/content/firebug/chrome.js
-%%XPI_XPIDIR%%/content/firebug/commandLine.js
-%%XPI_XPIDIR%%/content/firebug/commandLineInjected.js
-%%XPI_XPIDIR%%/content/firebug/commandLinePopup.js
-%%XPI_XPIDIR%%/content/firebug/console.js
-%%XPI_XPIDIR%%/content/firebug/consoleInjected.js
-%%XPI_XPIDIR%%/content/firebug/consoleInjector.js
-%%XPI_XPIDIR%%/content/firebug/css.js
-%%XPI_XPIDIR%%/content/firebug/customizeShortcuts.js
-%%XPI_XPIDIR%%/content/firebug/customizeShortcuts.xul
-%%XPI_XPIDIR%%/content/firebug/debugger.js
-%%XPI_XPIDIR%%/content/firebug/dom.js
-%%XPI_XPIDIR%%/content/firebug/domplate.js
-%%XPI_XPIDIR%%/content/firebug/editor.js
-%%XPI_XPIDIR%%/content/firebug/errors.js
-%%XPI_XPIDIR%%/content/firebug/external/changeeditor.js
-%%XPI_XPIDIR%%/content/firebug/external/changeeditor.xul
-%%XPI_XPIDIR%%/content/firebug/external/editorToContextMenu.js
-%%XPI_XPIDIR%%/content/firebug/external/editors.js
-%%XPI_XPIDIR%%/content/firebug/external/editors.xul
-%%XPI_XPIDIR%%/content/firebug/external/editorsOverlay.xul
-%%XPI_XPIDIR%%/content/firebug/external/externalEditors.js
+%%XPI_XPIDIR%%/content/firebug/bti/inProcess/browser.js
+%%XPI_XPIDIR%%/content/firebug/bti/inProcess/compilationunit.js
+%%XPI_XPIDIR%%/content/firebug/bti/inProcess/javascripttool.js
+%%XPI_XPIDIR%%/content/firebug/bti/inProcess/webApp.js
+%%XPI_XPIDIR%%/content/firebug/chrome/activation.js
+%%XPI_XPIDIR%%/content/firebug/chrome/balloonNote.js
+%%XPI_XPIDIR%%/content/firebug/chrome/chrome.js
+%%XPI_XPIDIR%%/content/firebug/chrome/infotip.js
+%%XPI_XPIDIR%%/content/firebug/chrome/knownIssues.js
+%%XPI_XPIDIR%%/content/firebug/chrome/navigationHistory.js
+%%XPI_XPIDIR%%/content/firebug/chrome/panelActivation.js
+%%XPI_XPIDIR%%/content/firebug/chrome/plugin.js
+%%XPI_XPIDIR%%/content/firebug/chrome/reps.js
+%%XPI_XPIDIR%%/content/firebug/chrome/searchBox.js
+%%XPI_XPIDIR%%/content/firebug/chrome/shortcuts.js
+%%XPI_XPIDIR%%/content/firebug/chrome/tabContext.js
+%%XPI_XPIDIR%%/content/firebug/chrome/tableRep.js
+%%XPI_XPIDIR%%/content/firebug/console/commandLine.js
+%%XPI_XPIDIR%%/content/firebug/console/commandLineExposed.js
+%%XPI_XPIDIR%%/content/firebug/console/commandLineInjected.js
+%%XPI_XPIDIR%%/content/firebug/console/commandLinePopup.js
+%%XPI_XPIDIR%%/content/firebug/console/console.js
+%%XPI_XPIDIR%%/content/firebug/console/consoleExposed.js
+%%XPI_XPIDIR%%/content/firebug/console/consoleInjected.js
+%%XPI_XPIDIR%%/content/firebug/console/consoleInjector.js
+%%XPI_XPIDIR%%/content/firebug/console/errors.js
+%%XPI_XPIDIR%%/content/firebug/console/eventMonitor.js
+%%XPI_XPIDIR%%/content/firebug/console/memoryProfiler.js
+%%XPI_XPIDIR%%/content/firebug/console/profiler.js
+%%XPI_XPIDIR%%/content/firebug/css/cssPanel.js
+%%XPI_XPIDIR%%/content/firebug/dom/domPanel.js
+%%XPI_XPIDIR%%/content/firebug/dom/toggleBranch.js
+%%XPI_XPIDIR%%/content/firebug/editor/editor.js
+%%XPI_XPIDIR%%/content/firebug/editor/editorSelector.js
+%%XPI_XPIDIR%%/content/firebug/editor/external/changeeditor.js
+%%XPI_XPIDIR%%/content/firebug/editor/external/changeeditor.xul
+%%XPI_XPIDIR%%/content/firebug/editor/external/editorToContextMenu.js
+%%XPI_XPIDIR%%/content/firebug/editor/external/editors.js
+%%XPI_XPIDIR%%/content/firebug/editor/external/editors.xul
+%%XPI_XPIDIR%%/content/firebug/editor/external/editorsOverlay.xul
+%%XPI_XPIDIR%%/content/firebug/editor/external/externalEditors.js
 %%XPI_XPIDIR%%/content/firebug/firebug.css
 %%XPI_XPIDIR%%/content/firebug/firebug.js
-%%XPI_XPIDIR%%/content/firebug/firebug.xul
 %%XPI_XPIDIR%%/content/firebug/firebugOverlay.xul
-%%XPI_XPIDIR%%/content/firebug/highlighter.css
-%%XPI_XPIDIR%%/content/firebug/html.js
-%%XPI_XPIDIR%%/content/firebug/infotip.js
-%%XPI_XPIDIR%%/content/firebug/insideOutBox.js
-%%XPI_XPIDIR%%/content/firebug/inspector.js
-%%XPI_XPIDIR%%/content/firebug/jsonViewer.js
-%%XPI_XPIDIR%%/content/firebug/knownIssues.js
-%%XPI_XPIDIR%%/content/firebug/layout.js
-%%XPI_XPIDIR%%/content/firebug/lib.js
-%%XPI_XPIDIR%%/content/firebug/lib/htmlLib.js
-%%XPI_XPIDIR%%/content/firebug/navigationHistory.js
-%%XPI_XPIDIR%%/content/firebug/net.js
+%%XPI_XPIDIR%%/content/firebug/firefox/aboutOverlay.js
+%%XPI_XPIDIR%%/content/firebug/firefox/aboutOverlay.xul
+%%XPI_XPIDIR%%/content/firebug/firefox/bindings.xml
+%%XPI_XPIDIR%%/content/firebug/firefox/browserMenuOverlay.xul
+%%XPI_XPIDIR%%/content/firebug/firefox/browserOverlayWithFrame.xul
+%%XPI_XPIDIR%%/content/firebug/firefox/customizeShortcuts.js
+%%XPI_XPIDIR%%/content/firebug/firefox/customizeShortcuts.xul
+%%XPI_XPIDIR%%/content/firebug/firefox/firebug.xul
+%%XPI_XPIDIR%%/content/firebug/firefox/firebugFrame.xul
+%%XPI_XPIDIR%%/content/firebug/firefox/firebugMenu.js
+%%XPI_XPIDIR%%/content/firebug/firefox/firebugMenuOverlay.xul
+%%XPI_XPIDIR%%/content/firebug/firefox/firefox.js
+%%XPI_XPIDIR%%/content/firebug/firefox/menu.js
+%%XPI_XPIDIR%%/content/firebug/firefox/panelBarWaiter.js
+%%XPI_XPIDIR%%/content/firebug/firefox/start-button/customizeToolbarOverlay.xul
+%%XPI_XPIDIR%%/content/firebug/firefox/start-button/startButton.css
+%%XPI_XPIDIR%%/content/firebug/firefox/start-button/startButton.xml
+%%XPI_XPIDIR%%/content/firebug/firefox/start-button/startButtonOverlay.js
+%%XPI_XPIDIR%%/content/firebug/firefox/start-button/startButtonOverlay.xul
+%%XPI_XPIDIR%%/content/firebug/firefox/system.js
+%%XPI_XPIDIR%%/content/firebug/firefox/tabWatcher.js
+%%XPI_XPIDIR%%/content/firebug/firefox/window.js
+%%XPI_XPIDIR%%/content/firebug/firefox/xpcom.js
+%%XPI_XPIDIR%%/content/firebug/html/highlighter.css
+%%XPI_XPIDIR%%/content/firebug/html/htmlLib.js
+%%XPI_XPIDIR%%/content/firebug/html/htmlPanel.js
+%%XPI_XPIDIR%%/content/firebug/html/insideOutBox.js
+%%XPI_XPIDIR%%/content/firebug/html/inspector.js
+%%XPI_XPIDIR%%/content/firebug/html/layout.js
+%%XPI_XPIDIR%%/content/firebug/js/breakpoint.js
+%%XPI_XPIDIR%%/content/firebug/js/callstack.js
+%%XPI_XPIDIR%%/content/firebug/js/debugger.js
+%%XPI_XPIDIR%%/content/firebug/js/fbs.js
+%%XPI_XPIDIR%%/content/firebug/js/scriptPanel.js
+%%XPI_XPIDIR%%/content/firebug/js/sourceBox.js
+%%XPI_XPIDIR%%/content/firebug/js/sourceCache.js
+%%XPI_XPIDIR%%/content/firebug/js/sourceFile.js
+%%XPI_XPIDIR%%/content/firebug/js/sourceLink.js
+%%XPI_XPIDIR%%/content/firebug/js/stackFrame.js
+%%XPI_XPIDIR%%/content/firebug/js/tabCache.js
+%%XPI_XPIDIR%%/content/firebug/legacy.js
+%%XPI_XPIDIR%%/content/firebug/lib/array.js
+%%XPI_XPIDIR%%/content/firebug/lib/css.js
+%%XPI_XPIDIR%%/content/firebug/lib/deprecated.js
+%%XPI_XPIDIR%%/content/firebug/lib/dom.js
+%%XPI_XPIDIR%%/content/firebug/lib/domplate.js
+%%XPI_XPIDIR%%/content/firebug/lib/dragdrop.js
+%%XPI_XPIDIR%%/content/firebug/lib/events.js
+%%XPI_XPIDIR%%/content/firebug/lib/json.js
+%%XPI_XPIDIR%%/content/firebug/lib/keywords.js
+%%XPI_XPIDIR%%/content/firebug/lib/lib.js
+%%XPI_XPIDIR%%/content/firebug/lib/locale.js
+%%XPI_XPIDIR%%/content/firebug/lib/object.js
+%%XPI_XPIDIR%%/content/firebug/lib/options.js
+%%XPI_XPIDIR%%/content/firebug/lib/persist.js
+%%XPI_XPIDIR%%/content/firebug/lib/search.js
+%%XPI_XPIDIR%%/content/firebug/lib/string.js
+%%XPI_XPIDIR%%/content/firebug/lib/tool.js
+%%XPI_XPIDIR%%/content/firebug/lib/trace.js
+%%XPI_XPIDIR%%/content/firebug/lib/url.js
+%%XPI_XPIDIR%%/content/firebug/lib/wrapper.js
+%%XPI_XPIDIR%%/content/firebug/lib/xml.js
+%%XPI_XPIDIR%%/content/firebug/lib/xpath.js
+%%XPI_XPIDIR%%/content/firebug/main.js
+%%XPI_XPIDIR%%/content/firebug/moduleConfig.js
+%%XPI_XPIDIR%%/content/firebug/net/httpActivityObserver.js
+%%XPI_XPIDIR%%/content/firebug/net/httpLib.js
+%%XPI_XPIDIR%%/content/firebug/net/jsonViewer.js
+%%XPI_XPIDIR%%/content/firebug/net/netDebugger.js
+%%XPI_XPIDIR%%/content/firebug/net/netMonitor.js
+%%XPI_XPIDIR%%/content/firebug/net/netPanel.js
+%%XPI_XPIDIR%%/content/firebug/net/netProgress.js
+%%XPI_XPIDIR%%/content/firebug/net/netReps.js
+%%XPI_XPIDIR%%/content/firebug/net/netUtils.js
+%%XPI_XPIDIR%%/content/firebug/net/requestObserver.js
+%%XPI_XPIDIR%%/content/firebug/net/responseObserver.js
+%%XPI_XPIDIR%%/content/firebug/net/spy.js
+%%XPI_XPIDIR%%/content/firebug/net/svgViewer.js
+%%XPI_XPIDIR%%/content/firebug/net/xmlViewer.js
 %%XPI_XPIDIR%%/content/firebug/panel.html
-%%XPI_XPIDIR%%/content/firebug/plugin.js
-%%XPI_XPIDIR%%/content/firebug/profiler.js
-%%XPI_XPIDIR%%/content/firebug/reps.js
-%%XPI_XPIDIR%%/content/firebug/script.js
-%%XPI_XPIDIR%%/content/firebug/search.js
-%%XPI_XPIDIR%%/content/firebug/shortcuts.js
-%%XPI_XPIDIR%%/content/firebug/sourceBox.js
-%%XPI_XPIDIR%%/content/firebug/sourceCache.js
-%%XPI_XPIDIR%%/content/firebug/sourceFile.js
-%%XPI_XPIDIR%%/content/firebug/spy.js
-%%XPI_XPIDIR%%/content/firebug/start-button/customizeToolbarOverlay.xul
-%%XPI_XPIDIR%%/content/firebug/start-button/startButton.xml
-%%XPI_XPIDIR%%/content/firebug/start-button/startButtonOverlay.js
-%%XPI_XPIDIR%%/content/firebug/start-button/startButtonOverlay.xul
-%%XPI_XPIDIR%%/content/firebug/svgViewer.js
-%%XPI_XPIDIR%%/content/firebug/tabCache.js
-%%XPI_XPIDIR%%/content/firebug/tabContext.js
-%%XPI_XPIDIR%%/content/firebug/tabWatcher.js
-%%XPI_XPIDIR%%/content/firebug/tableRep.js
-%%XPI_XPIDIR%%/content/firebug/testList.html
-%%XPI_XPIDIR%%/content/firebug/tests/moved_to_fbug_tests.html
 %%XPI_XPIDIR%%/content/firebug/trace.js
-%%XPI_XPIDIR%%/content/firebug/traceConsole.html
-%%XPI_XPIDIR%%/content/firebug/traceConsole.js
-%%XPI_XPIDIR%%/content/firebug/traceConsole.xul
-%%XPI_XPIDIR%%/content/firebug/traceLogFrame.html
-%%XPI_XPIDIR%%/content/firebug/traceModule.js
-%%XPI_XPIDIR%%/content/firebug/traceOverlay.xul
-%%XPI_XPIDIR%%/content/firebug/tracingConsoleOverlay.xul
-%%XPI_XPIDIR%%/content/firebug/xmlViewer.js
-%%XPI_XPIDIR%%/content/firebug/xpcom.js
+%%XPI_XPIDIR%%/content/firebug/trace/debug.js
+%%XPI_XPIDIR%%/content/firebug/trace/traceListener.js
+%%XPI_XPIDIR%%/content/firebug/trace/traceModule.js
 %%XPI_XPIDIR%%/defaults/preferences/firebug.js
 %%XPI_XPIDIR%%/defaults/preferences/tracingConsole.js
 %%XPI_XPIDIR%%/docs/Bugs.txt
-%%XPI_XPIDIR%%/docs/ReleaseNotes_1.1.txt
-%%XPI_XPIDIR%%/docs/ReleaseNotes_1.2.txt
-%%XPI_XPIDIR%%/docs/ReleaseNotes_1.3.txt
-%%XPI_XPIDIR%%/docs/ReleaseNotes_1.4.txt
-%%XPI_XPIDIR%%/docs/ReleaseNotes_1.5.txt
 %%XPI_XPIDIR%%/docs/TODO.txt
-%%XPI_XPIDIR%%/docs/index.html
-%%XPI_XPIDIR%%/docs/index.tpl.html
-%%XPI_XPIDIR%%/icons/default/TraceConsole.ico
 %%XPI_XPIDIR%%/icons/default/firebug.ico
 %%XPI_XPIDIR%%/install.rdf
 %%XPI_XPIDIR%%/license.txt
@@ -104,7 +147,7 @@
 %%XPI_XPIDIR%%/locale/cs/firebug-amo.properties
 %%XPI_XPIDIR%%/locale/cs/firebug-tracing.properties
 %%XPI_XPIDIR%%/locale/cs/firebug.properties
-%%XPI_XPIDIR%%/locale/da-DK/firebug.properties
+%%XPI_XPIDIR%%/locale/da/firebug.properties
 %%XPI_XPIDIR%%/locale/de/firebug-amo.properties
 %%XPI_XPIDIR%%/locale/de/firebug-tracing.properties
 %%XPI_XPIDIR%%/locale/de/firebug.properties
@@ -184,34 +227,20 @@
 %%XPI_XPIDIR%%/locale/zh-CN/firebug-amo.properties
 %%XPI_XPIDIR%%/locale/zh-CN/firebug-tracing.properties
 %%XPI_XPIDIR%%/locale/zh-CN/firebug.properties
+%%XPI_XPIDIR%%/locale/zh-TW/firebug-amo.properties
+%%XPI_XPIDIR%%/locale/zh-TW/firebug-tracing.properties
 %%XPI_XPIDIR%%/locale/zh-TW/firebug.properties
-%%XPI_XPIDIR%%/modules/bti/arrayreference.js
-%%XPI_XPIDIR%%/modules/bti/breakpoint.js
-%%XPI_XPIDIR%%/modules/bti/browser.js
-%%XPI_XPIDIR%%/modules/bti/browsercontext.js
-%%XPI_XPIDIR%%/modules/bti/bti.js
-%%XPI_XPIDIR%%/modules/bti/compilationunit.js
-%%XPI_XPIDIR%%/modules/bti/functionreference.js
-%%XPI_XPIDIR%%/modules/bti/javascriptstack.js
-%%XPI_XPIDIR%%/modules/bti/lib.js
-%%XPI_XPIDIR%%/modules/bti/objectreference.js
-%%XPI_XPIDIR%%/modules/bti/primitive.js
-%%XPI_XPIDIR%%/modules/bti/property.js
-%%XPI_XPIDIR%%/modules/bti/stackframe.js
-%%XPI_XPIDIR%%/modules/bti/variable.js
-%%XPI_XPIDIR%%/modules/bti_mozilla/ClientBrowserTools.js
 %%XPI_XPIDIR%%/modules/debuggerHalter.js
 %%XPI_XPIDIR%%/modules/firebug-annotations.js
-%%XPI_XPIDIR%%/modules/firebug-channel-listener.js
 %%XPI_XPIDIR%%/modules/firebug-http-observer.js
-%%XPI_XPIDIR%%/modules/firebug-service-breakpoints.js
 %%XPI_XPIDIR%%/modules/firebug-service.js
 %%XPI_XPIDIR%%/modules/firebug-trace-service.js
 %%XPI_XPIDIR%%/modules/moduleLoader.js
 %%XPI_XPIDIR%%/modules/observer-service.js
+%%XPI_XPIDIR%%/modules/privacyService.js
+%%XPI_XPIDIR%%/modules/require-debug.js
 %%XPI_XPIDIR%%/modules/require.js
 %%XPI_XPIDIR%%/modules/storageService.js
-%%XPI_XPIDIR%%/platform/Darwin/chrome.manifest
 %%XPI_XPIDIR%%/skin/classic/Templarian_inspector.png
 %%XPI_XPIDIR%%/skin/classic/about.css
 %%XPI_XPIDIR%%/skin/classic/activation-menu-console.png
@@ -254,13 +283,10 @@
 %%XPI_XPIDIR%%/skin/classic/errorIcon.png
 %%XPI_XPIDIR%%/skin/classic/exe.png
 %%XPI_XPIDIR%%/skin/classic/firebug-gray-16.png
-%%XPI_XPIDIR%%/skin/classic/firebug-gray-24.png
 %%XPI_XPIDIR%%/skin/classic/firebug.css
 %%XPI_XPIDIR%%/skin/classic/firebug.png
 %%XPI_XPIDIR%%/skin/classic/firebug16.png
-%%XPI_XPIDIR%%/skin/classic/firebug24.png
 %%XPI_XPIDIR%%/skin/classic/firebug32.png
-%%XPI_XPIDIR%%/skin/classic/group.png
 %%XPI_XPIDIR%%/skin/classic/html.css
 %%XPI_XPIDIR%%/skin/classic/infoIcon.png
 %%XPI_XPIDIR%%/skin/classic/inspect.png
@@ -268,33 +294,14 @@
 %%XPI_XPIDIR%%/skin/classic/layout.css
 %%XPI_XPIDIR%%/skin/classic/loading_16.gif
 %%XPI_XPIDIR%%/skin/classic/mac/close.png
-%%XPI_XPIDIR%%/skin/classic/mac/closeActive.png
-%%XPI_XPIDIR%%/skin/classic/mac/closeHover.png
 %%XPI_XPIDIR%%/skin/classic/mac/commandHistory.png
 %%XPI_XPIDIR%%/skin/classic/mac/debugger.css
 %%XPI_XPIDIR%%/skin/classic/mac/detach.png
-%%XPI_XPIDIR%%/skin/classic/mac/detachActive.png
-%%XPI_XPIDIR%%/skin/classic/mac/detachHover.png
 %%XPI_XPIDIR%%/skin/classic/mac/firebug.css
-%%XPI_XPIDIR%%/skin/classic/mac/firebugMenu.png
-%%XPI_XPIDIR%%/skin/classic/mac/firebugMenuHover.png
-%%XPI_XPIDIR%%/skin/classic/mac/firebugMenuOpen.png
-%%XPI_XPIDIR%%/skin/classic/mac/hud-style-button-middle-background.png
 %%XPI_XPIDIR%%/skin/classic/mac/min.png
-%%XPI_XPIDIR%%/skin/classic/mac/minActive.png
-%%XPI_XPIDIR%%/skin/classic/mac/minHover.png
 %%XPI_XPIDIR%%/skin/classic/mac/panel.css
 %%XPI_XPIDIR%%/skin/classic/mac/search-panel-down.png
 %%XPI_XPIDIR%%/skin/classic/mac/search-panel.png
-%%XPI_XPIDIR%%/skin/classic/mac/tabBar.gif
-%%XPI_XPIDIR%%/skin/classic/mac/tabLeft.png
-%%XPI_XPIDIR%%/skin/classic/mac/tabLeftHover.png
-%%XPI_XPIDIR%%/skin/classic/mac/tabMid.png
-%%XPI_XPIDIR%%/skin/classic/mac/tabMidHover.png
-%%XPI_XPIDIR%%/skin/classic/mac/tabRight.png
-%%XPI_XPIDIR%%/skin/classic/mac/tabRightHover.png
-%%XPI_XPIDIR%%/skin/classic/mac/toolbar.gif
-%%XPI_XPIDIR%%/skin/classic/mac/traceConsole.css
 %%XPI_XPIDIR%%/skin/classic/mac/twistyClosed.png
 %%XPI_XPIDIR%%/skin/classic/mac/twistyOpen.png
 %%XPI_XPIDIR%%/skin/classic/mac/window.css
@@ -314,12 +321,10 @@
 %%XPI_XPIDIR%%/skin/classic/okIcon-sm.png
 %%XPI_XPIDIR%%/skin/classic/panel.css
 %%XPI_XPIDIR%%/skin/classic/panelbase.css
-%%XPI_XPIDIR%%/skin/classic/pause.png
-%%XPI_XPIDIR%%/skin/classic/pauseActive.png
-%%XPI_XPIDIR%%/skin/classic/pauseDisabled.png
 %%XPI_XPIDIR%%/skin/classic/rerun.png
 %%XPI_XPIDIR%%/skin/classic/rulerH.png
 %%XPI_XPIDIR%%/skin/classic/rulerV.png
+%%XPI_XPIDIR%%/skin/classic/search-close.png
 %%XPI_XPIDIR%%/skin/classic/search.png
 %%XPI_XPIDIR%%/skin/classic/stepInto.png
 %%XPI_XPIDIR%%/skin/classic/stepOut.png
@@ -329,62 +334,28 @@
 %%XPI_XPIDIR%%/skin/classic/tabbar/tab-bkgnd.png
 %%XPI_XPIDIR%%/skin/classic/tabbar/tab-hover-bkgnd.png
 %%XPI_XPIDIR%%/skin/classic/tableRep.css
-%%XPI_XPIDIR%%/skin/classic/trace/clear.png
-%%XPI_XPIDIR%%/skin/classic/trace/up.png
-%%XPI_XPIDIR%%/skin/classic/traceConsole.css
 %%XPI_XPIDIR%%/skin/classic/warningIcon.png
 %%XPI_XPIDIR%%/skin/classic/win/close.png
-%%XPI_XPIDIR%%/skin/classic/win/closeActive.png
-%%XPI_XPIDIR%%/skin/classic/win/closeHover.png
 %%XPI_XPIDIR%%/skin/classic/win/commandHistory.png
 %%XPI_XPIDIR%%/skin/classic/win/detach.png
-%%XPI_XPIDIR%%/skin/classic/win/detachActive.png
-%%XPI_XPIDIR%%/skin/classic/win/detachHover.png
 %%XPI_XPIDIR%%/skin/classic/win/down.png
-%%XPI_XPIDIR%%/skin/classic/win/downActive.png
-%%XPI_XPIDIR%%/skin/classic/win/downHover.png
 %%XPI_XPIDIR%%/skin/classic/win/firebug.css
 %%XPI_XPIDIR%%/skin/classic/win/min.png
-%%XPI_XPIDIR%%/skin/classic/win/minActive.png
-%%XPI_XPIDIR%%/skin/classic/win/minHover.png
 %%XPI_XPIDIR%%/skin/classic/win/off.png
-%%XPI_XPIDIR%%/skin/classic/win/offActive.png
-%%XPI_XPIDIR%%/skin/classic/win/offHover.png
 %%XPI_XPIDIR%%/skin/classic/win/panel.css
-%%XPI_XPIDIR%%/skin/classic/win/pause.png
-%%XPI_XPIDIR%%/skin/classic/win/pauseActive.png
-%%XPI_XPIDIR%%/skin/classic/win/pauseDisabled.png
-%%XPI_XPIDIR%%/skin/classic/win/tabBg.png
-%%XPI_XPIDIR%%/skin/classic/win/tabLeft.png
-%%XPI_XPIDIR%%/skin/classic/win/tabLeftHover.png
-%%XPI_XPIDIR%%/skin/classic/win/tabLeftUnselected.png
 %%XPI_XPIDIR%%/skin/classic/win/tabMenuTarget.png
 %%XPI_XPIDIR%%/skin/classic/win/tabMenuTargetHover.png
-%%XPI_XPIDIR%%/skin/classic/win/tabMid.png
-%%XPI_XPIDIR%%/skin/classic/win/tabMidHover.png
-%%XPI_XPIDIR%%/skin/classic/win/tabMidUnselected.png
-%%XPI_XPIDIR%%/skin/classic/win/tabRight.png
-%%XPI_XPIDIR%%/skin/classic/win/tabRightHover.png
-%%XPI_XPIDIR%%/skin/classic/win/tabRightUnselected.png
-%%XPI_XPIDIR%%/skin/classic/win/traceConsole.css
 %%XPI_XPIDIR%%/skin/classic/win/twistyClosed.png
 %%XPI_XPIDIR%%/skin/classic/win/twistyOpen.png
 %%XPI_XPIDIR%%/skin/classic/win/up.png
-%%XPI_XPIDIR%%/skin/classic/win/upActive.png
-%%XPI_XPIDIR%%/skin/classic/win/upHover.png
 %%XPI_XPIDIR%%/skin/classic/win/window.css
 %%XPI_XPIDIR%%/skin/classic/window.css
 @dirrm %%XPI_XPIDIR%%/skin/classic/win
-@dirrm %%XPI_XPIDIR%%/skin/classic/trace
 @dirrm %%XPI_XPIDIR%%/skin/classic/tabbar
 @dirrm %%XPI_XPIDIR%%/skin/classic/mac
 @dirrm %%XPI_XPIDIR%%/skin/classic/breakOn
 @dirrm %%XPI_XPIDIR%%/skin/classic
 @dirrm %%XPI_XPIDIR%%/skin
-@dirrm %%XPI_XPIDIR%%/platform/Darwin
-@dirrm %%XPI_XPIDIR%%/platform
-@dirrm %%XPI_XPIDIR%%/modules/bti_mozilla
-@dirrm %%XPI_XPIDIR%%/modules/bti
 @dirrm %%XPI_XPIDIR%%/modules
 @dirrm %%XPI_XPIDIR%%/locale/zh-TW
 @dirrm %%XPI_XPIDIR%%/locale/zh-CN
@@ -416,7 +387,7 @@
 @dirrm %%XPI_XPIDIR%%/locale/en-US
 @dirrm %%XPI_XPIDIR%%/locale/el
 @dirrm %%XPI_XPIDIR%%/locale/de
-@dirrm %%XPI_XPIDIR%%/locale/da-DK
+@dirrm %%XPI_XPIDIR%%/locale/da
 @dirrm %%XPI_XPIDIR%%/locale/cs
 @dirrm %%XPI_XPIDIR%%/locale/ca-AD
 @dirrm %%XPI_XPIDIR%%/locale/bg
@@ -426,9 +397,21 @@
 @dirrm %%XPI_XPIDIR%%/docs
 @dirrm %%XPI_XPIDIR%%/defaults/preferences
 @dirrm %%XPI_XPIDIR%%/defaults
-@dirrm %%XPI_XPIDIR%%/content/firebug/tests
-@dirrm %%XPI_XPIDIR%%/content/firebug/start-button
+@dirrm %%XPI_XPIDIR%%/content/firebug/trace
+@dirrm %%XPI_XPIDIR%%/content/firebug/net
 @dirrm %%XPI_XPIDIR%%/content/firebug/lib
-@dirrm %%XPI_XPIDIR%%/content/firebug/external
+@dirrm %%XPI_XPIDIR%%/content/firebug/js
+@dirrm %%XPI_XPIDIR%%/content/firebug/html
+@dirrm %%XPI_XPIDIR%%/content/firebug/firefox/start-button
+@dirrm %%XPI_XPIDIR%%/content/firebug/firefox
+@dirrm %%XPI_XPIDIR%%/content/firebug/editor/external
+@dirrm %%XPI_XPIDIR%%/content/firebug/editor
+@dirrm %%XPI_XPIDIR%%/content/firebug/dom
+@dirrm %%XPI_XPIDIR%%/content/firebug/css
+@dirrm %%XPI_XPIDIR%%/content/firebug/console
+@dirrm %%XPI_XPIDIR%%/content/firebug/chrome
+@dirrm %%XPI_XPIDIR%%/content/firebug/bti/inProcess
+@dirrm %%XPI_XPIDIR%%/content/firebug/bti
+@dirrm %%XPI_XPIDIR%%/content/firebug/accessible
 @dirrm %%XPI_XPIDIR%%/content/firebug
 @dirrm %%XPI_XPIDIR%%/content