diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index 70f825d2ab6..ed2ace451d3 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -446,31 +446,34 @@ endif
 STATIC_JAVA	= yes
 else
 MOZILLA_CLIENT	= 1
+MOZ_JSD		= 1
 DEFINES		+= -DMOZILLA_CLIENT
 endif
 
+ifndef MODULAR_NETLIB
+MOZ_COOKIEMANAGE	= 1
+endif
+
 ifdef MOZ_LITE
 NO_EDITOR	= 1
 NO_UNIX_LDAP	= 1
-MOZ_JSD		= 1
 MOZ_NAV_BUILD_PREFIX	= 1
-endif
-
-ifdef MOZ_MEDIUM
+else
 DEFINES		+= -DMOZ_COMMUNICATOR_IIDS
+MOZ_COMMUNICATOR_IIDS	= 1
+MOZ_COMMUNICATOR_CONFIG_JS	= 1
+MOZ_COPY_ALL_JARS	= 1
 ifndef NO_EDITOR
 DEFINES		+= -DEDITOR 
 MOZ_EDITOR	= 1
 # This should go away as soon as MOZ_EDITOR is adopted everywhere.
 EDITOR		= 1
 endif
-MOZ_JSD		= 1
-MOZ_COMMUNICATOR_IIDS	= 1
-MOZ_COMMUNICATOR_CONFIG_JS	= 1
-MOZ_COPY_ALL_JARS	= 1
+endif
+
+ifdef MOZ_MEDIUM
 ifndef MODULAR_NETLIB
 MOZ_SINGLESIGNON	= 1
-MOZ_COOKIEMANAGE	= 1
 endif
 ifndef MOZ_SECURITY
 NO_SECURITY	= 1
@@ -478,25 +481,12 @@ endif
 endif
 
 ifdef MOZ_DARK
-DEFINES		+= -DMOZ_COMMUNICATOR_IIDS -DMOZ_MAIL_NEWS -DMOZ_OFFLINE -DMOZ_TASKBAR -DMOZ_LDAP -DMOZ_NEO 
-#-DMOZ_CALENDAR
-ifndef NO_EDITOR
-DEFINES		+= -DEDITOR 
-MOZ_EDITOR	= 1
-# This should go away as soon as MOZ_EDITOR is adopted everywhere.
-EDITOR		= 1
-endif
-MOZ_JSD		= 1
-MOZ_COMMUNICATOR_IIDS	= 1
-MOZ_COMMUNICATOR_CONFIG_JS	= 1
-MOZ_COPY_ALL_JARS	= 1
-MOZ_OFFLINE	= 1
-MOZ_TASKBAR	= 1
+DEFINES		+= -DMOZ_LDAP -DMOZ_MAIL_NEWS -DMOZ_NEO -DMOZ_OFFLINE -DMOZ_TASKBAR
 MOZ_LDAP	= 1
 MOZ_MAIL_NEWS	= 1
-#MOZ_CALENDAR	= 1
 MOZ_NEO		= 1
-
+MOZ_OFFLINE	= 1
+MOZ_TASKBAR	= 1
 else
 ifdef MOZ_MAIL_COMPOSE
 DEFINES		+= -DMOZ_MAIL_COMPOSE