diff --git a/suite/confvars.sh b/suite/confvars.sh
index 98114840611..2de000d064b 100755
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -21,7 +21,6 @@ MOZ_UPDATER=1
 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_HELP_VIEWER=1
 MOZ_MORK=1
 # Enable navigator.mozPay
 MOZ_PAY=1
diff --git a/suite/themes/modern/helpviewer/help.css b/suite/themes/modern/communicator/helpviewer/help.css
similarity index 100%
rename from suite/themes/modern/helpviewer/help.css
rename to suite/themes/modern/communicator/helpviewer/help.css
diff --git a/suite/themes/modern/helpviewer/helpFileLayout.css b/suite/themes/modern/communicator/helpviewer/helpFileLayout.css
similarity index 100%
rename from suite/themes/modern/helpviewer/helpFileLayout.css
rename to suite/themes/modern/communicator/helpviewer/helpFileLayout.css
diff --git a/suite/themes/modern/jar.mn b/suite/themes/modern/jar.mn
index d810a05ac67..dfe65810b76 100644
--- a/suite/themes/modern/jar.mn
+++ b/suite/themes/modern/jar.mn
@@ -8,7 +8,7 @@ modern.jar:
 % skin editor modern/1.0 %skin/modern/editor/
 % skin global modern/1.0 %skin/modern/global/
 % skin global-platform modern/1.0 %skin/modern/global/
-% skin help modern/1.0 %skin/modern/helpviewer/
+% skin help modern/1.0 %skin/modern/communicator/helpviewer/
 % skin messenger modern/1.0 %skin/modern/messenger/
 % skin mozapps modern/1.0 %skin/modern/mozapps/
 % skin navigator modern/1.0 %skin/modern/navigator/
@@ -72,6 +72,8 @@ modern.jar:
   skin/modern/communicator/feed-subscribe.css                      (communicator/feed-subscribe.css)
   skin/modern/communicator/feed-subscribe-ui.css                   (communicator/feed-subscribe-ui.css)
   skin/modern/communicator/fullscreen-video.css                    (communicator/fullscreen-video.css)
+  skin/modern/communicator/helpviewer/help.css                     (communicator/helpviewer/help.css)
+  skin/modern/communicator/helpviewer/helpFileLayout.css           (communicator/helpviewer/helpFileLayout.css)
   skin/modern/communicator/history/calendar.png                    (communicator/history/calendar.png)
   skin/modern/communicator/icons/alwaysAsk.png                     (communicator/icons/alwaysAsk.png)
   skin/modern/communicator/icons/application.png                   (communicator/icons/application.png)
@@ -392,8 +394,6 @@ modern.jar:
   skin/modern/global/tree/twisty-clsd.gif                          (global/tree/twisty-clsd.gif)
   skin/modern/global/tree/twisty-open.gif                          (global/tree/twisty-open.gif)
   skin/modern/global/tree/columnpicker.gif                         (global/tree/columnpicker.gif)
-  skin/modern/helpviewer/help.css                                  (helpviewer/help.css)
-  skin/modern/helpviewer/helpFileLayout.css                        (helpviewer/helpFileLayout.css)
   skin/modern/messenger/threadPaneLabels.css                       (messenger/threadPaneLabels.css)
   skin/modern/messenger/accountCentral.css                         (messenger/accountCentral.css)
   skin/modern/messenger/accountManage.css                          (messenger/accountManage.css)