diff --git a/src/Foundation.hs b/src/Foundation.hs
index 8fb2ec86e..412c6cc38 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1322,46 +1322,15 @@ siteLayout' headingOverride widget = do
     frontendI18n = toJSON (mr :: FrontendMessage -> Text)
 
   pc <- widgetToPageContent $ do
-      -- 3rd party
-      addScript $ StaticR js_vendor_flatpickr_js
-      addScript $ StaticR js_vendor_zepto_js
-      addStylesheet $ StaticR css_vendor_flatpickr_css
-      addStylesheet $ StaticR css_vendor_fontawesome_css
       -- fonts
-      addStylesheet $ StaticR css_fonts_css
-      -- polyfills
-      addScript $ StaticR js_polyfills_fetchPolyfill_js
-      addScript $ StaticR js_polyfills_urlPolyfill_js
-      -- JavaScript services
-      addScript $ StaticR js_services_utilRegistry_js
-      addScript $ StaticR js_services_htmlHelpers_js
-      addScript $ StaticR js_services_httpClient_js
-      addScript $ StaticR js_services_i18n_js
-      -- JavaScript utils
-      addScript $ StaticR js_utils_alerts_js
-      addScript $ StaticR js_utils_asidenav_js
-      addScript $ StaticR js_utils_asyncForm_js
-      addScript $ StaticR js_utils_asyncTable_js
-      addScript $ StaticR js_utils_checkAll_js
-      addScript $ StaticR js_utils_form_js
-      addScript $ StaticR js_utils_inputs_js
-      addScript $ StaticR js_utils_massInput_js
-      addScript $ StaticR js_utils_modal_js
-      addScript $ StaticR js_utils_showHide_js
-      -- addScript $ StaticR js_utils_tabber_js
-      addStylesheet $ StaticR css_utils_alerts_scss
-      addStylesheet $ StaticR css_utils_asidenav_scss
-      addStylesheet $ StaticR css_utils_asyncForm_scss
-      addStylesheet $ StaticR css_utils_asyncTable_scss
-      addStylesheet $ StaticR css_utils_asyncTableFilter_scss
-      addStylesheet $ StaticR css_utils_checkbox_scss
-      addStylesheet $ StaticR css_utils_form_scss
-      addStylesheet $ StaticR css_utils_inputs_scss
-      addStylesheet $ StaticR css_utils_modal_scss
-      addStylesheet $ StaticR css_utils_radio_scss
-      addStylesheet $ StaticR css_utils_showHide_scss
-      addStylesheet $ StaticR css_utils_tabber_scss
-      addStylesheet $ StaticR css_utils_tooltip_scss
+      addStylesheet $ StaticR fonts_fonts_css
+      -- SCSS
+      addStylesheet $ StaticR bundles_css_vendor_css
+      addStylesheet $ StaticR bundles_css_main_css
+      -- JavaScript
+      addScript $ StaticR bundles_js_polyfills_js
+      -- addScript $ StaticR bundles_js_vendor_js
+      addScript $ StaticR bundles_js_main_js
       -- widgets
       $(widgetFile "default-layout")
   withUrlRenderer $(hamletFile "templates/default-layout-wrapper.hamlet")