3 files changed, 71 insertions, 222 deletions

diff --git a/www/xpi-unplug/Makefile b/www/xpi-unplug/Makefile
index 70b8275498ab..c111aec25fb8 100644
--- a/www/xpi-unplug/Makefile
+++ b/www/xpi-unplug/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	unplug
-DISTVERSION=	1.6.06
+DISTVERSION=	2.039
 DISTVERSIONSUFFIX=	-fx
 CATEGORIES=	www
 
-MAINTAINER=	miwi@FreeBSD.org
+MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Converts embedded media to html links
 
 XPI_ID=		unplug@compunach
diff --git a/www/xpi-unplug/distinfo b/www/xpi-unplug/distinfo
index dfc5360801a4..4ebd6624ea66 100644
--- a/www/xpi-unplug/distinfo
+++ b/www/xpi-unplug/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xpi/unplug-1.6.06-fx.xpi) = dd4e5b8017ade20501e7bd4973f0399db1b361db35c035874d0c116ed297dfeb
-SIZE (xpi/unplug-1.6.06-fx.xpi) = 237172
+SHA256 (xpi/unplug-2.039-fx.xpi) = 87a2d6b061dec7bcd132ed16bbe31c3f62caf8b0eeaf786da056919fe4509ab4
+SIZE (xpi/unplug-2.039-fx.xpi) = 103990
diff --git a/www/xpi-unplug/pkg-plist b/www/xpi-unplug/pkg-plist
index f0d0947d9b69..ac1ead368c00 100644
--- a/www/xpi-unplug/pkg-plist
+++ b/www/xpi-unplug/pkg-plist
@@ -1,227 +1,76 @@
-%%XPI_XPIDIR%%/LICENSE
-%%XPI_XPIDIR%%/chrome/content/flashunblock.css
-%%XPI_XPIDIR%%/chrome/content/flashunblock.xml
-%%XPI_XPIDIR%%/chrome/content/notfound.js
-%%XPI_XPIDIR%%/chrome/content/notfound.xul
-%%XPI_XPIDIR%%/chrome/content/overlay.xul
-%%XPI_XPIDIR%%/chrome/content/settings.xul
-%%XPI_XPIDIR%%/chrome/content/songbird.xul
-%%XPI_XPIDIR%%/chrome/content/streamsave.xul
-%%XPI_XPIDIR%%/chrome/content/unplug.js
-%%XPI_XPIDIR%%/chrome/content/unplug_extern.js
-%%XPI_XPIDIR%%/chrome/content/unplug_httpreq.js
-%%XPI_XPIDIR%%/chrome/content/unplug_playlist.js
-%%XPI_XPIDIR%%/chrome/content/unplug_rulez.js
-%%XPI_XPIDIR%%/chrome/content/unplug_settings.js
-%%XPI_XPIDIR%%/chrome/content/unplug_streamwiz.js
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/help_extern.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/help_flash.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/help_flv.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/help_notfound.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/help_playlist.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/help_playtext.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/help_programs.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/help_ram.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/help_rm.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/help_skim.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/help_stop.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/help_streamsave.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/notfound.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/overlay.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/pro_ftp.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/pro_mms.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/pro_other.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/pro_rtsp.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/settings.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/streamsave.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/unplug.properties
-%%XPI_XPIDIR%%/chrome/locale/unplug/en-US/zuul.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/help_extern.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/help_flash.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/help_flv.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/help_notfound.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/help_playlist.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/help_playtext.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/help_programs.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/help_ram.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/help_rm.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/help_skim.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/help_stop.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/help_streamsave.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/notfound.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/overlay.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/pro_ftp.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/pro_mms.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/pro_other.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/pro_rtsp.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/settings.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/streamsave.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/unplug.properties
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-AR/zuul.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/help_extern.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/help_flash.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/help_flv.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/help_notfound.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/help_playlist.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/help_playtext.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/help_programs.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/help_ram.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/help_rm.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/help_skim.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/help_stop.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/help_streamsave.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/notfound.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/overlay.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/pro_ftp.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/pro_mms.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/pro_other.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/pro_rtsp.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/settings.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/streamsave.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/unplug.properties
-%%XPI_XPIDIR%%/chrome/locale/unplug/es-ES/zuul.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/help_extern.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/help_flash.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/help_flv.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/help_notfound.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/help_playlist.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/help_playtext.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/help_programs.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/help_ram.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/help_rm.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/help_skim.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/help_stop.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/help_streamsave.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/notfound.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/overlay.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/pro_ftp.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/pro_mms.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/pro_other.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/pro_rtsp.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/settings.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/streamsave.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/unplug.properties
-%%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR/zuul.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/help_extern.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/help_flash.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/help_flv.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/help_notfound.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/help_playlist.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/help_playtext.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/help_programs.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/help_ram.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/help_rm.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/help_skim.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/help_stop.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/help_streamsave.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/notfound.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/overlay.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/pro_ftp.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/pro_mms.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/pro_other.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/pro_rtsp.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/settings.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/streamsave.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/unplug.properties
-%%XPI_XPIDIR%%/chrome/locale/unplug/it-IT/zuul.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/help_extern.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/help_flash.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/help_flv.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/help_notfound.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/help_playlist.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/help_playtext.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/help_programs.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/help_ram.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/help_rm.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/help_skim.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/help_stop.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/help_streamsave.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/notfound.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/overlay.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/pro_ftp.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/pro_mms.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/pro_other.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/pro_rtsp.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/settings.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/streamsave.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/unplug.properties
-%%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL/zuul.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/help_extern.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/help_flash.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/help_flv.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/help_notfound.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/help_playlist.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/help_playtext.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/help_programs.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/help_ram.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/help_rm.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/help_skim.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/help_stop.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/help_streamsave.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/notfound.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/overlay.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/pro_ftp.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/pro_mms.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/pro_other.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/pro_rtsp.html
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/settings.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/streamsave.dtd
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/unplug.properties
-%%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR/zuul.html
-%%XPI_XPIDIR%%/chrome/skin/config.png
-%%XPI_XPIDIR%%/chrome/skin/ftp.png
-%%XPI_XPIDIR%%/chrome/skin/help.png
-%%XPI_XPIDIR%%/chrome/skin/hexit.png
-%%XPI_XPIDIR%%/chrome/skin/lair_all.png
-%%XPI_XPIDIR%%/chrome/skin/lair_cache.png
-%%XPI_XPIDIR%%/chrome/skin/lair_config.png
-%%XPI_XPIDIR%%/chrome/skin/lair_dta.png
-%%XPI_XPIDIR%%/chrome/skin/lair_fxsave.png
-%%XPI_XPIDIR%%/chrome/skin/lair_helix.png
-%%XPI_XPIDIR%%/chrome/skin/lair_no.png
-%%XPI_XPIDIR%%/chrome/skin/lair_play.png
-%%XPI_XPIDIR%%/chrome/skin/lair_stream.png
-%%XPI_XPIDIR%%/chrome/skin/lair_turbo.png
-%%XPI_XPIDIR%%/chrome/skin/pagehog.png
-%%XPI_XPIDIR%%/chrome/skin/pagehogcheese.png
-%%XPI_XPIDIR%%/chrome/skin/songbird.css
+%%XPI_XPIDIR%%/chrome/content/common.js
+%%XPI_XPIDIR%%/chrome/content/config/config.js
+%%XPI_XPIDIR%%/chrome/content/config/config.xul
+%%XPI_XPIDIR%%/chrome/content/config/extern.js
+%%XPI_XPIDIR%%/chrome/content/config/extern.xul
+%%XPI_XPIDIR%%/chrome/content/display/download.js
+%%XPI_XPIDIR%%/chrome/content/display/extern/extern.js
+%%XPI_XPIDIR%%/chrome/content/display/extern/extern.xul
+%%XPI_XPIDIR%%/chrome/content/display/pop/pop.js
+%%XPI_XPIDIR%%/chrome/content/display/pop/pop.xul
+%%XPI_XPIDIR%%/chrome/content/overlay/all.js
+%%XPI_XPIDIR%%/chrome/content/overlay/firefox.js
+%%XPI_XPIDIR%%/chrome/content/overlay/firefox.xul
+%%XPI_XPIDIR%%/chrome/content/rules.xml
+%%XPI_XPIDIR%%/chrome/content/search/rules.js
+%%XPI_XPIDIR%%/chrome/content/search/search.js
+%%XPI_XPIDIR%%/chrome/locale/de-DE/common.dtd
+%%XPI_XPIDIR%%/chrome/locale/de-DE/config.dtd
+%%XPI_XPIDIR%%/chrome/locale/de-DE/overlay.dtd
+%%XPI_XPIDIR%%/chrome/locale/de-DE/searchpage.dtd
+%%XPI_XPIDIR%%/chrome/locale/de-DE/strings.txt
+%%XPI_XPIDIR%%/chrome/locale/en-US/common.dtd
+%%XPI_XPIDIR%%/chrome/locale/en-US/config.dtd
+%%XPI_XPIDIR%%/chrome/locale/en-US/overlay.dtd
+%%XPI_XPIDIR%%/chrome/locale/en-US/searchpage.dtd
+%%XPI_XPIDIR%%/chrome/locale/en-US/strings.txt
+%%XPI_XPIDIR%%/chrome/locale/hu-HU/common.dtd
+%%XPI_XPIDIR%%/chrome/locale/hu-HU/config.dtd
+%%XPI_XPIDIR%%/chrome/locale/hu-HU/overlay.dtd
+%%XPI_XPIDIR%%/chrome/locale/hu-HU/searchpage.dtd
+%%XPI_XPIDIR%%/chrome/locale/hu-HU/strings.txt
+%%XPI_XPIDIR%%/chrome/locale/pl-PL/common.dtd
+%%XPI_XPIDIR%%/chrome/locale/pl-PL/config.dtd
+%%XPI_XPIDIR%%/chrome/locale/pl-PL/overlay.dtd
+%%XPI_XPIDIR%%/chrome/locale/pl-PL/searchpage.dtd
+%%XPI_XPIDIR%%/chrome/locale/pl-PL/strings.txt
+%%XPI_XPIDIR%%/chrome/skin/extern.css
+%%XPI_XPIDIR%%/chrome/skin/overlay_firefox.css
+%%XPI_XPIDIR%%/chrome/skin/searchpage.css
+%%XPI_XPIDIR%%/chrome/skin/tango-16/applications-system.png
+%%XPI_XPIDIR%%/chrome/skin/tango-16/dialog-error.png
+%%XPI_XPIDIR%%/chrome/skin/tango-16/document-save-as.png
+%%XPI_XPIDIR%%/chrome/skin/tango-16/edit-copy.png
+%%XPI_XPIDIR%%/chrome/skin/tango-16/preferences-system.png
+%%XPI_XPIDIR%%/chrome/skin/tango-16/process-stop-disabled.png
+%%XPI_XPIDIR%%/chrome/skin/tango-16/process-stop.png
+%%XPI_XPIDIR%%/chrome/skin/tango-16/tab-new.png
+%%XPI_XPIDIR%%/chrome/skin/tango-16/window-new.png
+%%XPI_XPIDIR%%/chrome/skin/tango-16/window.png
+%%XPI_XPIDIR%%/chrome/skin/tango-32/dialog-information.png
+%%XPI_XPIDIR%%/chrome/skin/tango-32/document-save-as.png
+%%XPI_XPIDIR%%/chrome/skin/tango-32/mail-attachment.png
+%%XPI_XPIDIR%%/chrome/skin/tango-32/system-search.png
+%%XPI_XPIDIR%%/chrome/skin/unplug-16.png
 %%XPI_XPIDIR%%/chrome/skin/unplug-24.png
 %%XPI_XPIDIR%%/chrome/skin/unplug-32.png
-%%XPI_XPIDIR%%/chrome/skin/unplug-tool-sm.png
-%%XPI_XPIDIR%%/chrome/skin/unplug.css
-%%XPI_XPIDIR%%/chrome/skin/unplug.png
-%%XPI_XPIDIR%%/chrome/skin/unplug100.png
-%%XPI_XPIDIR%%/chrome/skin/unplug_large.css
-%%XPI_XPIDIR%%/chrome/skin/unplug_song.png
-%%XPI_XPIDIR%%/chrome/skin/unplug_song_hi.png
-%%XPI_XPIDIR%%/chrome/skin/unstar_data.png
-%%XPI_XPIDIR%%/chrome/skin/unstar_flv.png
-%%XPI_XPIDIR%%/chrome/skin/unstar_flvplay.png
-%%XPI_XPIDIR%%/chrome/skin/unstar_link.png
-%%XPI_XPIDIR%%/chrome/skin/unstar_me.png
-%%XPI_XPIDIR%%/chrome/skin/unstar_no.png
-%%XPI_XPIDIR%%/chrome/skin/unstar_play.png
-%%XPI_XPIDIR%%/chrome/skin/unstar_ram.png
-%%XPI_XPIDIR%%/chrome/skin/unstar_rm.png
-%%XPI_XPIDIR%%/chrome/skin/unstar_swf.png
-%%XPI_XPIDIR%%/chrome/skin/unstar_textplay.png
-%%XPI_XPIDIR%%/chrome/skin/unstar_torrent.png
-%%XPI_XPIDIR%%/chrome/skin/unstar_unknown.png
-%%XPI_XPIDIR%%/chrome/skin/unstar_web.png
-%%XPI_XPIDIR%%/chrome/skin/warn.png
 %%XPI_XPIDIR%%/chrome.manifest
-%%XPI_XPIDIR%%/defaults/preferences/cn_unplug.js
+%%XPI_XPIDIR%%/defaults/preferences/unplug2.js
 %%XPI_XPIDIR%%/install.rdf
+@dirrm %%XPI_XPIDIR%%/chrome/content/config
+@dirrm %%XPI_XPIDIR%%/chrome/content/display/extern
+@dirrm %%XPI_XPIDIR%%/chrome/content/display/pop
+@dirrm %%XPI_XPIDIR%%/chrome/content/display
+@dirrm %%XPI_XPIDIR%%/chrome/content/overlay
+@dirrm %%XPI_XPIDIR%%/chrome/content/search
 @dirrm %%XPI_XPIDIR%%/chrome/content
-@dirrm %%XPI_XPIDIR%%/chrome/locale/unplug/en-US
-@dirrm %%XPI_XPIDIR%%/chrome/locale/unplug/es-AR
-@dirrm %%XPI_XPIDIR%%/chrome/locale/unplug/es-ES
-@dirrm %%XPI_XPIDIR%%/chrome/locale/unplug/fr-FR
-@dirrm %%XPI_XPIDIR%%/chrome/locale/unplug/it-IT
-@dirrm %%XPI_XPIDIR%%/chrome/locale/unplug/nl-NL
-@dirrm %%XPI_XPIDIR%%/chrome/locale/unplug/pt-BR
-@dirrm %%XPI_XPIDIR%%/chrome/locale/unplug
+@dirrm %%XPI_XPIDIR%%/chrome/locale/de-DE
+@dirrm %%XPI_XPIDIR%%/chrome/locale/en-US
+@dirrm %%XPI_XPIDIR%%/chrome/locale/hu-HU
+@dirrm %%XPI_XPIDIR%%/chrome/locale/pl-PL
 @dirrm %%XPI_XPIDIR%%/chrome/locale
+@dirrm %%XPI_XPIDIR%%/chrome/skin/tango-16
+@dirrm %%XPI_XPIDIR%%/chrome/skin/tango-32
 @dirrm %%XPI_XPIDIR%%/chrome/skin
 @dirrm %%XPI_XPIDIR%%/chrome
 @dirrm %%XPI_XPIDIR%%/defaults/preferences