diff --git a/administrator/components/com_config/model/form/application.xml b/administrator/components/com_config/model/form/application.xml
index a6242254cd649..ec80b33b64940 100644
--- a/administrator/components/com_config/model/form/application.xml
+++ b/administrator/components/com_config/model/form/application.xml
@@ -20,7 +20,8 @@
 			default=""
 			label="COM_CONFIG_FIELD_CACHE_HANDLER_LABEL"
 			description="COM_CONFIG_FIELD_CACHE_HANDLER_DESC"
-			filter="word">
+			filter="word"
+			showon="caching:1,2">
 		</field>
 
 		<field
@@ -46,6 +47,7 @@
 			required="true"
 			filter="integer"
 			validate="number"
+			showon="caching:1,2"
 			size="6" />
 
 		<field
@@ -55,7 +57,7 @@
 			default="1"
 			label="COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_DESC"
-			showon="cache_handler:memcache"
+			showon="caching:1,2[AND]cache_handler:memcache"
 			filter="integer">
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
@@ -68,7 +70,7 @@
 			default="0"
 			label="COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_DESC"
-			showon="cache_handler:memcache"
+			showon="caching:1,2[AND]cache_handler:memcache"
 			filter="integer">
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
@@ -80,7 +82,7 @@
 			default="localhost"
 			label="COM_CONFIG_FIELD_MEMCACHE_HOST_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_HOST_DESC"
-			showon="cache_handler:memcache"
+			showon="caching:1,2[AND]cache_handler:memcache"
 			filter="string"
 			size="25" />
 
@@ -90,7 +92,7 @@
 			default="11211"
 			label="COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_PORT_DESC"
-			showon="cache_handler:memcache"
+			showon="caching:1,2[AND]cache_handler:memcache"
 			filter="integer"
 			size="5" />
 
@@ -101,7 +103,7 @@
 			default="1"
 			label="COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_DESC"
-			showon="cache_handler:memcached"
+			showon="caching:1,2[AND]cache_handler:memcached"
 			filter="integer">
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
@@ -114,7 +116,7 @@
 			default="0"
 			label="COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_DESC"
-			showon="cache_handler:memcached"
+			showon="caching:1,2[AND]cache_handler:memcached"
 			filter="integer">
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
@@ -126,7 +128,7 @@
 			default="localhost"
 			label="COM_CONFIG_FIELD_MEMCACHE_HOST_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_HOST_DESC"
-			showon="cache_handler:memcached"
+			showon="caching:1,2[AND]cache_handler:memcached"
 			filter="string"
 			size="25" />
 
@@ -136,7 +138,7 @@
 			default="11211"
 			label="COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL"
 			description="COM_CONFIG_FIELD_MEMCACHE_PORT_DESC"
-			showon="cache_handler:memcached"
+			showon="caching:1,2[AND]cache_handler:memcached"
 			filter="integer"
 			size="5" />
 
@@ -148,7 +150,7 @@
 			label="COM_CONFIG_FIELD_REDIS_PERSISTENT_LABEL"
 			description="COM_CONFIG_FIELD_REDIS_PERSISTENT_DESC"
 			filter="integer"
-			showon="cache_handler:redis">
+			showon="caching:1,2[AND]cache_handler:redis">
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -160,7 +162,7 @@
 			label="COM_CONFIG_FIELD_REDIS_HOST_LABEL"
 			description="COM_CONFIG_FIELD_REDIS_HOST_DESC"
 			filter="string"
-			showon="cache_handler:redis"
+			showon="caching:1,2[AND]cache_handler:redis"
 			size="25" />
 
 		<field
@@ -170,7 +172,7 @@
 			label="COM_CONFIG_FIELD_REDIS_PORT_LABEL"
 			description="COM_CONFIG_FIELD_REDIS_PORT_DESC"
 			filter="integer"
-			showon="cache_handler:redis"
+			showon="caching:1,2[AND]cache_handler:redis"
 			size="5" />
 
 		<field
@@ -179,7 +181,7 @@
 			label="COM_CONFIG_FIELD_REDIS_AUTH_LABEL"
 			description="COM_CONFIG_FIELD_REDIS_AUTH_DESC"
 			filter="raw"
-			showon="cache_handler:redis"
+			showon="caching:1,2[AND]cache_handler:redis"
 			autocomplete="off"
 			size="30" />
 
@@ -190,7 +192,7 @@
 			label="COM_CONFIG_FIELD_REDIS_DB_LABEL"
 			description="COM_CONFIG_FIELD_REDIS_DB_DESC"
 			filter="integer"
-			showon="cache_handler:redis"
+			showon="caching:1,2[AND]cache_handler:redis"
 			size="4" />
 	</fieldset>
 
@@ -426,7 +428,8 @@
 			default="mail"
 			label="COM_CONFIG_FIELD_MAIL_MAILER_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_MAILER_DESC"
-			filter="word">
+			filter="word"
+			showon="mailonline:1">
 			<option value="mail">COM_CONFIG_FIELD_VALUE_PHP_MAIL</option>
 			<option value="sendmail">COM_CONFIG_FIELD_VALUE_SENDMAIL</option>
 			<option value="smtp">COM_CONFIG_FIELD_VALUE_SMTP</option>
@@ -439,7 +442,8 @@
 			description="COM_CONFIG_FIELD_MAIL_FROM_EMAIL_DESC"
 			filter="string"
 			size="30"
-			validate="email" />
+			validate="email"
+			showon="mailonline:1" />
 
 		<field
 			name="fromname"
@@ -447,7 +451,8 @@
 			label="COM_CONFIG_FIELD_MAIL_FROM_NAME_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_FROM_NAME_DESC"
 			filter="string"
-			size="30" />
+			size="30"
+			showon="mailonline:1" />
 
 		<field
 			name="massmailoff"
@@ -456,7 +461,9 @@
 			default="0"
 			label="COM_CONFIG_FIELD_MAIL_MASSMAILOFF_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_MASSMAILOFF_DESC"
-			filter="integer">
+			filter="integer"
+			showon="mailonline:1"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -465,30 +472,38 @@
 			name="sendmail"
 			type="text"
 			default="/usr/sbin/sendmail"
-			showon="mailer:sendmail"
+			showon="mailonline:1[AND]mailer:sendmail"
 			label="COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_DESC"
 			filter="string"
 			size="30" />
 
 		<field
-			name="smtpauth"
-			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
-			showon="mailer:smtp"
-			label="COM_CONFIG_FIELD_MAIL_SMTP_AUTH_LABEL"
-			description="COM_CONFIG_FIELD_MAIL_SMTP_AUTH_DESC"
-			filter="integer">
-			<option value="1">JYES</option>
-			<option value="0">JNO</option>
-		</field>
+			name="smtphost"
+			type="text"
+			default="localhost"
+			showon="mailonline:1[AND]mailer:smtp"
+			label="COM_CONFIG_FIELD_MAIL_SMTP_HOST_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_SMTP_HOST_DESC"
+			filter="string"
+			size="30" />
+
+		<field
+			name="smtpport"
+			type="text"
+			default="25"
+			showon="mailonline:1[AND]mailer:smtp"
+			label="COM_CONFIG_FIELD_MAIL_SMTP_PORT_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_SMTP_PORT_DESC"
+			required="true"
+			filter="string"
+			size="6" />
 
 		<field
 			name="smtpsecure"
 			type="list"
 			default="none"
-			showon="mailer:smtp"
+			showon="mailonline:1[AND]mailer:smtp"
 			label="COM_CONFIG_FIELD_MAIL_SMTP_SECURE_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_SMTP_SECURE_DESC"
 			filter="word">
@@ -498,20 +513,22 @@
 		</field>
 
 		<field
-			name="smtpport"
-			type="text"
-			default="25"
-			showon="mailer:smtp"
-			label="COM_CONFIG_FIELD_MAIL_SMTP_PORT_LABEL"
-			description="COM_CONFIG_FIELD_MAIL_SMTP_PORT_DESC"
-			required="true"
-			filter="string"
-			size="6" />
+			name="smtpauth"
+			type="radio"
+			class="btn-group btn-group-yesno"
+			default="0"
+			showon="mailonline:1[AND]mailer:smtp"
+			label="COM_CONFIG_FIELD_MAIL_SMTP_AUTH_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_SMTP_AUTH_DESC"
+			filter="integer">
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
 
 		<field
 			name="smtpuser"
 			type="text"
-			showon="mailer:smtp"
+			showon="mailonline:1[AND]mailer:smtp[AND]smtpauth:1"
 			label="COM_CONFIG_FIELD_MAIL_SMTP_USERNAME_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_SMTP_USERNAME_DESC"
 			filter="string"
@@ -521,22 +538,12 @@
 		<field
 			name="smtppass"
 			type="password"
-			showon="mailer:smtp"
+			showon="mailonline:1[AND]mailer:smtp[AND]smtpauth:1"
 			label="COM_CONFIG_FIELD_MAIL_SMTP_PASSWORD_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_SMTP_PASSWORD_DESC"
 			filter="raw"
 			autocomplete="off"
 			size="30" />
-
-		<field
-			name="smtphost"
-			type="text"
-			default="localhost"
-			showon="mailer:smtp"
-			label="COM_CONFIG_FIELD_MAIL_SMTP_HOST_LABEL"
-			description="COM_CONFIG_FIELD_MAIL_SMTP_HOST_DESC"
-			filter="string"
-			size="30" />
 	</fieldset>
 
 	<fieldset
@@ -815,7 +822,8 @@
 			default="1"
 			label="COM_CONFIG_FIELD_SITE_DISPLAY_MESSAGE_LABEL"
 			description="COM_CONFIG_FIELD_SITE_DISPLAY_MESSAGE_DESC"
-			filter="integer">
+			filter="integer"
+			showon="offline:1">
 			<option value="0">JHIDE</option>
 			<option value="1">COM_CONFIG_FIELD_VALUE_DISPLAY_OFFLINE_MESSAGE_CUSTOM</option>
 			<option value="2">COM_CONFIG_FIELD_VALUE_DISPLAY_OFFLINE_MESSAGE_LANGUAGE</option>
@@ -828,13 +836,15 @@
 			description="COM_CONFIG_FIELD_OFFLINE_MESSAGE_DESC"
 			filter="safehtml"
 			cols="60"
-			rows="2" />
+			rows="2"
+			showon="offline:1[AND]display_offline_message:1" />
 
 		<field
 			name="offline_image"
 			type="media"
 			label="COM_CONFIG_FIELD_OFFLINE_IMAGE_LABEL"
-			description="COM_CONFIG_FIELD_OFFLINE_IMAGE_DESC" />
+			description="COM_CONFIG_FIELD_OFFLINE_IMAGE_DESC"
+			showon="offline:1" />
 
 		<field
 			name="frontediting"