diff --git a/template.php b/template.php
old mode 100755
new mode 100644
diff --git a/templates/page/page--gcweb.tpl.php b/templates/page/page--gcweb.tpl.php
index 22f6244..33fa6c9 100644
--- a/templates/page/page--gcweb.tpl.php
+++ b/templates/page/page--gcweb.tpl.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Default theme implementation to display a single Drupal page.
@@ -94,8 +95,8 @@
             <?php elseif ($logo): ?>
               <img alt="<?php print t('Government of Canada'); ?>" src="<?php print $logo; ?>"  />
             <?php endif; ?>
-          </a>
-        <?php endif; ?>
+            </a>
+          <?php endif; ?>
       </div>
       <section class="wb-mb-links col-xs-4 col-sm-3 visible-sm visible-xs" id="wb-glb-mn">
         <h2><?php print t('Search and menus'); ?></h2>
@@ -120,8 +121,8 @@
         </section>
     </div>
   </div>
-  <?php if (!empty($gcweb_cdn)): ?>
-    <nav role="navigation" id="wb-sm" class="wb-menu visible-md visible-lg" data-trgt="mb-pnl" data-ajax-replace="//cdn.canada.ca/gcweb-cdn-live/sitemenu/sitemenu-<?php print $language; ?>.html" typeof="SiteNavigationElement">
+  <?php if (!empty($gcweb_cdn_megamenu) && !empty($gcweb_cdn_megamenu_url)): ?>
+    <nav role="navigation" id="wb-sm" class="wb-menu visible-md visible-lg" data-trgt="mb-pnl" data-ajax-replace="<?php print $gcweb_cdn_megamenu_url . $language; ?>.html" typeof="SiteNavigationElement">
       <div class="pnl-strt <?php print $container_class; ?> nvbar">
         <h2 class="wb-inv"><?php print t('Topics menu'); ?></h2>
         <div class="row">
diff --git a/templates/panels/page--panels--gcweb.tpl.php b/templates/panels/page--panels--gcweb.tpl.php
index 3f8872e..771f168 100644
--- a/templates/panels/page--panels--gcweb.tpl.php
+++ b/templates/panels/page--panels--gcweb.tpl.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file
  * Default theme implementation to display a single Drupal page.
@@ -94,8 +95,8 @@
             <?php elseif ($logo): ?>
               <img alt="<?php print t('Government of Canada'); ?>" src="<?php print $logo; ?>"  />
             <?php endif; ?>
-          </a>
-        <?php endif; ?>
+            </a>
+          <?php endif; ?>
       </div>
       <section class="wb-mb-links col-xs-4 col-sm-3 visible-sm visible-xs" id="wb-glb-mn">
         <h2><?php print t('Search and menus'); ?></h2>
@@ -120,8 +121,8 @@
         </section>
     </div>
   </div>
-  <?php if (!empty($gcweb_cdn)): ?>
-    <nav role="navigation" id="wb-sm" class="wb-menu visible-md visible-lg" data-trgt="mb-pnl" data-ajax-replace="//cdn.canada.ca/gcweb-cdn-live/sitemenu/sitemenu-<?php print $language; ?>.html" typeof="SiteNavigationElement">
+  <?php if (!empty($gcweb_cdn_megamenu) && !empty($gcweb_cdn_megamenu_url)): ?>
+    <nav role="navigation" id="wb-sm" class="wb-menu visible-md visible-lg" data-trgt="mb-pnl" data-ajax-replace="<?php print $gcweb_cdn_megamenu_url . $language; ?>.html" typeof="SiteNavigationElement">
       <div class="pnl-strt <?php print $container_class; ?> nvbar">
         <h2 class="wb-inv"><?php print t('Topics menu'); ?></h2>
         <div class="row">
@@ -182,7 +183,7 @@
   </div>
 </main>
 <?php endif; ?>
-<?php if (!empty($gcweb_cdn) && empty($gcweb_election)): ?>
+<?php if (!empty($gcweb_cdn_goc_initiatives) && empty($gcweb_election)): ?>
   <aside class="gc-nttvs <?php print $container_class; ?>">
     <h2><?php print t('Government of Canada activities and initiatives') ?></h2>
     <div id="gcwb_prts" class="wb-eqht row" data-ajax-replace="//cdn.canada.ca/gcweb-cdn-live/features/features-<?php print $language; ?>.html">
diff --git a/templates/system/html.tpl.php b/templates/system/html.tpl.php
old mode 100755
new mode 100644
diff --git a/templates/system/page.vars.php b/templates/system/page.vars.php
index 830bf17..0cea7d7 100644
--- a/templates/system/page.vars.php
+++ b/templates/system/page.vars.php
@@ -279,20 +279,28 @@ function wetkit_bootstrap_preprocess_page(&$variables) {
 
     // CDN Support.
     if ($wxt_active == 'gcweb') {
+      // Setup the CDN variables.
+      // Support the legacy configurations.
       $gcweb_cdn = theme_get_setting('gcweb_cdn');
       if (!empty($gcweb_cdn)) {
-        $variables['gcweb_cdn'] = TRUE;
+        $variables['gcweb_cdn_megamenu'] = TRUE;
+        $variables['gcweb_cdn_megamenu_url'] = '//cdn.canada.ca/gcweb-cdn-live/sitemenu/sitemenu-';
+        $variables['gcweb_cdn_goc_initiatives'] = TRUE;
       }
+      // Otherwise use the new configurations.
       else {
-        $variables['gcweb_cdn'] = FALSE;
+        $gcweb_cdn_megamenu = theme_get_setting('gcweb_cdn_megamenu');
+        $variables['gcweb_cdn_megamenu'] = !empty($gcweb_cdn_megamenu) ? TRUE : FALSE;
+
+        $gcweb_cdn_megamenu_url = theme_get_setting('gcweb_cdn_megamenu_url');
+        $variables['gcweb_cdn_megamenu_url'] = !empty($gcweb_cdn_megamenu_url)? $gcweb_cdn_megamenu_url : '//cdn.canada.ca/gcweb-cdn-live/sitemenu/sitemenu-';
+
+        $gcweb_cdn_goc_initiatives = theme_get_setting('gcweb_cdn_goc_initiatives');
+        $variables['gcweb_cdn_goc_initiatives'] = !empty($gcweb_cdn_goc_initiatives) ? TRUE : FALSE;
       }
+
       $gcweb_election = theme_get_setting('gcweb_election');
-      if (!empty($gcweb_election)) {
-        $variables['gcweb_election'] = TRUE;
-      }
-      else {
-        $variables['gcweb_election'] = FALSE;
-      }
+      $variables['gcweb_election'] = (!empty($gcweb_election)) ? TRUE : FALSE;
     }
 
     // Visibility settings.
diff --git a/theme-settings.php b/theme-settings.php
index 86c4391..782a011 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -66,7 +66,6 @@ function wetkit_bootstrap_form_system_theme_settings_alter(&$form, $form_state,
     '#description'   => t('Specify the HTML ID of the element that the accessible-but-hidden “skip link” should link to. (<a href="!link">Read more about skip links</a>.)', array('!link' => 'http://drupal.org/node/467976')),
   );
 
-
   // Customization.
   $form['wetkit_customization'] = array(
     '#type' => 'fieldset',
@@ -144,16 +143,54 @@ function wetkit_bootstrap_form_system_theme_settings_alter(&$form, $form_state,
   );
 
   // GCWeb.
+  // Support the legacy configurations.
+  $gcweb_cdn = theme_get_setting('gcweb_cdn');
+  if (!empty($gcweb_cdn)) {
+    $gcweb_cdn_megamenu = TRUE;
+    $gcweb_cdn_megamenu_url = '//cdn.canada.ca/gcweb-cdn-live/sitemenu/sitemenu-';
+    $gcweb_cdn_goc_initiatives = TRUE;
+  }
+  // Otherwise use the new configurations.
+  else {
+    $gcweb_cdn_megamenu = theme_get_setting('gcweb_cdn_megamenu');
+    $gcweb_cdn_megamenu = !empty($gcweb_cdn_megamenu) ? TRUE : FALSE;
+
+    $gcweb_cdn_megamenu_url = theme_get_setting('gcweb_cdn_megamenu_url');
+    $gcweb_cdn_megamenu_url = !empty($gcweb_cdn_megamenu_url) ? $gcweb_cdn_megamenu_url : '//cdn.canada.ca/gcweb-cdn-live/sitemenu/sitemenu-';
+
+    $gcweb_cdn_goc_initiatives = theme_get_setting('gcweb_cdn_goc_initiatives');
+    $gcweb_cdn_goc_initiatives = !empty($gcweb_cdn_goc_initiatives) ? TRUE : FALSE;
+  }
+
   $form['wetkit_gcweb'] = array(
     '#type' => 'fieldset',
     '#title' => t('GCWeb'),
     '#group' => 'wetkit_bootstrap',
   );
-  $form['wetkit_gcweb']['gcweb_cdn'] = array(
+  $form['wetkit_gcweb']['gcweb_cdn_megamenu'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Toggle CDN for MegaMenu'),
+    '#default_value' => $gcweb_cdn_megamenu,
+    '#description' => t('If checked the GCWeb theme will use the CDN for the MegaMenu'),
+  );
+  $form['wetkit_gcweb']['gcweb_cdn_megamenu_url'] = array(
+    '#type' => 'textfield',
+    '#title' => t('CDN for MegaMenu'),
+    '#prefix' => '<div id="gcweb_cdn_megamenu_url">',
+    '#suffix' => '</div>',
+    '#default_value' => $gcweb_cdn_megamenu_url,
+    '#description' => t('The CDN to use for the MegaMenu. Will be appended with the language and .html (i.e.: en.html or fr.html)'),
+    '#states' => array(
+      'visible' => array(
+        ':input[name="gcweb_cdn_megamenu"]' => array('checked' => TRUE),
+      ),
+    ),
+  );
+  $form['wetkit_gcweb']['gcweb_cdn_goc_initiatives'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Toggle CDN for MegaMenu + GoC Initiatives'),
-    '#default_value' => theme_get_setting('gcweb_cdn'),
-    '#description' => t('If checked the GCWeb theme will use the CDN for MegaMenu + GoC Initiatives'),
+    '#title' => t('Toggle CDN for GoC Initiatives'),
+    '#default_value' => $gcweb_cdn_goc_initiatives,
+    '#description' => t('If checked the GCWeb theme will use the CDN for GoC Initiatives'),
   );
   $form['wetkit_gcweb']['gcweb_election'] = array(
     '#type' => 'checkbox',