diff --git a/webtools/addons/public/htdocs/extensions.php b/webtools/addons/public/htdocs/extensions.php
new file mode 100644
index 000000000000..32b9419bdbc4
--- /dev/null
+++ b/webtools/addons/public/htdocs/extensions.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Home page for extensions, switchable on application.
+ *
+ * @package amo
+ * @subpackage docs
+ */
+
+$currentTab = 'extensions';
+
+startProcessing('extensions.tpl', null, $compileId, 'nonav');
+require_once('includes.php');
+
+// If app is not set or empty, set it to null for our switch.
+$_GET['app'] = (!empty($_GET['app'])) ? $_GET['app'] : null;
+
+// Determine our application.
+switch( $_GET['app'] ) {
+    case 'mozilla':
+        $clean['app'] = 'Mozilla';
+        break;
+    case 'thunderbird':
+        $clean['app'] = 'Thunderbird';
+        break;
+    case 'firefox':
+    default:
+        $clean['app'] = 'Firefox';
+        break;
+}
+
+// $sql['app'] can equal $clean['app'] since it was assigned in a switch().
+// We have to ucfirst() it because the DB has caps.
+$sql['app'] = $clean['app'];
+
+// Get most popular extensions based on application.
+$db->query("
+    SELECT DISTINCT
+        TM.ID ID, 
+        TM.Name name, 
+        TM.downloadcount dc
+    FROM
+        main TM
+    INNER JOIN version TV ON TM.ID = TV.ID
+    INNER JOIN applications TA ON TV.AppID = TA.AppID
+    INNER JOIN os TOS ON TV.OSID = TOS.OSID
+    WHERE
+        AppName = '{$sql['app']}' AND 
+        downloadcount > '0' AND
+        approved = 'YES' AND
+        Type = 'E'
+    ORDER BY
+        downloadcount DESC 
+    LIMIT 
+        5 
+", SQL_ALL, SQL_ASSOC);
+
+$popularExtensions = $db->record;
+
+
+// Assign template variables.
+$tpl->assign(
+    array(  'popularExtensions' => $popularExtensions,
+            'title'             => $clean['app'].' Addons',
+            'currentTab'        => $currentTab)
+);
+?>
diff --git a/webtools/addons/public/htdocs/themes.php b/webtools/addons/public/htdocs/themes.php
new file mode 100644
index 000000000000..8d528e93c962
--- /dev/null
+++ b/webtools/addons/public/htdocs/themes.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Home page for extensions, switchable on application.
+ *
+ * @package amo
+ * @subpackage docs
+ */
+
+$currentTab = 'themes';
+
+startProcessing('themes.tpl', null, $compileId, 'nonav');
+require_once('includes.php');
+
+// If app is not set or empty, set it to null for our switch.
+$_GET['app'] = (!empty($_GET['app'])) ? $_GET['app'] : null;
+
+// Determine our application.
+switch( $_GET['app'] ) {
+    case 'mozilla':
+        $clean['app'] = 'Mozilla';
+        break;
+    case 'thunderbird':
+        $clean['app'] = 'Thunderbird';
+        break;
+    case 'firefox':
+    default:
+        $clean['app'] = 'Firefox';
+        break;
+}
+
+// $sql['app'] can equal $clean['app'] since it was assigned in a switch().
+// We have to ucfirst() it because the DB has caps.
+$sql['app'] = $clean['app'];
+
+// Get most popular extensions based on application.
+$db->query("
+    SELECT DISTINCT
+        TM.ID ID, 
+        TM.Name name, 
+        TM.downloadcount dc
+    FROM
+        main TM
+    INNER JOIN version TV ON TM.ID = TV.ID
+    INNER JOIN applications TA ON TV.AppID = TA.AppID
+    INNER JOIN os TOS ON TV.OSID = TOS.OSID
+    WHERE
+        AppName = '{$sql['app']}' AND 
+        downloadcount > '0' AND
+        approved = 'YES' AND
+        Type = 'E'
+    ORDER BY
+        downloadcount DESC 
+    LIMIT 
+        5 
+", SQL_ALL, SQL_ASSOC);
+
+$popularExtensions = $db->record;
+
+
+// Assign template variables.
+$tpl->assign(
+    array(  'popularExtensions' => $popularExtensions,
+            'title'             => $clean['app'].' Addons',
+            'currentTab'        => $currentTab)
+);
+?>
diff --git a/webtools/addons/public/tpl/extensions.tpl b/webtools/addons/public/tpl/extensions.tpl
new file mode 100644
index 000000000000..734d45223382
--- /dev/null
+++ b/webtools/addons/public/tpl/extensions.tpl
@@ -0,0 +1,7 @@
+<h1>Extensions</h1>
+
+<p>Description...</p>
+
+<h2>Fresh from the Oven</h2>
+
+<h2>Hot this Week</h2>
diff --git a/webtools/addons/public/tpl/themes.tpl b/webtools/addons/public/tpl/themes.tpl
new file mode 100644
index 000000000000..214a91d9969b
--- /dev/null
+++ b/webtools/addons/public/tpl/themes.tpl
@@ -0,0 +1,7 @@
+<h1>Themes</h1>
+
+<p>Description...</p>
+
+<h2>Fresh from the Oven</h2>
+
+<h2>Hot this Week</h2>