diff --git a/templates/analytics/activity.html b/templates/analytics/activity.html
index 9b9d9eda83..2fb49123bc 100644
--- a/templates/analytics/activity.html
+++ b/templates/analytics/activity.html
@@ -1,4 +1,5 @@
 {% extends "zerver/base.html" %}
+{% set entrypoint = "activity" %}
 
 {# User Activity. #}
 
@@ -7,11 +8,6 @@
 {% endblock %}
 
 
-{% block customhead %}
-{{ super() }}
-{{ bundle('activity') }}
-{% endblock %}
-
 {% block content %}
 
     {% if not is_home %}
diff --git a/templates/analytics/stats.html b/templates/analytics/stats.html
index 449f4a25da..b222338533 100644
--- a/templates/analytics/stats.html
+++ b/templates/analytics/stats.html
@@ -1,15 +1,9 @@
 {% extends "zerver/base.html" %}
-
-{% block customhead %}
-{{ bundle('portico') }}
-{% endblock %}
+{% set entrypoint = "stats" %}
 
 {% block content %}
 <div class="app portico-page">
 
-    {{ bundle('translations') }}
-    {{ bundle('stats') }}
-
     <div class="page-content">
         <div id="id_stats_errors" class="alert alert-error"></div>
         <div class="center-charts">
diff --git a/templates/analytics/support.html b/templates/analytics/support.html
index e39faa35b5..c9ce11190c 100644
--- a/templates/analytics/support.html
+++ b/templates/analytics/support.html
@@ -1,4 +1,5 @@
 {% extends "zerver/base.html" %}
+{% set entrypoint = "support" %}
 
 {# User Activity. #}
 
@@ -7,12 +8,6 @@
 {% endblock %}
 
 
-{% block customhead %}
-{{ super() }}
-{{ bundle('activity') }}
-{{ bundle('support') }}
-{% endblock %}
-
 {% block content %}
 <div class="container">
     <br>
diff --git a/templates/confirmation/confirm_preregistrationuser.html b/templates/confirmation/confirm_preregistrationuser.html
index 9e8b987e4e..3b812d78a6 100644
--- a/templates/confirmation/confirm_preregistrationuser.html
+++ b/templates/confirmation/confirm_preregistrationuser.html
@@ -1,9 +1,5 @@
 {% extends "zerver/base.html" %}
-
-{% block customhead %}
-{{ super() }}
-{{ bundle('confirm-preregistrationuser') }}
-{% endblock %}
+{% set entrypoint = "confirm-preregistrationuser" %}
 
 {% block content %}
 
diff --git a/templates/corporate/billing.html b/templates/corporate/billing.html
index 26fad6015f..fedb2954a5 100644
--- a/templates/corporate/billing.html
+++ b/templates/corporate/billing.html
@@ -1,9 +1,8 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "billing" %}
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('landing-page') }}
-{{ bundle('billing') }}
 <script src="https://checkout.stripe.com/checkout.js"></script>
 {% endblock %}
 
@@ -13,7 +12,6 @@
 
     {% include 'zerver/billing_nav.html' %}
 
-    {{ bundle('translations') }}
     <div class="portico-landing billing-upgrade-page">
         <div class="hero small-hero"></div>
 
diff --git a/templates/corporate/jobs.html b/templates/corporate/jobs.html
index dd3d96aa33..373809bcd7 100644
--- a/templates/corporate/jobs.html
+++ b/templates/corporate/jobs.html
@@ -1,4 +1,5 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% block title %}
 <title>Zulip jobs</title>
@@ -6,7 +7,6 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('landing-page') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/corporate/upgrade.html b/templates/corporate/upgrade.html
index a4d40c2a44..211ac51568 100644
--- a/templates/corporate/upgrade.html
+++ b/templates/corporate/upgrade.html
@@ -1,9 +1,8 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "upgrade" %}
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('landing-page') }}
-{{ bundle('upgrade') }}
 <script src="https://checkout.stripe.com/checkout.js"></script>
 {% endblock %}
 
@@ -13,8 +12,6 @@
 
     {% include 'zerver/billing_nav.html' %}
 
-    {{ bundle('translations') }}
-
     <div class="portico-landing billing-upgrade-page">
         <div class="hero small-hero"></div>
 
diff --git a/templates/corporate/zephyr.html b/templates/corporate/zephyr.html
index 5bd9119513..8f45265c22 100644
--- a/templates/corporate/zephyr.html
+++ b/templates/corporate/zephyr.html
@@ -1,4 +1,5 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% block title %}
 <title>Zulip zephyr</title>
@@ -6,7 +7,6 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('landing-page') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/app/index.html b/templates/zerver/app/index.html
index 0fbc41ef69..ef17540f9f 100644
--- a/templates/zerver/app/index.html
+++ b/templates/zerver/app/index.html
@@ -1,4 +1,5 @@
 {% extends "zerver/base.html" %}
+{% set entrypoint = "app" %}
 {# The app itself. #}
 {# Includes some other templates as tabs. #}
 
@@ -6,11 +7,6 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 {% endblock %}
 
-{% block commonjs %}
-{{ bundle('app') }}
-{{ bundle('katex') }}
-{% endblock %}
-
 {% block customhead %}
 <meta name="apple-mobile-web-app-capable" content="yes">
 <link href="/static/images/logo/apple-touch-icon-precomposed.png" rel="apple-touch-icon-precomposed">
diff --git a/templates/zerver/apps.html b/templates/zerver/apps.html
index 6dbbc63298..0a1ebda1cd 100644
--- a/templates/zerver/apps.html
+++ b/templates/zerver/apps.html
@@ -1,11 +1,11 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <style media="screen">
     .app.portico-page { padding-bottom: 0px; }
 </style>
-{{ bundle('landing-page') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/archive/index.html b/templates/zerver/archive/index.html
index 7d7417102d..4ef2d694c2 100644
--- a/templates/zerver/archive/index.html
+++ b/templates/zerver/archive/index.html
@@ -1,4 +1,5 @@
 {% extends "zerver/base.html" %}
+{% set entrypoint = "archive" %}
 
 {% block customhead %}
     <link id="emoji-spritesheet" href="/static/generated/emoji/google-sprite.css" rel="stylesheet" type="text/css">
@@ -10,13 +11,6 @@
         width: auto;
         }
     </style>
-
-    {{ bundle('translations') }}
-    {{ bundle('katex') }}
-    {{ bundle('portico') }}
-    {{ bundle('archive') }}
-    {{ bundle('archive-styles') }}
-
 {% endblock %}
 
 {% block content %}
diff --git a/templates/zerver/atlassian.html b/templates/zerver/atlassian.html
index 736c2fa6be..a36df97fe8 100644
--- a/templates/zerver/atlassian.html
+++ b/templates/zerver/atlassian.html
@@ -1,4 +1,5 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% block title %}
 <title>Migrating from HipChat and Stride</title>
@@ -6,8 +7,6 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/base.html b/templates/zerver/base.html
index 18f418b0b5..597b28cf75 100644
--- a/templates/zerver/base.html
+++ b/templates/zerver/base.html
@@ -20,25 +20,13 @@
         {% include 'zerver/meta_tags.html' %}
         {% endif %}
 
-        {% macro bundle(name) %}
-        {{ render_entrypoint(name, 'css', attrs='nonce="%s"' % (csp_nonce,) if csp_nonce else '') }}
-        {{ render_entrypoint(name, 'js', attrs='defer nonce="%s"' % (csp_nonce,) if csp_nonce else 'defer') }}
-        {% endmacro %}
-
-        <!-- This is a temporary block to enable webpack transition
-        This allows pages requiring common files via webpack to override
-        this block -->
-        {% block commonjs %}
-        {{ bundle('common') }}
+        {% block webpack %}
+        {{ render_entrypoint(entrypoint, 'css', attrs='nonce="%s"' % (csp_nonce,) if csp_nonce else '') }}
+        {{ render_entrypoint(entrypoint, 'js', attrs='defer nonce="%s"' % (csp_nonce,) if csp_nonce else 'defer') }}
         {% endblock %}
+
         {% block customhead %}
         {% endblock %}
-
-        {# this is required because we want to put a custom head in
-        `zerver/portico.html` that isn't overwritten like the
-        `customhead` #}
-        {% block porticocustomhead %}
-        {% endblock %}
     </head>
 
     <body {% if night_mode %}class="night-mode"{% endif %}>
@@ -49,3 +37,5 @@
     </body>
 
 </html>
+
+{% set entrypoint = entrypoint|default("common") %}
diff --git a/templates/zerver/dev_login.html b/templates/zerver/dev_login.html
index 1f8703d1b5..1a9b5d47e0 100644
--- a/templates/zerver/dev_login.html
+++ b/templates/zerver/dev_login.html
@@ -1,8 +1,8 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "dev-login" %}
 
 {# Login page. #}
 {% block portico_content %}
-{{ bundle('dev-login') }}
 <!-- The following empty tag has unique data-page-id so that this
 page can be easily identified in it's respective JavaScript file -->
 <div data-page-id="dev-login"></div>
diff --git a/templates/zerver/digest_base.html b/templates/zerver/digest_base.html
index 9acf1774b7..5081ca7b4a 100644
--- a/templates/zerver/digest_base.html
+++ b/templates/zerver/digest_base.html
@@ -1,8 +1,5 @@
 {% extends "zerver/base.html" %}
-
-{% block porticocustomhead %}
-{{ bundle('portico') }}
-{% endblock %}
+{% set entrypoint = "digest" %}
 
 {% block content %}
 <body>
diff --git a/templates/zerver/documentation_main.html b/templates/zerver/documentation_main.html
index 55a99ae60b..1558115618 100644
--- a/templates/zerver/documentation_main.html
+++ b/templates/zerver/documentation_main.html
@@ -1,4 +1,5 @@
 {% extends "zerver/portico-help.html" %}
+{% set entrypoint = "help" %}
 
 {# Zulip User and API Documentation. #}
 
@@ -27,6 +28,4 @@
         </div>
     </div>
 </div>
-
-{{ bundle("help") }}
 {% endblock %}
diff --git a/templates/zerver/email_log.html b/templates/zerver/email_log.html
index f29526c9ac..c3241302a7 100644
--- a/templates/zerver/email_log.html
+++ b/templates/zerver/email_log.html
@@ -1,6 +1,6 @@
 {% extends "zerver/base.html" %}
+{% set entrypoint = "email-log" %}
 {% block content %}
-{{ bundle('email-log') }}
 <div class="container">
     <div style="position: fixed">
         <div class="alert">
diff --git a/templates/zerver/features.html b/templates/zerver/features.html
index 55711eb1bd..e632a2700c 100644
--- a/templates/zerver/features.html
+++ b/templates/zerver/features.html
@@ -1,12 +1,9 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% set OPEN_GRAPH_TITLE = 'Zulip Features' %}
 {% set OPEN_GRAPH_DESCRIPTION = 'First class threading on top of everything you could want from real-time chat.' %}
 
-{% block customhead %}
-{{ bundle('landing-page') }}
-{% endblock %}
-
 {% block portico_content %}
 
 {% include 'zerver/landing_nav.html' %}
diff --git a/templates/zerver/for-companies.html b/templates/zerver/for-companies.html
index c17aab8f84..d0ed71f7b3 100644
--- a/templates/zerver/for-companies.html
+++ b/templates/zerver/for-companies.html
@@ -1,4 +1,5 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% block title %}
 <title>Zulip: the best group chat for companies</title>
@@ -6,8 +7,6 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/for-mystery-hunt.html b/templates/zerver/for-mystery-hunt.html
index d6bfe2d551..e0f40513c9 100644
--- a/templates/zerver/for-mystery-hunt.html
+++ b/templates/zerver/for-mystery-hunt.html
@@ -1,4 +1,5 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% block title %}
 <title>Zephyr reloaded</title>
@@ -6,8 +7,6 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/for-open-source.html b/templates/zerver/for-open-source.html
index 4e19b42e0d..86308bdefe 100644
--- a/templates/zerver/for-open-source.html
+++ b/templates/zerver/for-open-source.html
@@ -1,4 +1,5 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% set OPEN_GRAPH_TITLE = 'Modern chat for open source' %}
 {% set OPEN_GRAPH_DESCRIPTION = 'No message limits, rich moderation features, markdown support, and a conversation model that scales to thousands of users.' %}
@@ -9,7 +10,6 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('landing-page') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/for-working-groups-and-communities.html b/templates/zerver/for-working-groups-and-communities.html
index 1bd5fa22e6..3fe88ca15b 100644
--- a/templates/zerver/for-working-groups-and-communities.html
+++ b/templates/zerver/for-working-groups-and-communities.html
@@ -1,4 +1,5 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% block title %}
 <title>Zulip: the best group chat for working groups and communities</title>
@@ -6,8 +7,6 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/hello.html b/templates/zerver/hello.html
index 2b8e25214b..ea93bb68e9 100644
--- a/templates/zerver/hello.html
+++ b/templates/zerver/hello.html
@@ -1,11 +1,11 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <!-- Bootstrap 2.3.2-->
 <script src="https://stackpath.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js" defer></script>
 
-{{ bundle('landing-page') }}
 <style>
     .portico-page {
     padding-bottom: 0px;
diff --git a/templates/zerver/history.html b/templates/zerver/history.html
index 5e8fb65135..eae6f19d1b 100644
--- a/templates/zerver/history.html
+++ b/templates/zerver/history.html
@@ -1,4 +1,5 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% block title %}
 <title>Zulip history</title>
@@ -6,8 +7,6 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/integrations/development/dev_panel.html b/templates/zerver/integrations/development/dev_panel.html
index 3f2ce4337d..31228c8843 100644
--- a/templates/zerver/integrations/development/dev_panel.html
+++ b/templates/zerver/integrations/development/dev_panel.html
@@ -1,11 +1,9 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "integrations-dev-panel" %}
 
 {% block customhead %}
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('integrations-dev-panel') }}
-{{ bundle('portico') }}
-
 {% endblock %}
 
 
diff --git a/templates/zerver/integrations/index.html b/templates/zerver/integrations/index.html
index 68b3857991..25510f8ea9 100644
--- a/templates/zerver/integrations/index.html
+++ b/templates/zerver/integrations/index.html
@@ -1,8 +1,8 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "integrations" %}
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('integrations') }}
 {% endblock %}
 
 {% block hello_page_container %} hello-main{% endblock %}
diff --git a/templates/zerver/login.html b/templates/zerver/login.html
index 1e633fbec4..b2dc1518ff 100644
--- a/templates/zerver/login.html
+++ b/templates/zerver/login.html
@@ -1,11 +1,7 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "signup" %}
 {# Login page. #}
 
-{% block customhead %}
-{{ super() }}
-{{ bundle('signup') }}
-{% endblock %}
-
 {% block portico_content %}
 
 <!-- The following empty tag has unique data-page-id so that this
diff --git a/templates/zerver/plans.html b/templates/zerver/plans.html
index a453e0989c..dd12fac61a 100644
--- a/templates/zerver/plans.html
+++ b/templates/zerver/plans.html
@@ -1,8 +1,8 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('landing-page') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/portico.html b/templates/zerver/portico.html
index 18d67a9ee5..b8fce4ff19 100644
--- a/templates/zerver/portico.html
+++ b/templates/zerver/portico.html
@@ -1,4 +1,5 @@
 {% extends "zerver/base.html" %}
+{% set entrypoint = entrypoint|default("portico") %}
 
 {# A base template for stuff like login, register, etc.
 
@@ -6,11 +7,6 @@
     hence the name.
 #}
 
-{% block porticocustomhead %}
-{{ bundle('translations') }}
-{{ bundle('portico') }}
-{% endblock %}
-
 {% block content %}
 <div class="portico-container" data-platform="{{ platform }}">
     <div class="portico-wrap">
diff --git a/templates/zerver/portico_signup.html b/templates/zerver/portico_signup.html
index 9435125f5c..e808461c7b 100644
--- a/templates/zerver/portico_signup.html
+++ b/templates/zerver/portico_signup.html
@@ -1,8 +1,4 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = entrypoint|default("signup") %}
 
 {# Portico page with signup code #}
-
-{% block customhead %}
-{{ super() }}
-{{ bundle('signup') }}
-{% endblock %}
diff --git a/templates/zerver/privacy.html b/templates/zerver/privacy.html
index e7795de745..8ca5583a60 100644
--- a/templates/zerver/privacy.html
+++ b/templates/zerver/privacy.html
@@ -1,4 +1,5 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% block title %}
 <title>Zulip: the best group chat for open source projects</title>
@@ -6,7 +7,6 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('landing-page') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/realm_creation_failed.html b/templates/zerver/realm_creation_failed.html
index 5f53081fc9..9ee5e0ca62 100644
--- a/templates/zerver/realm_creation_failed.html
+++ b/templates/zerver/realm_creation_failed.html
@@ -1,9 +1,8 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/register.html b/templates/zerver/register.html
index 30915e3b2b..6fd9bd0865 100644
--- a/templates/zerver/register.html
+++ b/templates/zerver/register.html
@@ -1,4 +1,5 @@
 {% extends "zerver/portico_signup.html" %}
+{% set entrypoint = "register" %}
 {#
 Gather other user information, after having confirmed
 their email address.
@@ -6,12 +7,6 @@ their email address.
 Form is validated both client-side using jquery-validate (see signup.js) and server-side.
 #}
 
-{% block customhead %}
-{{ super() }}
-{{ bundle('zxcvbn') }}
-{{ bundle('translations') }}
-{% endblock %}
-
 {% block portico_content %}
 <div class="register-account flex full-page">
     <div class="center-block new-style" style="padding: 20px 0px">
diff --git a/templates/zerver/reset_confirm.html b/templates/zerver/reset_confirm.html
index 29f28fae5f..11043a1845 100644
--- a/templates/zerver/reset_confirm.html
+++ b/templates/zerver/reset_confirm.html
@@ -1,8 +1,5 @@
 {% extends "zerver/portico_signup.html" %}
-{% block customhead %}
-{{ super() }}
-{{ bundle('zxcvbn') }}
-{% endblock %}
+{% set entrypoint = "register" %}
 
 {% block portico_content %}
 
diff --git a/templates/zerver/security.html b/templates/zerver/security.html
index bd157a3a28..34214f4a79 100644
--- a/templates/zerver/security.html
+++ b/templates/zerver/security.html
@@ -1,4 +1,5 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% block title %}
 <title>Zulip Security</title>
@@ -6,8 +7,6 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/team.html b/templates/zerver/team.html
index fe294f71ee..f8c608eeab 100644
--- a/templates/zerver/team.html
+++ b/templates/zerver/team.html
@@ -1,13 +1,10 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% block title %}
 <title>Zulip: the best group chat for open source projects</title>
 {% endblock %}
 
-{% block customhead %}
-{{ bundle('landing-page') }}
-{% endblock %}
-
 {% block portico_content %}
 
 {% include 'zerver/landing_nav.html' %}
diff --git a/templates/zerver/terms.html b/templates/zerver/terms.html
index 20f316de49..ec568635d1 100644
--- a/templates/zerver/terms.html
+++ b/templates/zerver/terms.html
@@ -1,11 +1,10 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {# Terms of Service. #}
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/why-zulip.html b/templates/zerver/why-zulip.html
index 883aa94340..2ab1d56c99 100644
--- a/templates/zerver/why-zulip.html
+++ b/templates/zerver/why-zulip.html
@@ -1,4 +1,5 @@
 {% extends "zerver/portico.html" %}
+{% set entrypoint = "landing-page" %}
 
 {% set OPEN_GRAPH_TITLE = 'Team chat with first-class threading' %}
 {% set OPEN_GRAPH_DESCRIPTION = 'Most team chats are overwhelming to keep up with. Zulip takes a different approach.' %}
@@ -9,8 +10,6 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ bundle('landing-page') }}
-
 {% endblock %}
 
 {% block portico_content %}
diff --git a/tools/webpack.assets.json b/tools/webpack.assets.json
index f06e55dd74..ea8f17fb8a 100644
--- a/tools/webpack.assets.json
+++ b/tools/webpack.assets.json
@@ -1,10 +1,16 @@
 {
     "activity": [
+        "./static/js/bundles/common.js",
         "sorttable/sorttable.js",
         "./static/js/analytics/activity.js",
         "./static/styles/portico/activity.scss"
     ],
     "archive": [
+        "./static/js/bundles/common.js",
+        "./static/js/translations.js",
+        "katex/dist/katex.min.js",
+        "./static/js/portico/header.js",
+        "./static/styles/portico/portico-styles.scss",
         "xdate/src/xdate.js",
         "handlebars/dist/cjs/handlebars.runtime.js",
         "./static/js/archive.js",
@@ -13,9 +19,19 @@
         "./static/js/timerender.js",
         "./static/js/templates.js",
         "./static/js/stream_color.js",
-        "./static/js/scroll_bar.js"
+        "./static/js/scroll_bar.js",
+        "katex/dist/katex.css",
+        "./static/styles/rendered_markdown.scss",
+        "./static/styles/zulip.scss",
+        "./static/styles/portico/archive.scss"
     ],
     "billing": [
+        "./static/js/bundles/common.js",
+        "./static/js/translations.js",
+        "./static/js/portico/header.js",
+        "./static/styles/portico/portico-styles.scss",
+        "./static/js/portico/landing-page.js",
+        "./static/styles/portico/landing-page.scss",
         "./static/js/billing/helpers.js",
         "./static/js/billing/billing.js",
         "handlebars/dist/cjs/handlebars.runtime.js",
@@ -24,6 +40,12 @@
         "./static/styles/portico/billing.scss"
     ],
     "upgrade": [
+        "./static/js/bundles/common.js",
+        "./static/js/translations.js",
+        "./static/js/portico/header.js",
+        "./static/styles/portico/portico-styles.scss",
+        "./static/js/portico/landing-page.js",
+        "./static/styles/portico/landing-page.scss",
         "./static/js/billing/helpers.js",
         "./static/js/billing/upgrade.js",
         "handlebars/dist/cjs/handlebars.runtime.js",
@@ -32,6 +54,8 @@
         "./static/styles/portico/billing.scss"
     ],
     "portico": [
+        "./static/js/bundles/common.js",
+        "./static/js/translations.js",
         "./static/js/portico/header.js",
         "./static/styles/portico/portico-styles.scss"
     ],
@@ -44,54 +68,98 @@
         "./static/js/bundles/common.js"
     ],
     "help": [
+        "./static/js/bundles/common.js",
+        "./static/js/translations.js",
+        "./static/js/portico/header.js",
+        "./static/styles/portico/portico-styles.scss",
         "simplebar/dist/simplebar.css",
         "simplebar/dist/simplebar.js",
         "./static/js/portico/help.js",
         "./static/js/portico/tabbed-instructions.js"
     ],
-    "katex": "katex/dist/katex.min.js",
     "landing-page": [
+        "./static/js/bundles/common.js",
+        "./static/js/translations.js",
+        "./static/js/portico/header.js",
+        "./static/styles/portico/portico-styles.scss",
         "./static/js/portico/landing-page.js",
         "./static/styles/portico/landing-page.scss"
     ],
     "integrations": [
+        "./static/js/bundles/common.js",
+        "./static/js/translations.js",
+        "./static/js/portico/header.js",
+        "./static/styles/portico/portico-styles.scss",
         "./static/js/portico/integrations.js",
         "./static/styles/portico/landing-page.scss",
         "./static/styles/portico/integrations.scss"
     ],
     "signup": [
+        "./static/js/bundles/common.js",
+        "./static/js/translations.js",
+        "./static/js/portico/header.js",
+        "./static/styles/portico/portico-styles.scss",
         "jquery-validation/dist/jquery.validate.min.js",
         "./static/js/portico/signup.js"
     ],
+    "register": [
+        "./static/js/bundles/common.js",
+        "./static/js/translations.js",
+        "./static/js/portico/header.js",
+        "./static/styles/portico/portico-styles.scss",
+        "jquery-validation/dist/jquery.validate.min.js",
+        "./static/js/portico/signup.js",
+        "zxcvbn/dist/zxcvbn.js"
+    ],
     "confirm-preregistrationuser": [
+        "./static/js/bundles/common.js",
         "./static/js/portico/confirm-preregistrationuser.js"
     ],
     "support": [
+        "./static/js/bundles/common.js",
+        "sorttable/sorttable.js",
+        "./static/js/analytics/activity.js",
+        "./static/styles/portico/activity.scss",
         "./static/js/analytics/support.js",
         "./static/styles/app_components.scss"
     ],
-    "dev-login": "./static/js/portico/dev-login.js",
+    "dev-login": [
+        "./static/js/bundles/common.js",
+        "./static/js/translations.js",
+        "./static/js/portico/header.js",
+        "./static/styles/portico/portico-styles.scss",
+        "./static/js/portico/dev-login.js"
+    ],
     "integrations-dev-panel": [
+        "./static/js/bundles/common.js",
+        "./static/js/translations.js",
+        "./static/js/portico/header.js",
+        "./static/styles/portico/portico-styles.scss",
         "./static/js/portico/integrations_dev_panel.js",
         "./static/styles/portico/integrations_dev_panel.css",
         "./static/js/channel.js"
     ],
     "email-log": [
+        "./static/js/bundles/common.js",
         "./static/js/portico/email_log.js",
         "./static/js/channel.js"
     ],
     "stats": [
+        "./static/js/bundles/common.js",
+        "./static/js/portico/header.js",
+        "./static/styles/portico/portico-styles.scss",
+        "./static/js/translations.js",
         "./static/styles/portico/stats.scss",
         "./static/js/stats/stats.js",
         "plotly.js/dist/plotly-basic.min.js"
     ],
-    "translations": "./static/js/translations.js",
-    "zxcvbn": "zxcvbn/dist/zxcvbn.js",
-    "app": "./static/js/bundles/app.js",
-    "archive-styles": [
-        "katex/dist/katex.css",
-        "./static/styles/rendered_markdown.scss",
-        "./static/styles/zulip.scss",
-        "./static/styles/portico/archive.scss"
+    "app": [
+        "./static/js/bundles/app.js",
+        "katex/dist/katex.min.js"
+    ],
+    "digest": [
+        "./static/js/bundles/common.js",
+        "./static/js/portico/header.js",
+        "./static/styles/portico/portico-styles.scss"
     ]
 }
diff --git a/tools/webpack.config.ts b/tools/webpack.config.ts
index 13204cfe04..05be5e84a8 100644
--- a/tools/webpack.config.ts
+++ b/tools/webpack.config.ts
@@ -238,7 +238,9 @@ export default (env?: string): webpack.Configuration[] => {
 
     if (!production) {
         // Out JS debugging tools
-        config.entry['common'].push('./static/js/debug.js');  // eslint-disable-line dot-notation
+        for (const name of Object.keys(config.entry)) {
+            config.entry[name].push('./static/js/debug.js');
+        }
         config.devServer = {
             clientLogLevel: "error",
             stats: "errors-only",