diff --git a/doc/ns3_html_theme/layout.html b/doc/ns3_html_theme/layout.html
index 3ec8c72f2..5a9806d95 100644
--- a/doc/ns3_html_theme/layout.html
+++ b/doc/ns3_html_theme/layout.html
@@ -36,13 +36,13 @@
 	<tr style="height: 56px;">
 	  <td id="projectlogo">
 	    <a id="ns3_home1"
-	       href="{{theme_site + theme_homepage}}">
+	       href="http://www.nsnam.org/">
 	       <img alt="ns-3 Logo"
 		    src="{{ pathto('_static/' + theme_logo, 1)}}"/>
 	    </a>
 	  </td>
 	  <td id="projecttext">
-	    <div id="projectbrief">{{ theme_projectbrief }} </div>
+	    <div id="projectbrief">A Discrete-Event Network Simulator</div>
 	      <span id="projectnumber"><script type="text/javascript">document.write(ns3_version)</script></span>
 	  </td>
 	      
@@ -50,11 +50,11 @@
 	    <div class="menu">
 	      <ul >
 	        <li><a id="ns3_home2"
-		       href="{{theme_site + theme_homepage}}"
+		       href="http://www.nsnam.org/"
 		       >&nbsp;&nbsp;Home</a>
 	        </li>
 	        <li><a id="ns3_wiki"
-		       href="{{theme_site + theme_wiki}}"
+		       href="http://www.nsnam.org/wiki"
 		       >Wiki</a>
 	        </li>
 	        <li><span
@@ -65,13 +65,13 @@
 		        onmouseover="mcancelclosetime()" 
 		        onmouseout="mclosetime()">
 		      <a id="ns3_man"
-			 href="{{theme_site + theme_release + theme_manual}}"
+			 href="http://www.nsnam.org/docs/manual/html/index.html"
 			 >Manual</a><br/>
 		      <a id="ns3_mod"
-			 href="{{theme_site + theme_release + theme_models}}"
+			 href="http://www.nsnam.org/docs/models/html/index.html"
 			 >Models</a><br/>
 		      <a id="ns3_api"
-			 href="{{theme_site + theme_release + theme_doxygen}}"
+			 href="http://www.nsnam.org/docs/doxygen/html/index.html"
 			 >API</a><br/>
 	        </li>
 	        <li><span
@@ -82,15 +82,14 @@
 		        onmouseover="mcancelclosetime()" 
 		        onmouseout="mclosetime()">
 		      <a id="ns3_tut"
-			 href="{{theme_site + theme_release + theme_tutorial}}"
+			 href="http://www.nsnam.org/docs/tutorial/html/index.html"
 			  >English</a><br/>
 		      <a id="ns3_ptbr"
-			 href="{{theme_site + theme_release + theme_tutport}}"
+			 href="http://www.nsnam.org/docs/tutorial-pt-br/html/index.html"
 			    >Portuguese</a><br/>
 	        </li>
 	        <li><a id="ns3_bugs"
-		       href="{{theme_site + theme_bugzilla}}"
-			>Bugs</a>
+		       href="http://www.nsnam.org/bugzilla/">Bugs</a>
 	        </li>
 	      </ul>
 	    </div>
diff --git a/doc/ns3_html_theme/ns3_doxy_header.html b/doc/ns3_html_theme/ns3_doxy_header.html
index 0a2a91514..8af5a3b2e 100644
--- a/doc/ns3_html_theme/ns3_doxy_header.html
+++ b/doc/ns3_html_theme/ns3_doxy_header.html
@@ -1,93 +1,99 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
-<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
-<link href="$relpath$tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="$relpath$jquery.js"></script>
-<script type="text/javascript" src="$relpath$dynsections.js"></script>
+  <head>
+    <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"></meta>
+    <meta http-equiv="X-UA-Compatible" content="IE=9"></meta>
+    <!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
+    <!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
+    <link href="$relpath$tabs.css" rel="stylesheet" type="text/css"></link>
+    <script type="text/javascript" src="$relpath$jquery.js"></script>
+    <script type="text/javascript" src="$relpath$dynsections.js"></script>
 $treeview
 $search
 $mathjax
-<link href="$relpath$doxygen.css" rel="stylesheet" type="text/css"/>
-<link href="$relpath$ns3_stylesheet.css" rel="stylesheet" type="text/css" />
-<link href="$relpath$favicon.ico" rel="shortcut icon" type="image/ico" />
-<script type="text/javascript" src="$relpath$drop-down-menu.js"></script>
-<script type="text/javascript" src="$relpath$ns3_version.js"></script>
-</head>
+    <link href="$relpath$doxygen.css" rel="stylesheet" type="text/css"></link>
+    <link href="$relpath$ns3_stylesheet.css" rel="stylesheet" type="text/css"></link>
+    <link href="$relpath$favicon.ico" rel="shortcut icon" type="image/ico"></link>
+    <script type="text/javascript" src="$relpath$drop-down-menu.js"></script>
+    <script type="text/javascript" src="$relpath$ns3_version.js"></script>
+    <script type="text/javascript" src="$relpath$ns3_links.js"></script>
+  </head>
 <body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+    <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 
-<!--BEGIN TITLEAREA-->
-<div id="titlearea">
-<table cellspacing="0" cellpadding="0" width="100%">
- <tbody>
- <tr style="height: 56px;">
-  <!--BEGIN PROJECT_LOGO-->
-  <td id="projectlogo">
-	<a href="https://www.nsnam.org/">
-	<img alt="$projectname Logo" src="$relpath$$projectlogo"/>
-        </a>
-  </td>
-  <!--END PROJECT_LOGO-->
-  <!--BEGIN PROJECT_NAME-->
-  <td id="projecttext">
-   <!--BEGIN PROJECT_BRIEF--><div id="projectbrief">$projectbrief</div><!--END PROJECT_BRIEF-->
-   <!--BEGIN PROJECT_NUMBER--><span id="projectnumber"><script type="text/javascript">document.write(ns3_version)</script></span><!--END PROJECT_NUMBER-->
+      <!--BEGIN TITLEAREA-->
+      <div id="titlearea">
+	<table cellspacing="0" cellpadding="0" width="100%">
+	  <tbody>
+	    <tr style="height: 56px;">
+	      <td id="projectlogo">
+		<a id="ns3_home1"
+		  href="http://www.nsnam.org/">
+		  <img alt="ns-3 Logo"
+		    src="$relpath$$projectlogo"/>
+		</a>
+	      </td>
+	      <td id="projecttext">
+		<div id="projectbrief">A Discrete-Event Network Simulator</div>
+		<span id="projectnumber"><script type="text/javascript">document.write(ns3_version)</script></span>
+		
+	      </td>
+	      <td id="ns3-menu">
+		<div class="menu">
+		  <ul >
+		    <li><a id="ns3_home2"
+			href="http://www.nsnam.org/"
+			>&nbsp;&nbsp;Home</a>
+		    </li>
+		    <li><a id="ns3_wiki"
+			href="http://www.nsnam.org/wiki/"
+			>Wiki</a>
+		    </li>
+		    <li><span
+			onmouseover="mopen('mDocs')" 
+			onmouseout="mclosetime()"
+			>Docs &nbsp;&nbsp;&nbsp;&#x25BC;</span>
+		      <div id="mDocs"
+			onmouseover="mcancelclosetime()" 
+			onmouseout="mclosetime()">
+			<a id="ns3_man"
+			  href="http://www.nsnam.org/docs/manual/html/index.html"
+			  >Manual</a><br/>
+			  <a id="ns3_mod"
+			    href="http://www.nsnam.org/docs/models/html/index.html"
+			    >Models</a><br/>
+			    <a id="ns3_api"
+			      href="http://www.nsnam.org/docs/doxygen/index.html"
+			      >API</a><br/>
+		    </li>
+		    <li><span
+			onmouseover="mopen('mTuts')" 
+			onmouseout="mclosetime()"
+			>Tutorials &nbsp;&#x25BC;</span>
+		      <div id="mTuts" 
+			onmouseover="mcancelclosetime()" 
+			onmouseout="mclosetime()">
+			<a id="ns3_tut"
+			  href="http://www.nsnam.org/docs/tutorial/html/index.html"
+			  >English</a><br/>
+			  <a id="ns3_ptbr"
+			    href="http://www.nsnam.org/docs/tutorial-pt-br/html/index.html"
+			    >Portuguese</a><br/>
+		    </li>
+		    <li><a id="ns3_bugs"
+			href="http://www.nsnam.org/bugzilla/">Bugs</a>
+		    </li>
+		  </ul>
+		</div>
+	      </td>
 
-  </td>
-  <!--END PROJECT_NAME-->
-  <!--BEGIN !PROJECT_NAME-->
-   <!--BEGIN PROJECT_BRIEF-->
-    <td style="padding-left: 0.5em;">
-    <div id="projectbrief">$projectbrief</div>
-    </td>
-   <!--END PROJECT_BRIEF-->
-  <!--END !PROJECT_NAME-->
-
-  <td id="ns3-menu">
-    <div class="menu">
-      <ul >
-        <li><a href="http://www.nsnam.org/">&nbsp;&nbsp;Home</a>
-        </li>
-        <li><a href="http://www.nsnam.org/developers/tools/wiki/">Wiki</a>
-        </li>
-        <li><span onmouseover="mopen('mDocs')" 
-              onmouseout="mclosetime()">Docs &nbsp;&nbsp;&nbsp;&#x25BC;</span>
-            <div id="mDocs"
-                onmouseover="mcancelclosetime()" 
-                onmouseout="mclosetime()">
-              <a href="http://www.nsnam.org/docs/release/3.14/manual/html/index.html">Manual</a><br/>
-              <a href="http://www.nsnam.org/docs/release/3.14/models/html/index.html">Models</a><br/>
-              <a href="http://www.nsnam.org/docs/release/3.14/theme_doxygen">API</a><br/>
-        </li>
-        <li><span onmouseover="mopen('mTuts')" 
-              onmouseout="mclosetime()">Tutorials &nbsp;&#x25BC;</span>
-            <div id="mTuts" 
-                onmouseover="mcancelclosetime()" 
-                onmouseout="mclosetime()">
-              <a href="http://www.nsnam.org/docs/release/3.14/tutorial/html/index.html">English</a><br/>
-              <a href="http://www.nsnam.org/docs/release/3.14/tutorial-pt-br/html/index.html">Portuguese</a><br/>
-        </li>
-        <li><a href="http://www.nsnam.org/developers/tools/bugzilla/">Bugs</a>
-        </li>
-      </ul>
-    </div>
-  </td>
-
-  <td id="projectsection">
-    <span style="margin-right:10px">API</span>
-  </td>
-  <!--BEGIN DISABLE_INDEX-->
-   <!--BEGIN SEARCHENGINE-->
-   <td>$searchbox</td>
-   <!--END SEARCHENGINE-->
-  <!--END DISABLE_INDEX-->
- </tr>
- </tbody>
-</table>
-</div>
+	      <td id="projectsection">
+		<span style="margin-right:10px">API</span>
+	      </td>
+	    </tr>
+	  </tbody>
+	</table>
+	<script  type="text/javascript">ns3_write_links()</script>
+      </div>
 <!--END TITLEAREA-->
 <!-- end header part -->
