diff --git a/404.php b/404.php
index 1089f0e..ab7f430 100644
--- a/404.php
+++ b/404.php
@@ -1,32 +1,31 @@
 <?php
-/*******************************************************************************
- * Copyright (c) 2014 Eclipse Foundation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014, 2018 Eclipse Foundation and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
- *    Denis Roy (Eclipse Foundation)
+ *    Denis Roy (Eclipse Foundation) - initial API and implementation
  *    Christopher Guindon (Eclipse Foundation)
- *******************************************************************************/
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php");
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
+require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
 $App = new App();
-$Nav = new Nav();
-$Menu = new Menu();
+$Theme = $App->getThemeClass();
 
-# Begin: page-specific settings.  Change these.
 $pageTitle = "404 File not found";
-$pageKeywords = "";
-$pageAuthor = "";
+$Theme->setPageTitle($pageTitle);
+$Theme->setPageKeywords("Eclipse Not Found, 404");
+$Theme->setPageAuthor("Denis Roy");
 
 // Place your html content in a file called content/en_pagename.php
 ob_start();
 include("content/en_" . $App->getScriptName());
 $html = ob_get_clean();
 
-# Generate the web page
-$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file
+$Theme->setHtml($html);
+$Theme->generatePage();
\ No newline at end of file
diff --git a/content/en_404.php b/content/en_404.php
index 5d66867..6af2d35 100644
--- a/content/en_404.php
+++ b/content/en_404.php
@@ -1,17 +1,17 @@
 <?php
-/*******************************************************************************
- * Copyright (c) 2014 Eclipse Foundation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2006-2014, 2018 Eclipse Foundation and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
- *    Denis Roy (Eclipse Foundation)
+ *    Denis Roy (Eclipse Foundation) - initial API and implementation
  *    Christopher Guindon (Eclipse Foundation)
- *******************************************************************************/
-//if name of the file requested is the same as the current file, the script will exit directly.
-if(basename(__FILE__) == basename($_SERVER['PHP_SELF'])){exit();}
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 ?>
 <div id="fullcolumn">
   <div id="midcolumn">