diff --git a/README b/README
index 3c08c973f3fa151cf9a7f63faeff4bf1d6741560..7df063f95c1b9967b095a6caa66b95e1d902084a 100755
--- a/README
+++ b/README
@@ -129,12 +129,20 @@ General Update Instructions:
 
 Specific Update Instructions:
 
-Updates from versions before 1.17.2
-  A new configuration option $supportContactEmail was introduced to provide
-  the user a support contact address in case of errors. Please add a line
-  like the following to the SWITCHwayf configuration file config.php:
-  $supportContactEmail = 'your-support-contact@your.organisation.org';
-  If not set, the default address support-contact@example.org will be used.
+Updates from versions before 1.18
+  The following new configuration options were introduced:
+  
+  - $supportContactEmail
+  - $organizationLogoURL
+  - $organizationURL
+  - $faqURL
+  - $helpURL
+  - $privacyURL
+  
+  Have a look at config.dist.php in section 4. Appearance settings for a 
+  description on these settings. The make sure to configure them to config.php
+  which should contain your own configuration. Otherwise, default values
+  will be set.
 
 
 Updates from versions before 1.15
diff --git a/WAYF b/WAYF
index beb5de70f1472200a2bdcd8cb19072e89146e796..c7301a97b7b28c1539d7b3b2f99b3244d258aa9d 100755
--- a/WAYF
+++ b/WAYF
@@ -3,7 +3,7 @@
 /*
 ******************************************************************************
 SWITCHwayf
-Version: 1.17.2
+Version: 1.18
 Contact:  aai@switch.ch
 Web site: http://www.switch.ch/aai/wayf
 ******************************************************************************
@@ -13,10 +13,10 @@ Web site: http://www.switch.ch/aai/wayf
 // Load general configuration and template file
 /*------------------------------------------------*/
 
-require_once('config.php');
 require_once('templates.php');
 require_once('functions.php');
 require_once('languages.php');
+require_once('config.php');
 
 // Set P3P headers just in case they were not set in Apache already
 header('P3P: CP="NOI CUR DEVa OUR IND COM NAV PRE"');
diff --git a/config.dist.php b/config.dist.php
index 1ea76f97458f6270c022b7e1b0b425a12d72f873..bd3bbd8a9590ec4278520bd1c31f6a0eaba3eb29 100755
--- a/config.dist.php
+++ b/config.dist.php
@@ -1,34 +1,39 @@
 <?php // Copyright (c) 2013, SWITCH - Serving Swiss Universities
 
 //******************************************************************************
-// This file contains the WAYF/DS configuration. Adapt the settings to reflect
-// your environment and then do some testing before deploying the WAYF.
+// This file contains the configuration of SWITCHwayf, a light-weight 
+// implementation of a SAML Discovery Service. Adapt the settings to reflect
+// your environment and then do some testing before going into production.
+// Unless specifically set, default values will be used for all options.
 //******************************************************************************
 
 // 1. Language settings
 //*********************
-$defaultLanguage = 'en'; 
+// Language that is used by default if the language of the user's web browser
+// is not available in languages.php or custom-languages.php.
+// If string in local language is not available, english ('en') will be used
+// as last resort.
+//$defaultLanguage = 'en'; 
 
 // 2. Cookie settings
 //*******************
 
 // Domain within the WAYF cookie should be readable. Must start with a .
-$commonDomain = '.switch.ch';
+// $commonDomain = '.example.org';
 
 // Optionnal cookie name prefix in case you run several 
 // instances of the WAYF in the same domain. 
 // Example: $cookieNamePrefix = '_mywayf';
-$cookieNamePrefix = '';
+//$cookieNamePrefix = '';
 
 // Names of the cookies where to store the settings to temporarily
 // redirect users transparently to their last selected IdP
-$redirectCookieName = $cookieNamePrefix.'_redirect_user_idp';
-$redirectStateCookieName = $cookieNamePrefix.'_redirection_state';
+//$redirectCookieName = $cookieNamePrefix.'_redirect_user_idp';
 
 // Stores last selected IdPs 
 // This value shouldn't be changed because _saml_idp is the officilly
 // defined name in the SAML specification
-$SAMLDomainCookieName = $cookieNamePrefix.'_saml_idp';
+//$SAMLDomainCookieName = $cookieNamePrefix.'_saml_idp';
 
 // Stores last selected SP
 // This value can be choosen as you like because it is something specific
@@ -36,40 +41,40 @@ $SAMLDomainCookieName = $cookieNamePrefix.'_saml_idp';
 // information on a page in the same domain as $commonDomain by accessing
 // the federation metadata and parsing out the contact information of the 
 // selected IdP and SP using $SAMLDomainCookieName and $SPCookieName
-$SPCookieName = $cookieNamePrefix.'_saml_sp';
+//$SPCookieName = $cookieNamePrefix.'_saml_sp';
 
 // If enabled cookies are set/transmitted only via https connections
 // and the http only option is set to prevent javascripts from reading the
 // cookies
-$cookieSecurity = false;
+//$cookieSecurity = false;
 
 // Number of days longterm cookies should be valid
-$cookieValidity = 100;
+//$cookieValidity = 100;
 
 // 3. Features and extensions
 //***************************
 
 // Whether to show the checkbox to permanently remember a setting
-$showPermanentSetting = false;
+//$showPermanentSetting = false;
 
 // Whether or not to use the search-as-you-type feature of the drop down list
-$useImprovedDropDownList = true;
+//$useImprovedDropDownList = true;
 
 // Set to true in order to enable reading the Identity Provider from a SAML2 
 // metadata file defined below in $metadataFile
-$useSAML2Metadata = false; 
+//$useSAML2Metadata = false; 
 
   // If true parsed metadata should have precedence if there are entries defined 
   // in metadata as well as the local IDProviders configuration file.
   // Requires $useSAML2Metadata to be true
-  $SAML2MetaOverLocalConf = false;
+  //$SAML2MetaOverLocalConf = false;
 
   // If includeLocalConfEntries parameter is set to true, Identity Providers
   // not listed in metadata but defined in the local IDProviders file will also
   // be displayed in the drop down list. This is required if you need to add 
   // local exceptions over the federation metadata
   // Requires $useSAML2Metadata to be true
-  $includeLocalConfEntries = true;
+  //$includeLocalConfEntries = true;
 
   // Whether the return parameter is checked against SAML2 metadata or not
   // The Discovery Service specification says the DS SHOULD check this in order
@@ -78,7 +83,7 @@ $useSAML2Metadata = false;
   // contains an <idpdisc:DiscoveryResponse> or if the assertion consumer url 
   // check below is enabled
   // Requires $useSAML2Metadata to be true
-  $enableDSReturnParamCheck = true;
+  //$enableDSReturnParamCheck = true;
 
     // If true, the return parameter is checked for Service Providers that
     // don't have and <idpdisc:DiscoveryResponse> extension set. Instead of this
@@ -88,14 +93,17 @@ $useSAML2Metadata = false;
     // a <idpdisc:DiscoveryResponse> extension. It increases security for Service 
     // Provider's that don't have an <idpdisc:DiscoveryResponse> extensions.
     // Requires $useSAML2Metadata and $enableDSReturnParamCheck to be true
-    $useACURLsForReturnParamCheck = false;
+    //$useACURLsForReturnParamCheck = false;
 
 // Whether to turn on Kerberos support for Identity Provider preselection
-$useKerberos = false;
+//$useKerberos = false;
+
+  // A Kerboros-protected page that redirects back to the WAYF script
+  //$kerberosRedirectURL = '/myFederation/kerberosRedirect.php';
 
 // If enabled, the user's IP is used for a reverse DNS lookup whose resulting 
 // domain name then is matched with the URN values of the Identity Providers
-$useReverseDNSLookup = false;
+//$useReverseDNSLookup = false;
 
 // Whether the JavaScript required for embedding the WAYF
 // on a remote site should be generated or not
@@ -104,7 +112,7 @@ $useReverseDNSLookup = false;
 // (with some efforts) find out with a high probability from which 
 // organization a user is from. This could be misused for phishing attacks. 
 // Therefore, only enable this feature if you know what you are doing!
-$useEmbeddedWAYF = false;
+//$useEmbeddedWAYF = false;
 
   // If enabled the Embedded WAYF will prevent releasing information
   // about the user's preselected Identity Provider 
@@ -112,7 +120,7 @@ $useEmbeddedWAYF = false;
   // prevent preselecting the user's Identity Provider. Thus, users will have
   // to preselect their IdP each and every time
   // Requires $useEmbeddedWAYF to be true
-  $useEmbeddedWAYFPrivacyProtection = false;
+  //$useEmbeddedWAYFPrivacyProtection = false;
 
   // If enabled, the referer hostname of the request must match tan assertion 
   // consumer URL or a discovery URL of a Service Provider in $metadataSPFile
@@ -121,7 +129,7 @@ $useEmbeddedWAYF = false;
   // userfriendlyness.
   // Requires $useSAML2Metadata to be true and $useEmbeddedWAYFPrivacyProtection
   // to be false
-  $useEmbeddedWAYFRefererForPrivacyProtection = false;
+  //$useEmbeddedWAYFRefererForPrivacyProtection = false;
 
 // Whether or not to add the entityID of the preselected IdP to the
 // exported JSON/Text/PHP Code
@@ -130,40 +138,56 @@ $useEmbeddedWAYF = false;
 // in the world can easily find out with a high probability from which 
 // organization a user is from. This could be misused for phishing attacks. 
 // Therefore, only enable this feature if you know what you are doing!
-$exportPreselectedIdP = false;
+//$exportPreselectedIdP = false;
 
 // Whether to enable logging of WAYF/DS requests
 // If turned on make sure to also configure $WAYFLogFile
-$useLogging = true; 
+//$useLogging = true; 
+
+  // Where to log the access
+  // Make sure the web server user has write access to this file!
+  //$WAYFLogFile = '/var/log/apache2/wayf.log'; 
 
 
 // 4. Appearance settings
 //**************************
 
 // Name of the federation
-$federationName = 'SWITCHaai Federation';
+//$federationName = 'myFederation';
 
 // URL to send user to when clicking on federation logo
-$federationURL = 'http://www.switch.ch/aai/';
+// Insert %s as macro to be substituted by the language (e.g. 'en', 'de', 'fr', ...) the WAYF uses
+//$federationURL = 'http://www.example.org/myFed/';
+
+// Absolute URL to the federation logo that should be displayed in the Embedded WAYF
+//$logoURL = 'http://ds.example.org/SWITCHwayf/images/federation-logo.png'; 
+
+// Absolute URL to the small federation logo that should be displayed in the 
+// embedded WAYF if dimensions must be small
+//$smallLogoURL = 'http://ds.example.org/SWITCHwayf/images/small-federation-logo.png';
 
 // Support contact email address
-$supportContactEmail = 'helpdesk@example.org';
+//$supportContactEmail = 'helpdesk@example.org';
 
-// Use an absolute URL in case you want to use the embedded WAYF
-$imageURL = 'https://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['SCRIPT_NAME']).'/images';
+// Absolute URL to the logo of the organization operating this Discovery Service
+//$organizationLogoURL = 'https://ds.example.org/SWITCHwayf/images/organization-logo.png'; 
 
-// Absolute URL to point to css directory
-$cssURL = 'https://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['SCRIPT_NAME']).'/css';
+// Absolute URL to the organization's web page
+// Insert %s as macro to be substituted by the language (e.g. 'en', 'de', 'fr', ...) the WAYF uses
+//$organizationURL = 'http://www.example.org/'; 
 
-// Absolute URL to point to javascript directory
-$javascriptURL = 'https://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['SCRIPT_NAME']).'/js';
+// Absolute URL to an FAQ page
+// This entries local string is 'faq' in languages.php
+// Insert %s as macro to be substituted by the language (e.g. 'en', 'de', 'fr', ...) the WAYF uses
+//$faqURL = 'http://www.example.org/%s/myFed/faq/';
 
-// Absolute URL to the logo that should be displayed in the Embedded WAYF
-$logoURL = $imageURL.'/switch-aai-transparent.png'; 
+// Absolute URL to a help/support page
+// Insert %s as macro to be substituted by the language (e.g. 'en', 'de', 'fr', ...) the WAYF uses
+//$helpURL = 'http://www.example.org/%s/myFed/help/';
 
-// Absolute URL to the small logo that should be displayed in the 
-// embedded WAYF if dimensions must be small
-$smallLogoURL = $imageURL.'/switch-aai-transparent-small.png';
+// Absolute URL to a privacy policy page
+// Insert %s as macro to be substituted by the language (e.g. 'en', 'de', 'fr', ...) the WAYF uses
+//$privacyURL = 'http://www.example.org/%s/myFed/privacy/';
 
 
 // 5. Files and path settings
@@ -172,43 +196,43 @@ $smallLogoURL = $imageURL.'/switch-aai-transparent-small.png';
 // Set both config files to the same value if you don't want to use the 
 // the WAYF to read a (potential) automatically generated file that undergoes
 // some plausability checks before being used
-$IDPConfigFile = 'IDProvider.conf.php';
-$backupIDPConfigFile = 'IDProvider.conf.php';
+//$IDPConfigFile = 'IDProvider.conf.php';
+//$backupIDPConfigFile = 'IDProvider.conf.php';
 
 // Use $metadataFile as source federation's metadata.
-$metadataFile = '/etc/shibboleth/metadata.switchaai.xml';
+//$metadataFile = '/etc/shibboleth/metadata.myFederation.xml';
 
 // File to store the parsed IdP list
 // Will be updated automatically if the metadataFile modification time
 // is more recent than this file's
 // The user running the script must have permission to create $metadataIdpFile
-$metadataIDPFile = 'IDProvider.metadata.php';
+//$metadataIDPFile = 'IDProvider.metadata.php';
 
 // File to store the parsed SP list.
 // Will be updated automatically if the metadataFile modification time
 // is more recent than this file's
 // The user running the script must have permission to create $metadataIdpFile
-$metadataSPFile = 'SProvider.metadata.php';
+//$metadataSPFile = 'SProvider.metadata.php';
 
 // File to use as the lock file for writing the parsed IdP and SP lists.
 // The user running the script must have permission to write $metadataLockFile
-$metadataLockFile = '/tmp/wayf_metadata.lock';
+//$metadataLockFile = '/tmp/wayf_metadata.lock';
 
-// Where to log the access
-// Make sure the web server user has write access to this file!
-$WAYFLogFile = '/var/log/apache2/wayf.log'; 
+// Use an absolute URL in case you want to use the embedded WAYF
+//$imageURL = 'https://ds.example.org/SWITCHwayf/images';
 
+// Absolute URL to point to css directory
+//$cssURL = 'https://ds.example.org/SWITCHwayf/css';
 
-// 6. Other settings
-//******************
+// Absolute URL to point to javascript directory
+//$javascriptURL = 'https://ds.example.org/SWITCHwayf/js';
 
-// A Kerboros-protected soft link back to this script!
-$kerberosRedirectURL = '/SWITCHaai/kerberosRedirect.php';
 
 
 // Development mode settings
 //**************************
 // If the development mode is activated, PHP errors and warnings will be displayed
-$developmentMode = false;
+// on pages the SWITCHwayf generates
+//$developmentMode = false;
 
 ?>
diff --git a/default-body.php b/default-body.php
index ee48848a0b72c729f37d58dc96c3c4963b2bd157..100d22e4120b10aebd774d7ba5d8af9f11af7306 100644
--- a/default-body.php
+++ b/default-body.php
@@ -26,5 +26,7 @@
 	</div>
 </form>
 
+<?php if (getLocalString('additional_info') != '') { ?>
 <p><?php echo getLocalString('additional_info') ?></p>
+<?php } ?>
 <!-- Identity Provider Selection: End -->
diff --git a/default-embedded-wayf.php b/default-embedded-wayf.php
index 844072b0aa2dc6286830e6e93baacc536ab98235..fdf6a4e8be80b79d4db361831a7d15af20f669ed 100644
--- a/default-embedded-wayf.php
+++ b/default-embedded-wayf.php
@@ -11,7 +11,7 @@
 //////////////////// ESSENTIAL SETTINGS ////////////////////
 
 // URL of the WAYF to use
-// Examples: "https://wayf.switch.ch/SWITCHaai/WAYF", "https://wayf-test.switch.ch/aaitest/WAYF";
+// Examples: "https://wayf.example.org/SWITCHwayf/WAYF"
 // [Mandatory]
 var wayf_URL = "https://<?php echo $host ?><?php echo $path ?>";
 
@@ -127,7 +127,7 @@ var wayf_show_categories =  true;
 
 // EntityIDs of Identity Provider that should not be shown at all
 // Example of how to hide certain Identity Provider
-// var wayf_hide_idps = new Array("https://idp.unige.ch/idp/shibboleth", "https://lewotolo.switch.ch/idp/shibboleth");
+// var wayf_hide_idps = new Array("https://idp.unige.ch/idp/shibboleth", "https://aai-logon.switch.ch/idp/shibboleth");
 // [Optional, commented out by default]
 // var wayf_hide_idps = new Array();
 
@@ -143,7 +143,7 @@ var wayf_show_categories =  true;
 // var wayf_use_discovery_service = false;
 
 // Session Initiator URL of the Service Provider
-// Examples: "https://econf.switch.ch/Shibboleth.sso/Login", "https://dokeos.unige.ch/Shibboleth.sso/DS"
+// Examples: "https://interact.switch.ch/Shibboleth.sso/Login", "https://dokeos.unige.ch/Shibboleth.sso/DS"
 // This will implicitely be set to wayf_sp_samlDSURL = wayf_sp_handlerURL + "/Login";
 // or will be set automatically if the page where the Embedded WAYF is placed is called
 // with a 'return' and an 'entityID' GET Arguments
@@ -154,16 +154,15 @@ var wayf_show_categories =  true;
 // Default IdP to preselect when central WAYF couldn't guess IdP either
 // This is usually the case the first time ever a user accesses a resource
 // [Optional, default: commented out]
-// var wayf_default_idp = "https://aai.switch.ch/idp/shibboleth";
+// var wayf_default_idp = "https://aai-logon.switch.ch/idp/shibboleth";
 
 // Set a custom Assertion Consumer URL instead of
 // the default wayf_sp_handlerURL + '/SAML/POST'
 // Only relevant if wayf_use_discovery_service is false
-// Examples: "https://olat.uzh.ch/shib/samlaa", 
+// Examples: "https://my-app.switch.ch/custom/saml-implementation/samlaa"
 // This will implicitely be set to wayf_sp_samlACURL = wayf_sp_handlerURL + "/SAML/POST";
-// "https://foodle.feide.no/simplesaml/shib13/sp/AssertionConsumerService.php"
 // [Optional, commented out by default]
-// var wayf_sp_samlACURL = "https://maclh.switch.ch/foo/bar";
+// var wayf_sp_samlACURL = "https://my-app.switch.ch/custom/saml-implementation/samlaa";
 
 // Overwites the text of the checkbox if
 // wayf_show_remember_checkbox is set to true
@@ -215,7 +214,7 @@ var wayf_show_categories =  true;
 // var wayf_additional_idps = [ 
 //        
 //        {name:"International University X",
-//        entityID:"urn:mace:switch.ch:SWITCHaai:example.university.org",
+//        entityID:"urn:mace:example.org:example.university.org",
 //        SAML1SSOurl:"https://int.univ.org/shibboleth-idp/SSO"},
 //
 //        {name:"Some Other University",
diff --git a/default-header.php b/default-header.php
index 60d903fef3d168835b320334118e4b9b032a6322..7479af813dd4e5972b92ca8605c28f2cc6b6dd23 100644
--- a/default-header.php
+++ b/default-header.php
@@ -109,14 +109,14 @@
 <div id="container">
 	<div class="box">
 		<div id="header">
-			<a href="http://www.switch.ch/aai"><img src="<?php echo $logoURL ?>" alt="SWITCHaai" id="federationLogo"></a>
-			<a href="http://www.switch.ch/"><img src="<?php echo $imageURL ?>/switch-logo.png" alt="SWITCH" id="organisationLogo"></a>
+			<a href="<?php echo sprintf($federationURL, $language) ?>"><img src="<?php echo $logoURL ?>" alt="Federation Logo" id="federationLogo"></a>
+			<a href="<?php echo sprintf($organizationURL, $language) ?>"><img src="<?php echo $organizationLogoURL ?>" alt="Organization Logo" id="organisationLogo"></a>
 		</div>
 			<div id="content">
 				<ul class="menu">
-				  <li><a href="http://www.switch.ch/<?php echo $language ?>/aai/about/"><?php echo getLocalString('about_federation'); ?></a></li>
-				  <li class="last"><a href="http://www.switch.ch/<?php echo $language ?>/aai/faq/"><?php echo getLocalString('faq') ?></a></li>
-				  <li class="last"><a href="http://www.switch.ch/<?php echo $language ?>/aai/help/"><?php echo getLocalString('help') ?></a></li>
-				  <li class="last"><a href="http://www.switch.ch/<?php echo $language ?>/aai/privacy/"><?php echo getLocalString('privacy') ?></a></li>
+				  <li><a href="<?php echo sprintf($federationURL, $language) ?>"><?php echo getLocalString('about_federation'); ?></a></li>
+				  <li class="last"><a href="<?php echo sprintf($faqURL, $language) ?>"><?php echo getLocalString('faq') ?></a></li>
+				  <li class="last"><a href="<?php echo sprintf($helpURL, $language) ?>"><?php echo getLocalString('help') ?></a></li>
+				  <li class="last"><a href="<?php echo sprintf($privacyURL, $language) ?>"><?php echo getLocalString('privacy') ?></a></li>
 				</ul>
 <!-- Body: Start -->
diff --git a/functions.php b/functions.php
index 88696e147bb2e5684e872e7b2df3b88330121262..6ce96a6269a1418eebf5a8768ba5ce4500178229 100644
--- a/functions.php
+++ b/functions.php
@@ -32,11 +32,16 @@ function initConfigOptions(){
 	global $federationName;
 	global $supportContactEmail;
 	global $federationURL;
+	global $organizationURL;
+	global $faqURL;
+	global $helpURL;
+	global $privacyURL;
 	global $imageURL;
 	global $javascriptURL;
 	global $cssURL;
 	global $logoURL;
 	global $smallLogoURL;
+	global $organizationLogoURL;
 	global $IDPConfigFile;
 	global $backupIDPConfigFile;
 	global $metadataFile;
@@ -50,13 +55,13 @@ function initConfigOptions(){
 	// Set independet default configuration options
 	$defaults = array();
 	$defaults['defaultLanguage'] = 'en'; 
-	$defaults['commonDomain'] = '.switch.ch';
+	$defaults['commonDomain'] = getTopLevelDomain($_SERVER['SERVER_NAME']);
 	$defaults['cookieNamePrefix'] = '';
 	$defaults['cookieSecurity'] = false;
 	$defaults['cookieValidity'] = 100;
 	$defaults['showPermanentSetting'] = false;
 	$defaults['useImprovedDropDownList'] = true;
-	$defaults['useSAML2Metadata'] = true; 
+	$defaults['useSAML2Metadata'] = false; 
 	$defaults['SAML2MetaOverLocalConf'] = false;
 	$defaults['includeLocalConfEntries'] = true;
 	$defaults['enableDSReturnParamCheck'] = true;
@@ -68,9 +73,13 @@ function initConfigOptions(){
 	$defaults['useEmbeddedWAYFRefererForPrivacyProtection'] = false;
 	$defaults['useLogging'] = true; 
 	$defaults['exportPreselectedIdP'] = false;
-	$defaults['federationName'] = 'SWITCHaai Federation';
-	$defaults['federationURL'] = 'http://www.switch.ch/aai/';
-	$defaults['supportContactEmail'] = 'support-contact@example.org';
+	$defaults['federationName'] = 'Identity Federation';
+	$defaults['organizationURL'] = 'http://www.'.$defaults['commonDomain'];
+	$defaults['federationURL'] = $defaults['organizationURL'].'/aai';
+	$defaults['faqURL'] = $defaults['federationURL'].'/faq';
+	$defaults['helpURL'] = $defaults['federationURL'].'/help';
+	$defaults['privacyURL'] = $defaults['federationURL'].'/privacy';
+	$defaults['supportContactEmail'] = 'support-contact@'.$defaults['commonDomain'];
 	$defaults['imageURL'] = 'https://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['SCRIPT_NAME']).'/images';
 	$defaults['javascriptURL'] = 'https://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['SCRIPT_NAME']).'/js';
 	$defaults['cssURL'] = 'https://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['SCRIPT_NAME']).'/css';
@@ -97,8 +106,9 @@ function initConfigOptions(){
 	$defaults['redirectStateCookieName'] = $cookieNamePrefix.'_redirection_state';
 	$defaults['SAMLDomainCookieName'] = $cookieNamePrefix.'_saml_idp';
 	$defaults['SPCookieName'] = $cookieNamePrefix.'_saml_sp';
-	$defaults['logoURL'] = $imageURL.'/switch-aai-transparent.png'; 
-	$defaults['smallLogoURL'] = $imageURL.'/switch-aai-transparent-small.png';
+	$defaults['logoURL'] = $imageURL.'/federation-logo.png'; 
+	$defaults['smallLogoURL'] = $imageURL.'/small-federation-logo.png';
+	$defaults['organizationLogoURL'] = $imageURL.'/organization-logo.png';
 	
 	// Initialize dependent defaults
 	foreach($defaults as $key => $value){
diff --git a/images/federation-logo.png b/images/federation-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b23a83388ef6117145049dc327eec9ed33844fa
Binary files /dev/null and b/images/federation-logo.png differ
diff --git a/images/organization-logo.png b/images/organization-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a582904bdbb32034a8353fd286d44411bdd68bb
Binary files /dev/null and b/images/organization-logo.png differ
diff --git a/images/small-federation-logo.png b/images/small-federation-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cf7f1a937bc52aef91fc3b10f34a3334f9ec555
Binary files /dev/null and b/images/small-federation-logo.png differ
diff --git a/images/switch-aai-transparent-small.png b/images/switch-aai-transparent-small.png
deleted file mode 100644
index 09a9f4530edba19dafa7702a6753e8ca33b5939e..0000000000000000000000000000000000000000
Binary files a/images/switch-aai-transparent-small.png and /dev/null differ
diff --git a/images/switch-aai-transparent.png b/images/switch-aai-transparent.png
deleted file mode 100644
index 58bdb6e34f43b1240ed849581ef2507bb024ccec..0000000000000000000000000000000000000000
Binary files a/images/switch-aai-transparent.png and /dev/null differ
diff --git a/images/switch-logo.png b/images/switch-logo.png
deleted file mode 100644
index b93c9f2543c50f03d82a65e667ea3424bb850485..0000000000000000000000000000000000000000
Binary files a/images/switch-logo.png and /dev/null differ
diff --git a/images/switchaai-logo.png b/images/switchaai-logo.png
deleted file mode 100644
index 58bdb6e34f43b1240ed849581ef2507bb024ccec..0000000000000000000000000000000000000000
Binary files a/images/switchaai-logo.png and /dev/null differ
diff --git a/languages.php b/languages.php
index ce694aac31643b4a342b652f7cba3605ad08e6b0..63e738cf16d1bfbd849bcc078b158592c0f853eb 100755
--- a/languages.php
+++ b/languages.php
@@ -1,6 +1,6 @@
 <?php // Copyright (c) 2013, SWITCH - Serving Swiss Universities
 
-// WAYF localized language strings
+// Localized language strings for SWITCHwayf
 // Make sure to use HTML entities instead of plain UTF-8 characters for 
 // non-ASCII characters if you are using the Embedded WAYF. It could be that the
 // Embedded WAYF is used on non-UTF8 web pages, which then could cause 
@@ -8,13 +8,27 @@
 
 // English, default
 $langStrings['en'] = array (
+
+// You should customize the folowing three strings
+// Create a file custom-languages.php and override the following values with:
+// 
+// $langStrings['en']['about_federation'] = 'About Example Federation';
+// $langStrings['en']['additional_info'] = 'My <b>sample HTML content</b>';
+// 
+//
+// Set a string to '' in order to hide it
+// Note that any string in custom-languages.php will survive updates
+
+'about_federation' => 'About AAI',  // This string can be hidden by setting it to ''
+'about_organisation' => 'About SWITCH', // This string can be hidden by setting it to ''
+'additional_info' => '<a href="http://www.switch.ch/" target="_blank">SWITCH</a> provides innovative, unique internet services for the Swiss universities and internet users.', // This string can be hidden by setting it to ''
+
+// Generic strings
+'faq' => 'FAQ', // This string can be hidden by setting it to ''
+'help' => 'Help',// This string can be hidden by setting it to ''
+'privacy' => 'Privacy', // This string can be hidden by setting it to ''
 'title' => 'Home Organisation Selection',
-'header' => 'Select your Home Organisation',
-'about_federation' => 'About AAI',
-'about_organisation' => 'About SWITCH',
-'faq' => 'FAQ',
-'help' => 'Help',
-'privacy' => 'Privacy',
+'header' => 'Select your Home Organisation', 
 'make_selection' => 'You must select a valid Home Organisation.',
 'settings' => 'Default Home Organisation for this web browser',
 'permanent_select_header' => 'Permanently set your Home Organisation',
@@ -30,7 +44,6 @@ $langStrings['en'] = array (
 'select_idp' => 'Select the organisation you are affiliated with',
 'search_idp' => 'Type the name of the organisation you are affiliated with',
 'remember_selection' => 'Remember selection for this web browser session.',
-'additional_info' => '<a href="http://www.switch.ch/" target="_blank">SWITCH</a> provides innovative, unique internet services for the Swiss universities and internet users.',
 'invalid_user_idp' => 'There may be an error in the data you just submitted.<br>The value of your input <tt>\'%s\'</tt> is invalid.<br>Only the following values are allowed:',
 'contact_assistance' => 'Please contact <a href="mailto:%s">%s</a> for assistance.',
 'no_arguments' => 'No arguments received!',
@@ -55,13 +68,17 @@ $langStrings['en'] = array (
 
 // Deutsch
 $langStrings['de'] = array (
+// Read note on line 12
+'about_federation' => '&Uuml;ber AAI',  // This string can be hidden by setting it to ''
+'about_organisation' => '&Uuml;ber SWITCH',  // This string can be hidden by setting it to ''
+'additional_info' => '<a href="http://www.switch.ch/" target="_blank">SWITCH</a> erbringt innovative, einzigartige Internet-Dienstleistungen f&uuml;r die Schweizer Hochschulen und Internetbenutzer.',  // This string can be hidden by setting it to ''
+
+// Generic strings
+'faq' => 'FAQ',  // This string can be hidden by setting it to ''
+'help' => 'Hilfe', // This string can be hidden by setting it to ''
+'privacy' => 'Datenschutz', // This string can be hidden by setting it to ''
 'title' => 'Auswahl der Home Organisation',
 'header' => 'Home Organisation ausw&auml;hlen',
-'about_federation' => '&Uuml;ber AAI',
-'about_organisation' => '&Uuml;ber SWITCH',
-'faq' => 'FAQ',
-'help' => 'Hilfe',
-'privacy' => 'Datenschutz',
 'make_selection' => 'Sie m&uuml;ssen eine g&uuml;ltige Home Organisation ausw&auml;hlen',
 'settings' => 'Standard Home Organisation f&uuml;r diesen Webbrowser',
 'permanent_select_header' => 'Home Organisation speichern',
@@ -77,7 +94,6 @@ $langStrings['de'] = array (
 'select_idp' => 'W&auml;hlen Sie die Organisation aus, der Sie angeh&ouml;ren',
 'search_idp' => 'Tippen Sie den Namen der Organisation, der Sie angeh&ouml;ren',
 'remember_selection' => 'Auswahl f&uuml;r die laufende Webbrowser Sitzung speichern.',
-'additional_info' => '<a href="http://www.switch.ch/" target="_blank">SWITCH</a> erbringt innovative, einzigartige Internet-Dienstleistungen f&uuml;r die Schweizer Hochschulen und Internetbenutzer.',
 'invalid_user_idp' => 'M&ouml;glicherweise sind die &uuml;bermittelten Daten fehlerhaft.<br>Der Wert der Eingabe <tt>\'%s\'</tt> ist ung&uuml;ltig.<br>Es sind ausschliesslich die folgenden Wert erlaubt:',
 'contact_assistance' => 'F&uuml;r Unterst&uuml;tzung und Hilfe, kontaktieren Sie bitte <a href="mailto:%s">%s</a>.',
 'no_arguments' => 'Keine Argumente erhalten!',
@@ -101,13 +117,18 @@ $langStrings['de'] = array (
 
 // Francais
 $langStrings['fr'] =  array (
+
+// Read note on line 12
+'about_federation' => '&Agrave; propos de l\'AAI', // This string can be hidden by setting it to ''
+'about_organisation' => '&Agrave; propos de SWITCH', // This string can be hidden by setting it to ''
+'additional_info' => '<a href="http://www.switch.ch/" target="_blank">SWITCH</a> fournit des prestations innovantes et uniques pour les hautes &eacute;coles suisses et les utilisateurs d\'Internet.', // This string can be hidden by setting it to ''
+
+// Generic strings
+'faq' => 'FAQ', // This string can be hidden by setting it to ''
+'help' => 'Aide',// This string can be hidden by setting it to ''
+'privacy' => 'Protection des donn&eacute;es',// This string can be hidden by setting it to ''
 'title' => 'S&eacute;lection de votre Home Organisation',
 'header' => 'S&eacute;lectionnez votre Home Organisation',
-'about_federation' => '&Agrave; propos de l\'AAI',
-'about_organisation' => '&Agrave; propos de SWITCH',
-'faq' => 'FAQ',
-'help' => 'Aide',
-'privacy' => 'Protection des donn&eacute;es',
 'make_selection' => 'Vous devez s&eacute;lectionner une Home Organisation valide.',
 'settings' => 'Home Organisation par d&eacute;faut pour ce navigateur',
 'permanent_select_header' => 'D&eacute;finir une Home Organisation de fa&ccedil;on permanente',
@@ -123,7 +144,6 @@ $langStrings['fr'] =  array (
 'select_idp' => 'Veuillez s&eacute;lectionner l\'organisation &agrave; laquelle vous appartenez.',
 'search_idp' => 'Veuillez taper le nom de l\'organisation &agrave; laquelle vous appartenez.',
 'remember_selection' => 'Se souvenir de mon choix pour cette session.',
-'additional_info' => '<a href="http://www.switch.ch/" target="_blank">SWITCH</a> fournit des prestations innovantes et uniques pour les hautes &eacute;coles suisses et les utilisateurs d\'Internet.',
 'invalid_user_idp' => 'Une erreur s\'est produite.<br>La valeur de votre donn&eacute;e <tt>\'%s\'</tt> n\'est pas valide.<br>Seules ces valeurs sont admises :',
 'contact_assistance' => 'Contactez le support <a href="mailto:%s">%s</a> si l\'erreur persiste.',
 'no_arguments' => 'Pas de param&egrave;tre re&ccedil;u !',
@@ -142,13 +162,17 @@ $langStrings['fr'] =  array (
 
 // Italian
 $langStrings['it'] = array (
+// Read note on line 12
+'about_federation' => 'Informazioni su AAI', // This string can be hidden by setting it to ''
+'about_organisation' => 'Informazioni su SWITCH', // This string can be hidden by setting it to ''
+'additional_info' => '<a href="http://www.switch.ch/" target="_blank">SWITCH</a> eroga servizi Internet innovativi e unici per le scuole universitarie svizzere e per gli utenti di Internet.', // This string can be hidden by setting it to ''
+
+// Generic strings
+'faq' => 'FAQ', // This string can be hidden by setting it to ''
+'help' => 'Aiuto', // This string can be hidden by setting it to ''
+'privacy' => 'Protezione dei dati', // This string can be hidden by setting it to ''
 'title' => 'Selezione della vostra Home Organisation',
 'header' => 'Selezioni la sua Home Organisation',
-'about_federation' => 'Informazioni su AAI',
-'about_organisation' => 'Informazioni su SWITCH',
-'faq' => 'FAQ',
-'help' => 'Aiuto',
-'privacy' => 'Protezione dei dati',
 'make_selection' => 'Per favore, scelga una valida Home Organisation.',
 'settings' => 'Home Organisation predefinita per questo web browser.',
 'permanent_select_header' => 'Salvare la Home Organisation.',
@@ -164,7 +188,6 @@ $langStrings['it'] = array (
 'select_idp' => 'Selezioni l\'organizzazione con la quale &egrave; affiliato.',
 'search_idp' => 'Digitare il nome dell\'organizzazione con cui e\' affiliato.',
 'remember_selection' => 'Ricorda la selezione per questa sessione.',
-'additional_info' => '<a href="http://www.switch.ch/" target="_blank">SWITCH</a> eroga servizi Internet innovativi e unici per le scuole universitarie svizzere e per gli utenti di Internet.',
 'invalid_user_idp' => 'Errore nei parametri pervenuti.<br>Il valore del parametro <tt>\'%s\'</tt> non &#143; valido.<br>Solo i seguenti valori sono ammessi:',
 'contact_assistance' => 'Se l\' errore persiste, si prega di contattare <a href="mailto:%s">%s</a>.',
 'no_arguments' => 'Parametri non pervenuti!',
@@ -182,19 +205,23 @@ $langStrings['it'] = array (
 
 // Portuguese
 $langStrings['pt'] = array (
-'title' => 'SWITCHaai: Selec&ccedil;&atilde;o de Institui&ccedil;&atilde;o de Origem',
+// Read note on line 12
+'about_federation' => 'Sobre AAI', // This string can be hidden by setting it to ''
+'about_organisation' => 'Sobre a SWITCH', // This string can be hidden by setting it to ''
+'additional_info' => 'A SWITCH foundation &eacute; uma institui&ccedil;&atilde;o gere e opera a rede de investiga&ccedil;&atilde;o e ensino sui&ccedil;a por forma a garantir conectividade de alto desempenho &agrave; Internet e a redes de I&amp;D globais para o beneficio de uma educa&ccedil;&atilde;o superior na sui&ccedil;a', // This string can be hidden by setting it to ''
+
+// Generic strings
+'faq' => 'FAQ', // This string can be hidden by setting it to ''
+'help' => 'Ajuda', // This string can be hidden by setting it to ''
+'privacy' => 'Privacidade', // This string can be hidden by setting it to ''
+'title' => 'Selec&ccedil;&atilde;o de Institui&ccedil;&atilde;o de Origem',
 'header' => 'Seleccione a sua Institui&ccedil;&atilde;o de Origem',
-'about_federation' => 'Sobre AAI',
-'about_organisation' => 'Sobre a Switch',
-'faq' => 'FAQ',
-'help' => 'Ajuda',
-'privacy' => 'Privacidade',
 'make_selection' => 'Dever&aacute; seleccionar uma Institui&ccedil;&atilde;o de Origem V&aacute;lida',
 'settings' => 'Institui&ccedil;&atilde;o de Origem por defeito para este web browser',
 'permanent_select_header' => 'Defina permanentemente a sua Institui&ccedil;&atilde;o de Origem',
 'permanent_cookie' => 'Nesta p&aacute;gina poder&aacute; definir a sua <strong>Institui&ccedil;&atilde;o de Origem</strong> para este web browser. Defenir uma Institui&ccedil;&atilde;o de Origem levar&aacute; a que seja redireccionado directamente para a sua Institui&ccedil;&atilde;o de Origem aquando do acesso de recursos-AAI. N&atilde;o use esta funcionalidade se possuir v&aacute;rias contas de AAI.',
 'permanent_cookie_notice' => 'Por omiss&atilde;o a configura&ccedil;&atilde;o da sua institui&ccedil;&atilde;o de origem ter&acute; a funcionalidade de n&atilde;o ser necess&acute;rio seleccionar novamente recursos federados. A configura&ccedil;&atilde;o &ecute;:',
-'permanent_cookie_note' => 'Poder&aacute; efectuar um reset &agrave;s configura&ccedil;&otilde;es no url wayf.switch.ch/SWITCHaai/WAYF',
+'permanent_cookie_note' => 'Poder&aacute; efectuar um reset &agrave;s configura&ccedil;&otilde;es no url %s',
 'delete_permanent_cookie_button' => 'Reset',
 'goto_sp' => 'Salve e continue para a sua Institui&ccedil;&atilde;o de Origem',
 'permanently_remember_selection' => 'Memorize a sua selec&ccedil;&atilde;o permanentemente e passe o mecanismo WAYF apartir de agora.',
@@ -204,8 +231,6 @@ $langStrings['pt'] = array (
 'select_idp' => 'Seleccione a sua Institui&ccedil;&atilde;o de Origem',
 'no_idp' => 'N&atilde;o existem Organiza&ccedil;&otilde;es de Origem na federa&ccedil;&atilde;o \'<i>%s</i>\'',
 'remember_selection' => 'Memorize a selec&ccedil;&atilde;o para esta sess&atilde;o.',
-'import_swisssign' => 'A SWITCH recomenda <a href="http://www.switch.ch/pki/import.html" target="_blank">a importa&ccedil;&atilde;o do\'SwissSign Root CA Certificate\'</a> no seu browser. Desta forma, o seu browser estabelecer&acute; uma liga&ccedil;&atilde;o segura com os servidores AAI.',
-'additional_info' => 'A SWITCH foundation &eacute; uma institui&ccedil;&atilde;o gere e opera a rede de investiga&ccedil;&atilde;o e ensino sui&ccedil;a por forma a garantir conectividade de alto desempenho &agrave; Internet e a redes de I&amp;D globais para o beneficio de uma educa&ccedil;&atilde;o superior na sui&ccedil;a',
 'invalid_user_idp' => 'Poder&aacute; existir um erro nos dados que enviou.<br>Os valores enviados <tt>\'%s\'</tt> s&atilde;o inv&aacute;lidos.<br>Apenas os valores seguintes s&atilde;o permitidos:',
 'contact_assistance' => 'Contacte <a href="mailto:%s">%s</a> para assistencia.',
 'no_arguments' => 'Nenhum argumento recebido!',
diff --git a/templates.php b/templates.php
index 96a6d471b4901f18e0e3bbb98e69936bbe800c5a..cbe58a8bcb2236ffcc43abe33a6c30621557c0b1 100755
--- a/templates.php
+++ b/templates.php
@@ -16,7 +16,8 @@ if(!isset($_SERVER['REMOTE_ADDR']) || basename($_SERVER['SCRIPT_NAME']) == 'temp
 
 function printHeader(){
 
-	global $langStrings, $language, $imageURL, $javascriptURL, $cssURL, $logoURL, $useImprovedDropDownList;
+	global $langStrings, $language, $imageURL, $javascriptURL, $cssURL, $logoURL, $useImprovedDropDownList, $organizationLogoURL;
+	global $federationURL, $organizationURL, $faqURL, $helpURL, $privacyURL;
 	
 	// Check if custom header template exists
 	if(file_exists('custom-header.php')){