diff --git a/project/_Resources/tango/themes/Firefox-Thunderbird/Tango@Windows.xpi b/project/_Resources/tango/themes/Firefox-Thunderbird/Tango@Windows.xpi
deleted file mode 100644
index a87c0a6..0000000
Binary files a/project/_Resources/tango/themes/Firefox-Thunderbird/Tango@Windows.xpi and /dev/null differ
diff --git a/project/_Resources/tango/themes/Firefox/Tango-Extras@Windows.xpi b/project/_Resources/tango/themes/Firefox/tangofox-extras@haven667.xpi
similarity index 100%
rename from project/_Resources/tango/themes/Firefox/Tango-Extras@Windows.xpi
rename to project/_Resources/tango/themes/Firefox/tangofox-extras@haven667.xpi
diff --git a/project/_Resources/tango/themes/Firefox/tangofox@haven667.xpi b/project/_Resources/tango/themes/Firefox/tangofox@haven667.xpi
new file mode 100644
index 0000000..fb77837
Binary files /dev/null and b/project/_Resources/tango/themes/Firefox/tangofox@haven667.xpi differ
diff --git a/project/_Resources/tango/themes/Firefox-Thunderbird/Thunderbird/abcardWindow.ico b/project/_Resources/tango/themes/Thunderbird/icons/abcardWindow.ico
similarity index 100%
rename from project/_Resources/tango/themes/Firefox-Thunderbird/Thunderbird/abcardWindow.ico
rename to project/_Resources/tango/themes/Thunderbird/icons/abcardWindow.ico
diff --git a/project/_Resources/tango/themes/Firefox-Thunderbird/Thunderbird/addressbookWindow.ico b/project/_Resources/tango/themes/Thunderbird/icons/addressbookWindow.ico
similarity index 100%
rename from project/_Resources/tango/themes/Firefox-Thunderbird/Thunderbird/addressbookWindow.ico
rename to project/_Resources/tango/themes/Thunderbird/icons/addressbookWindow.ico
diff --git a/project/_Resources/tango/themes/Firefox-Thunderbird/Thunderbird/msgcomposeWindow.ico b/project/_Resources/tango/themes/Thunderbird/icons/msgcomposeWindow.ico
similarity index 100%
rename from project/_Resources/tango/themes/Firefox-Thunderbird/Thunderbird/msgcomposeWindow.ico
rename to project/_Resources/tango/themes/Thunderbird/icons/msgcomposeWindow.ico
diff --git a/project/_Resources/tango/themes/Thunderbird/tangobird@haven667.xpi b/project/_Resources/tango/themes/Thunderbird/tangobird@haven667.xpi
new file mode 100644
index 0000000..e8c7fc7
Binary files /dev/null and b/project/_Resources/tango/themes/Thunderbird/tangobird@haven667.xpi differ