# HG changeset patch
# User Frank-Rainer Grahl <frgrahl@gmx.net>
# Date 1526409077 -7200
#      Tue May 15 20:31:17 2018 +0200
# Node ID a4ba53cf58acfd2d9dd37fd26b1ef1b5f009deb6
# Parent  0244df3553aee5ceea94b1ecaf0afeaa96cb1192
Bug 1451847 - Part 3. Use seamonkey instead of nightly as branding directory. r=IanN a=IanN

diff --git a/suite/branding/nightly/background.png b/suite/branding/seamonkey/background.png
rename from suite/branding/nightly/background.png
rename to suite/branding/seamonkey/background.png
diff --git a/suite/branding/nightly/branding.nsi b/suite/branding/seamonkey/branding.nsi
rename from suite/branding/nightly/branding.nsi
rename to suite/branding/seamonkey/branding.nsi
diff --git a/suite/branding/nightly/content/about.png b/suite/branding/seamonkey/content/about.png
rename from suite/branding/nightly/content/about.png
rename to suite/branding/seamonkey/content/about.png
diff --git a/suite/branding/nightly/content/aboutRights.js b/suite/branding/seamonkey/content/aboutRights.js
rename from suite/branding/nightly/content/aboutRights.js
rename to suite/branding/seamonkey/content/aboutRights.js
diff --git a/suite/branding/nightly/content/aboutRights.xhtml b/suite/branding/seamonkey/content/aboutRights.xhtml
rename from suite/branding/nightly/content/aboutRights.xhtml
rename to suite/branding/seamonkey/content/aboutRights.xhtml
diff --git a/suite/branding/nightly/content/jar.mn b/suite/branding/seamonkey/content/jar.mn
rename from suite/branding/nightly/content/jar.mn
rename to suite/branding/seamonkey/content/jar.mn
diff --git a/suite/branding/nightly/content/messenger-start-bg.png b/suite/branding/seamonkey/content/messenger-start-bg.png
rename from suite/branding/nightly/content/messenger-start-bg.png
rename to suite/branding/seamonkey/content/messenger-start-bg.png
diff --git a/suite/branding/nightly/content/messenger-start-hdr.png b/suite/branding/seamonkey/content/messenger-start-hdr.png
rename from suite/branding/nightly/content/messenger-start-hdr.png
rename to suite/branding/seamonkey/content/messenger-start-hdr.png
diff --git a/suite/branding/nightly/content/moz.build b/suite/branding/seamonkey/content/moz.build
rename from suite/branding/nightly/content/moz.build
rename to suite/branding/seamonkey/content/moz.build
diff --git a/suite/branding/nightly/default.png b/suite/branding/seamonkey/default.png
rename from suite/branding/nightly/default.png
rename to suite/branding/seamonkey/default.png
diff --git a/suite/branding/nightly/default128.png b/suite/branding/seamonkey/default128.png
rename from suite/branding/nightly/default128.png
rename to suite/branding/seamonkey/default128.png
diff --git a/suite/branding/nightly/default16.png b/suite/branding/seamonkey/default16.png
rename from suite/branding/nightly/default16.png
rename to suite/branding/seamonkey/default16.png
diff --git a/suite/branding/nightly/default48.png b/suite/branding/seamonkey/default48.png
rename from suite/branding/nightly/default48.png
rename to suite/branding/seamonkey/default48.png
diff --git a/suite/branding/nightly/default64.png b/suite/branding/seamonkey/default64.png
rename from suite/branding/nightly/default64.png
rename to suite/branding/seamonkey/default64.png
diff --git a/suite/branding/nightly/disk.icns b/suite/branding/seamonkey/disk.icns
rename from suite/branding/nightly/disk.icns
rename to suite/branding/seamonkey/disk.icns
diff --git a/suite/branding/nightly/document.icns b/suite/branding/seamonkey/document.icns
rename from suite/branding/nightly/document.icns
rename to suite/branding/seamonkey/document.icns
diff --git a/suite/branding/nightly/dsstore b/suite/branding/seamonkey/dsstore
rename from suite/branding/nightly/dsstore
rename to suite/branding/seamonkey/dsstore
diff --git a/suite/branding/nightly/icons/gtk/JSConsoleWindow.png b/suite/branding/seamonkey/icons/gtk/JSConsoleWindow.png
rename from suite/branding/nightly/icons/gtk/JSConsoleWindow.png
rename to suite/branding/seamonkey/icons/gtk/JSConsoleWindow.png
diff --git a/suite/branding/nightly/icons/gtk/JSConsoleWindow16.png b/suite/branding/seamonkey/icons/gtk/JSConsoleWindow16.png
rename from suite/branding/nightly/icons/gtk/JSConsoleWindow16.png
rename to suite/branding/seamonkey/icons/gtk/JSConsoleWindow16.png
diff --git a/suite/branding/nightly/icons/gtk/JSConsoleWindow48.png b/suite/branding/seamonkey/icons/gtk/JSConsoleWindow48.png
rename from suite/branding/nightly/icons/gtk/JSConsoleWindow48.png
rename to suite/branding/seamonkey/icons/gtk/JSConsoleWindow48.png
diff --git a/suite/branding/nightly/icons/gtk/abcardWindow.png b/suite/branding/seamonkey/icons/gtk/abcardWindow.png
rename from suite/branding/nightly/icons/gtk/abcardWindow.png
rename to suite/branding/seamonkey/icons/gtk/abcardWindow.png
diff --git a/suite/branding/nightly/icons/gtk/abcardWindow16.png b/suite/branding/seamonkey/icons/gtk/abcardWindow16.png
rename from suite/branding/nightly/icons/gtk/abcardWindow16.png
rename to suite/branding/seamonkey/icons/gtk/abcardWindow16.png
diff --git a/suite/branding/nightly/icons/gtk/abcardWindow48.png b/suite/branding/seamonkey/icons/gtk/abcardWindow48.png
rename from suite/branding/nightly/icons/gtk/abcardWindow48.png
rename to suite/branding/seamonkey/icons/gtk/abcardWindow48.png
diff --git a/suite/branding/nightly/icons/gtk/ablistWindow.png b/suite/branding/seamonkey/icons/gtk/ablistWindow.png
rename from suite/branding/nightly/icons/gtk/ablistWindow.png
rename to suite/branding/seamonkey/icons/gtk/ablistWindow.png
diff --git a/suite/branding/nightly/icons/gtk/ablistWindow16.png b/suite/branding/seamonkey/icons/gtk/ablistWindow16.png
rename from suite/branding/nightly/icons/gtk/ablistWindow16.png
rename to suite/branding/seamonkey/icons/gtk/ablistWindow16.png
diff --git a/suite/branding/nightly/icons/gtk/ablistWindow48.png b/suite/branding/seamonkey/icons/gtk/ablistWindow48.png
rename from suite/branding/nightly/icons/gtk/ablistWindow48.png
rename to suite/branding/seamonkey/icons/gtk/ablistWindow48.png
diff --git a/suite/branding/nightly/icons/gtk/addressbookWindow.png b/suite/branding/seamonkey/icons/gtk/addressbookWindow.png
rename from suite/branding/nightly/icons/gtk/addressbookWindow.png
rename to suite/branding/seamonkey/icons/gtk/addressbookWindow.png
diff --git a/suite/branding/nightly/icons/gtk/addressbookWindow16.png b/suite/branding/seamonkey/icons/gtk/addressbookWindow16.png
rename from suite/branding/nightly/icons/gtk/addressbookWindow16.png
rename to suite/branding/seamonkey/icons/gtk/addressbookWindow16.png
diff --git a/suite/branding/nightly/icons/gtk/addressbookWindow48.png b/suite/branding/seamonkey/icons/gtk/addressbookWindow48.png
rename from suite/branding/nightly/icons/gtk/addressbookWindow48.png
rename to suite/branding/seamonkey/icons/gtk/addressbookWindow48.png
diff --git a/suite/branding/nightly/icons/gtk/bookmarkproperties.png b/suite/branding/seamonkey/icons/gtk/bookmarkproperties.png
rename from suite/branding/nightly/icons/gtk/bookmarkproperties.png
rename to suite/branding/seamonkey/icons/gtk/bookmarkproperties.png
diff --git a/suite/branding/nightly/icons/gtk/bookmarkproperties16.png b/suite/branding/seamonkey/icons/gtk/bookmarkproperties16.png
rename from suite/branding/nightly/icons/gtk/bookmarkproperties16.png
rename to suite/branding/seamonkey/icons/gtk/bookmarkproperties16.png
diff --git a/suite/branding/nightly/icons/gtk/bookmarkproperties48.png b/suite/branding/seamonkey/icons/gtk/bookmarkproperties48.png
rename from suite/branding/nightly/icons/gtk/bookmarkproperties48.png
rename to suite/branding/seamonkey/icons/gtk/bookmarkproperties48.png
diff --git a/suite/branding/nightly/icons/gtk/downloadManager.png b/suite/branding/seamonkey/icons/gtk/downloadManager.png
rename from suite/branding/nightly/icons/gtk/downloadManager.png
rename to suite/branding/seamonkey/icons/gtk/downloadManager.png
diff --git a/suite/branding/nightly/icons/gtk/downloadManager16.png b/suite/branding/seamonkey/icons/gtk/downloadManager16.png
rename from suite/branding/nightly/icons/gtk/downloadManager16.png
rename to suite/branding/seamonkey/icons/gtk/downloadManager16.png
diff --git a/suite/branding/nightly/icons/gtk/downloadManager48.png b/suite/branding/seamonkey/icons/gtk/downloadManager48.png
rename from suite/branding/nightly/icons/gtk/downloadManager48.png
rename to suite/branding/seamonkey/icons/gtk/downloadManager48.png
diff --git a/suite/branding/nightly/icons/gtk/editorWindow.png b/suite/branding/seamonkey/icons/gtk/editorWindow.png
rename from suite/branding/nightly/icons/gtk/editorWindow.png
rename to suite/branding/seamonkey/icons/gtk/editorWindow.png
diff --git a/suite/branding/nightly/icons/gtk/editorWindow16.png b/suite/branding/seamonkey/icons/gtk/editorWindow16.png
rename from suite/branding/nightly/icons/gtk/editorWindow16.png
rename to suite/branding/seamonkey/icons/gtk/editorWindow16.png
diff --git a/suite/branding/nightly/icons/gtk/editorWindow48.png b/suite/branding/seamonkey/icons/gtk/editorWindow48.png
rename from suite/branding/nightly/icons/gtk/editorWindow48.png
rename to suite/branding/seamonkey/icons/gtk/editorWindow48.png
diff --git a/suite/branding/nightly/icons/gtk/findBookmarkWindow.png b/suite/branding/seamonkey/icons/gtk/findBookmarkWindow.png
rename from suite/branding/nightly/icons/gtk/findBookmarkWindow.png
rename to suite/branding/seamonkey/icons/gtk/findBookmarkWindow.png
diff --git a/suite/branding/nightly/icons/gtk/findBookmarkWindow16.png b/suite/branding/seamonkey/icons/gtk/findBookmarkWindow16.png
rename from suite/branding/nightly/icons/gtk/findBookmarkWindow16.png
rename to suite/branding/seamonkey/icons/gtk/findBookmarkWindow16.png
diff --git a/suite/branding/nightly/icons/gtk/findBookmarkWindow48.png b/suite/branding/seamonkey/icons/gtk/findBookmarkWindow48.png
rename from suite/branding/nightly/icons/gtk/findBookmarkWindow48.png
rename to suite/branding/seamonkey/icons/gtk/findBookmarkWindow48.png
diff --git a/suite/branding/nightly/icons/gtk/findHistoryWindow.png b/suite/branding/seamonkey/icons/gtk/findHistoryWindow.png
rename from suite/branding/nightly/icons/gtk/findHistoryWindow.png
rename to suite/branding/seamonkey/icons/gtk/findHistoryWindow.png
diff --git a/suite/branding/nightly/icons/gtk/findHistoryWindow16.png b/suite/branding/seamonkey/icons/gtk/findHistoryWindow16.png
rename from suite/branding/nightly/icons/gtk/findHistoryWindow16.png
rename to suite/branding/seamonkey/icons/gtk/findHistoryWindow16.png
diff --git a/suite/branding/nightly/icons/gtk/findHistoryWindow48.png b/suite/branding/seamonkey/icons/gtk/findHistoryWindow48.png
rename from suite/branding/nightly/icons/gtk/findHistoryWindow48.png
rename to suite/branding/seamonkey/icons/gtk/findHistoryWindow48.png
diff --git a/suite/branding/nightly/icons/gtk/history-window.png b/suite/branding/seamonkey/icons/gtk/history-window.png
rename from suite/branding/nightly/icons/gtk/history-window.png
rename to suite/branding/seamonkey/icons/gtk/history-window.png
diff --git a/suite/branding/nightly/icons/gtk/history-window16.png b/suite/branding/seamonkey/icons/gtk/history-window16.png
rename from suite/branding/nightly/icons/gtk/history-window16.png
rename to suite/branding/seamonkey/icons/gtk/history-window16.png
diff --git a/suite/branding/nightly/icons/gtk/history-window48.png b/suite/branding/seamonkey/icons/gtk/history-window48.png
rename from suite/branding/nightly/icons/gtk/history-window48.png
rename to suite/branding/seamonkey/icons/gtk/history-window48.png
diff --git a/suite/branding/nightly/icons/gtk/main-window.png b/suite/branding/seamonkey/icons/gtk/main-window.png
rename from suite/branding/nightly/icons/gtk/main-window.png
rename to suite/branding/seamonkey/icons/gtk/main-window.png
diff --git a/suite/branding/nightly/icons/gtk/main-window16.png b/suite/branding/seamonkey/icons/gtk/main-window16.png
rename from suite/branding/nightly/icons/gtk/main-window16.png
rename to suite/branding/seamonkey/icons/gtk/main-window16.png
diff --git a/suite/branding/nightly/icons/gtk/main-window48.png b/suite/branding/seamonkey/icons/gtk/main-window48.png
rename from suite/branding/nightly/icons/gtk/main-window48.png
rename to suite/branding/seamonkey/icons/gtk/main-window48.png
diff --git a/suite/branding/nightly/icons/gtk/messengerWindow.png b/suite/branding/seamonkey/icons/gtk/messengerWindow.png
rename from suite/branding/nightly/icons/gtk/messengerWindow.png
rename to suite/branding/seamonkey/icons/gtk/messengerWindow.png
diff --git a/suite/branding/nightly/icons/gtk/messengerWindow16.png b/suite/branding/seamonkey/icons/gtk/messengerWindow16.png
rename from suite/branding/nightly/icons/gtk/messengerWindow16.png
rename to suite/branding/seamonkey/icons/gtk/messengerWindow16.png
diff --git a/suite/branding/nightly/icons/gtk/messengerWindow48.png b/suite/branding/seamonkey/icons/gtk/messengerWindow48.png
rename from suite/branding/nightly/icons/gtk/messengerWindow48.png
rename to suite/branding/seamonkey/icons/gtk/messengerWindow48.png
diff --git a/suite/branding/nightly/icons/gtk/msgcomposeWindow.png b/suite/branding/seamonkey/icons/gtk/msgcomposeWindow.png
rename from suite/branding/nightly/icons/gtk/msgcomposeWindow.png
rename to suite/branding/seamonkey/icons/gtk/msgcomposeWindow.png
diff --git a/suite/branding/nightly/icons/gtk/msgcomposeWindow16.png b/suite/branding/seamonkey/icons/gtk/msgcomposeWindow16.png
rename from suite/branding/nightly/icons/gtk/msgcomposeWindow16.png
rename to suite/branding/seamonkey/icons/gtk/msgcomposeWindow16.png
diff --git a/suite/branding/nightly/icons/gtk/msgcomposeWindow48.png b/suite/branding/seamonkey/icons/gtk/msgcomposeWindow48.png
rename from suite/branding/nightly/icons/gtk/msgcomposeWindow48.png
rename to suite/branding/seamonkey/icons/gtk/msgcomposeWindow48.png
diff --git a/suite/branding/nightly/icons/gtk/places.png b/suite/branding/seamonkey/icons/gtk/places.png
rename from suite/branding/nightly/icons/gtk/places.png
rename to suite/branding/seamonkey/icons/gtk/places.png
diff --git a/suite/branding/nightly/icons/gtk/places16.png b/suite/branding/seamonkey/icons/gtk/places16.png
rename from suite/branding/nightly/icons/gtk/places16.png
rename to suite/branding/seamonkey/icons/gtk/places16.png
diff --git a/suite/branding/nightly/icons/gtk/places48.png b/suite/branding/seamonkey/icons/gtk/places48.png
rename from suite/branding/nightly/icons/gtk/places48.png
rename to suite/branding/seamonkey/icons/gtk/places48.png
diff --git a/suite/branding/nightly/icons/svg/JSConsoleWindow.svg b/suite/branding/seamonkey/icons/svg/JSConsoleWindow.svg
rename from suite/branding/nightly/icons/svg/JSConsoleWindow.svg
rename to suite/branding/seamonkey/icons/svg/JSConsoleWindow.svg
diff --git a/suite/branding/nightly/icons/svg/README b/suite/branding/seamonkey/icons/svg/README
rename from suite/branding/nightly/icons/svg/README
rename to suite/branding/seamonkey/icons/svg/README
--- a/suite/branding/nightly/icons/svg/README
+++ b/suite/branding/seamonkey/icons/svg/README
@@ -1,9 +1,9 @@
-suite/branding/nightly/icons/svg:
+suite/branding/seamonkey/icons/svg:
 This directory contains the base SVG images used for creation of the SeaMonkey
 window icons. The SVG images are not directly used in the software, but stored
 here for reference and as a base for possible later revisions or new icons
 that may be created in the future.
 
 All image files in this directory and images derived from them are licensed
 under the MPL 2 as follows:
 
diff --git a/suite/branding/nightly/icons/svg/abcardWindow.svg b/suite/branding/seamonkey/icons/svg/abcardWindow.svg
rename from suite/branding/nightly/icons/svg/abcardWindow.svg
rename to suite/branding/seamonkey/icons/svg/abcardWindow.svg
diff --git a/suite/branding/nightly/icons/svg/ablistWindow.svg b/suite/branding/seamonkey/icons/svg/ablistWindow.svg
rename from suite/branding/nightly/icons/svg/ablistWindow.svg
rename to suite/branding/seamonkey/icons/svg/ablistWindow.svg
diff --git a/suite/branding/nightly/icons/svg/addressbookWindow.svg b/suite/branding/seamonkey/icons/svg/addressbookWindow.svg
rename from suite/branding/nightly/icons/svg/addressbookWindow.svg
rename to suite/branding/seamonkey/icons/svg/addressbookWindow.svg
diff --git a/suite/branding/nightly/icons/svg/bookmarkproperties.svg b/suite/branding/seamonkey/icons/svg/bookmarkproperties.svg
rename from suite/branding/nightly/icons/svg/bookmarkproperties.svg
rename to suite/branding/seamonkey/icons/svg/bookmarkproperties.svg
diff --git a/suite/branding/nightly/icons/svg/downloadManager.svg b/suite/branding/seamonkey/icons/svg/downloadManager.svg
rename from suite/branding/nightly/icons/svg/downloadManager.svg
rename to suite/branding/seamonkey/icons/svg/downloadManager.svg
diff --git a/suite/branding/nightly/icons/svg/editorWindow.svg b/suite/branding/seamonkey/icons/svg/editorWindow.svg
rename from suite/branding/nightly/icons/svg/editorWindow.svg
rename to suite/branding/seamonkey/icons/svg/editorWindow.svg
diff --git a/suite/branding/nightly/icons/svg/findBookmarkWindow.svg b/suite/branding/seamonkey/icons/svg/findBookmarkWindow.svg
rename from suite/branding/nightly/icons/svg/findBookmarkWindow.svg
rename to suite/branding/seamonkey/icons/svg/findBookmarkWindow.svg
diff --git a/suite/branding/nightly/icons/svg/findHistoryWindow.svg b/suite/branding/seamonkey/icons/svg/findHistoryWindow.svg
rename from suite/branding/nightly/icons/svg/findHistoryWindow.svg
rename to suite/branding/seamonkey/icons/svg/findHistoryWindow.svg
diff --git a/suite/branding/nightly/icons/svg/history-window.svg b/suite/branding/seamonkey/icons/svg/history-window.svg
rename from suite/branding/nightly/icons/svg/history-window.svg
rename to suite/branding/seamonkey/icons/svg/history-window.svg
diff --git a/suite/branding/nightly/icons/svg/messengerWindow.svg b/suite/branding/seamonkey/icons/svg/messengerWindow.svg
rename from suite/branding/nightly/icons/svg/messengerWindow.svg
rename to suite/branding/seamonkey/icons/svg/messengerWindow.svg
diff --git a/suite/branding/nightly/icons/svg/msgcomposeWindow.svg b/suite/branding/seamonkey/icons/svg/msgcomposeWindow.svg
rename from suite/branding/nightly/icons/svg/msgcomposeWindow.svg
rename to suite/branding/seamonkey/icons/svg/msgcomposeWindow.svg
diff --git a/suite/branding/nightly/icons/svg/places.svg b/suite/branding/seamonkey/icons/svg/places.svg
rename from suite/branding/nightly/icons/svg/places.svg
rename to suite/branding/seamonkey/icons/svg/places.svg
diff --git a/suite/branding/nightly/icons/windows/JSConsoleWindow.ico b/suite/branding/seamonkey/icons/windows/JSConsoleWindow.ico
rename from suite/branding/nightly/icons/windows/JSConsoleWindow.ico
rename to suite/branding/seamonkey/icons/windows/JSConsoleWindow.ico
diff --git a/suite/branding/nightly/icons/windows/abcardWindow.ico b/suite/branding/seamonkey/icons/windows/abcardWindow.ico
rename from suite/branding/nightly/icons/windows/abcardWindow.ico
rename to suite/branding/seamonkey/icons/windows/abcardWindow.ico
diff --git a/suite/branding/nightly/icons/windows/ablistWindow.ico b/suite/branding/seamonkey/icons/windows/ablistWindow.ico
rename from suite/branding/nightly/icons/windows/ablistWindow.ico
rename to suite/branding/seamonkey/icons/windows/ablistWindow.ico
diff --git a/suite/branding/nightly/icons/windows/addressbookWindow.ico b/suite/branding/seamonkey/icons/windows/addressbookWindow.ico
rename from suite/branding/nightly/icons/windows/addressbookWindow.ico
rename to suite/branding/seamonkey/icons/windows/addressbookWindow.ico
diff --git a/suite/branding/nightly/icons/windows/bookmarkproperties.ico b/suite/branding/seamonkey/icons/windows/bookmarkproperties.ico
rename from suite/branding/nightly/icons/windows/bookmarkproperties.ico
rename to suite/branding/seamonkey/icons/windows/bookmarkproperties.ico
diff --git a/suite/branding/nightly/icons/windows/chatzilla-window.ico b/suite/branding/seamonkey/icons/windows/chatzilla-window.ico
rename from suite/branding/nightly/icons/windows/chatzilla-window.ico
rename to suite/branding/seamonkey/icons/windows/chatzilla-window.ico
diff --git a/suite/branding/nightly/icons/windows/downloadManager.ico b/suite/branding/seamonkey/icons/windows/downloadManager.ico
rename from suite/branding/nightly/icons/windows/downloadManager.ico
rename to suite/branding/seamonkey/icons/windows/downloadManager.ico
diff --git a/suite/branding/nightly/icons/windows/editorWindow.ico b/suite/branding/seamonkey/icons/windows/editorWindow.ico
rename from suite/branding/nightly/icons/windows/editorWindow.ico
rename to suite/branding/seamonkey/icons/windows/editorWindow.ico
diff --git a/suite/branding/nightly/icons/windows/findBookmarkWindow.ico b/suite/branding/seamonkey/icons/windows/findBookmarkWindow.ico
rename from suite/branding/nightly/icons/windows/findBookmarkWindow.ico
rename to suite/branding/seamonkey/icons/windows/findBookmarkWindow.ico
diff --git a/suite/branding/nightly/icons/windows/findHistoryWindow.ico b/suite/branding/seamonkey/icons/windows/findHistoryWindow.ico
rename from suite/branding/nightly/icons/windows/findHistoryWindow.ico
rename to suite/branding/seamonkey/icons/windows/findHistoryWindow.ico
diff --git a/suite/branding/nightly/icons/windows/gif-file.ico b/suite/branding/seamonkey/icons/windows/gif-file.ico
rename from suite/branding/nightly/icons/windows/gif-file.ico
rename to suite/branding/seamonkey/icons/windows/gif-file.ico
diff --git a/suite/branding/nightly/icons/windows/history-window.ico b/suite/branding/seamonkey/icons/windows/history-window.ico
rename from suite/branding/nightly/icons/windows/history-window.ico
rename to suite/branding/seamonkey/icons/windows/history-window.ico
diff --git a/suite/branding/nightly/icons/windows/html-file.ico b/suite/branding/seamonkey/icons/windows/html-file.ico
rename from suite/branding/nightly/icons/windows/html-file.ico
rename to suite/branding/seamonkey/icons/windows/html-file.ico
diff --git a/suite/branding/nightly/icons/windows/image-file.ico b/suite/branding/seamonkey/icons/windows/image-file.ico
rename from suite/branding/nightly/icons/windows/image-file.ico
rename to suite/branding/seamonkey/icons/windows/image-file.ico
diff --git a/suite/branding/nightly/icons/windows/jpeg-file.ico b/suite/branding/seamonkey/icons/windows/jpeg-file.ico
rename from suite/branding/nightly/icons/windows/jpeg-file.ico
rename to suite/branding/seamonkey/icons/windows/jpeg-file.ico
diff --git a/suite/branding/nightly/icons/windows/main-window.ico b/suite/branding/seamonkey/icons/windows/main-window.ico
rename from suite/branding/nightly/icons/windows/main-window.ico
rename to suite/branding/seamonkey/icons/windows/main-window.ico
diff --git a/suite/branding/nightly/icons/windows/messengerWindow.ico b/suite/branding/seamonkey/icons/windows/messengerWindow.ico
rename from suite/branding/nightly/icons/windows/messengerWindow.ico
rename to suite/branding/seamonkey/icons/windows/messengerWindow.ico
diff --git a/suite/branding/nightly/icons/windows/msgcomposeWindow.ico b/suite/branding/seamonkey/icons/windows/msgcomposeWindow.ico
rename from suite/branding/nightly/icons/windows/msgcomposeWindow.ico
rename to suite/branding/seamonkey/icons/windows/msgcomposeWindow.ico
diff --git a/suite/branding/nightly/icons/windows/places.ico b/suite/branding/seamonkey/icons/windows/places.ico
rename from suite/branding/nightly/icons/windows/places.ico
rename to suite/branding/seamonkey/icons/windows/places.ico
diff --git a/suite/branding/nightly/icons/windows/readme.txt b/suite/branding/seamonkey/icons/windows/readme.txt
rename from suite/branding/nightly/icons/windows/readme.txt
rename to suite/branding/seamonkey/icons/windows/readme.txt
diff --git a/suite/branding/nightly/icons/windows/script-file.ico b/suite/branding/seamonkey/icons/windows/script-file.ico
rename from suite/branding/nightly/icons/windows/script-file.ico
rename to suite/branding/seamonkey/icons/windows/script-file.ico
diff --git a/suite/branding/nightly/icons/windows/template-file.ico b/suite/branding/seamonkey/icons/windows/template-file.ico
rename from suite/branding/nightly/icons/windows/template-file.ico
rename to suite/branding/seamonkey/icons/windows/template-file.ico
diff --git a/suite/branding/nightly/icons/windows/template-window.ico b/suite/branding/seamonkey/icons/windows/template-window.ico
rename from suite/branding/nightly/icons/windows/template-window.ico
rename to suite/branding/seamonkey/icons/windows/template-window.ico
diff --git a/suite/branding/nightly/icons/windows/xml-file.ico b/suite/branding/seamonkey/icons/windows/xml-file.ico
rename from suite/branding/nightly/icons/windows/xml-file.ico
rename to suite/branding/seamonkey/icons/windows/xml-file.ico
diff --git a/suite/branding/nightly/icons/windows/xul-file.ico b/suite/branding/seamonkey/icons/windows/xul-file.ico
rename from suite/branding/nightly/icons/windows/xul-file.ico
rename to suite/branding/seamonkey/icons/windows/xul-file.ico
diff --git a/suite/branding/nightly/locales/en-US/brand.dtd b/suite/branding/seamonkey/locales/en-US/brand.dtd
rename from suite/branding/nightly/locales/en-US/brand.dtd
rename to suite/branding/seamonkey/locales/en-US/brand.dtd
diff --git a/suite/branding/nightly/locales/en-US/brand.properties b/suite/branding/seamonkey/locales/en-US/brand.properties
rename from suite/branding/nightly/locales/en-US/brand.properties
rename to suite/branding/seamonkey/locales/en-US/brand.properties
diff --git a/suite/branding/nightly/locales/jar.mn b/suite/branding/seamonkey/locales/jar.mn
rename from suite/branding/nightly/locales/jar.mn
rename to suite/branding/seamonkey/locales/jar.mn
diff --git a/suite/branding/nightly/locales/moz.build b/suite/branding/seamonkey/locales/moz.build
rename from suite/branding/nightly/locales/moz.build
rename to suite/branding/seamonkey/locales/moz.build
diff --git a/suite/branding/nightly/moz.build b/suite/branding/seamonkey/moz.build
rename from suite/branding/nightly/moz.build
rename to suite/branding/seamonkey/moz.build
diff --git a/suite/branding/nightly/seamonkey-branding.js b/suite/branding/seamonkey/seamonkey-branding.js
rename from suite/branding/nightly/seamonkey-branding.js
rename to suite/branding/seamonkey/seamonkey-branding.js
diff --git a/suite/branding/nightly/seamonkey.icns b/suite/branding/seamonkey/seamonkey.icns
rename from suite/branding/nightly/seamonkey.icns
rename to suite/branding/seamonkey/seamonkey.icns
diff --git a/suite/branding/nightly/wizHeader.bmp b/suite/branding/seamonkey/wizHeader.bmp
rename from suite/branding/nightly/wizHeader.bmp
rename to suite/branding/seamonkey/wizHeader.bmp
diff --git a/suite/branding/nightly/wizHeaderRTL.bmp b/suite/branding/seamonkey/wizHeaderRTL.bmp
rename from suite/branding/nightly/wizHeaderRTL.bmp
rename to suite/branding/seamonkey/wizHeaderRTL.bmp
diff --git a/suite/branding/nightly/wizWatermark.bmp b/suite/branding/seamonkey/wizWatermark.bmp
rename from suite/branding/nightly/wizWatermark.bmp
rename to suite/branding/seamonkey/wizWatermark.bmp
diff --git a/suite/confvars.sh b/suite/confvars.sh
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -5,18 +5,19 @@
 
 MOZ_APP_BASENAME=SeaMonkey
 MOZ_APP_VENDOR=Mozilla
 MOZ_APP_NAME=seamonkey
 MOZ_APP_DISPLAYNAME=SeaMonkey
 MOZ_LDAP_XPCOM=1
 MOZ_COMPOSER=1
 MOZ_SUITE=1
-MOZ_BRANDING_DIRECTORY=suite/branding/nightly
-MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/nightly
+MOZ_BRANDING_DIRECTORY=suite/branding/seamonkey
+MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/seamonkey
+
 MOZ_UPDATER=1
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
 ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=seamonkey-comm-central
 MOZ_MORK=1