diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml
index de1f90b8fa..67b1359a34 100644
--- a/app/views/layouts/darkswarm.html.haml
+++ b/app/views/layouts/darkswarm.html.haml
@@ -15,17 +15,26 @@
     %link{href: "https://fonts.googleapis.com/css?family=Roboto:400,300italic,400italic,300,700,700italic|Oswald:300,400,700", rel: "stylesheet", type: "text/css"}
     %link{href: font_path("OFN-v2.woff"), rel: "preload", as: "font", crossorigin: "anonymous"}
 
-    = stylesheet_link_tag "darkswarm/all"
-    = javascript_pack_tag "application"
+    = stylesheet_link_tag "darkswarm/all", "data-turbo-track": "reload"
+    = javascript_pack_tag "application", "data-turbo-track": "reload"
+
+    = render "layouts/shopfront_script" if @shopfront_layout
+    = render "layouts/bugsnag_js"
+
+    - if Spree::Config.stripe_connect_enabled
+      = render "shared/stripe_js"
+
+    = javascript_include_tag "darkswarm/all", "data-turbo-track": "reload"
+    = javascript_include_tag "web/all", "data-turbo-track": "reload"
+    = render "layouts/i18n_script"
+
     = csrf_meta_tags
 
-  %body{ class: body_classes, "body-scroll" => true , ng: { app: 'Darkswarm' }}
+  %body{ class: body_classes, "body-scroll": "true" }
     / [if lte IE 8]
       = render partial: "shared/ie_warning"
       = javascript_include_tag "iehack"
 
-    = render "layouts/shopfront_script" if @shopfront_layout
-
     .off-canvas-wrap{ offcanvas: true }
       .fixed.off-canvas-fixed
         = render "shared/menu/menu" unless @hide_menu
@@ -38,16 +47,7 @@
           #footer
     %loading
 
-    = render "layouts/bugsnag_js"
-
-    - if Spree::Config.stripe_connect_enabled
-      = render "shared/stripe_js"
-    = javascript_include_tag "darkswarm/all"
-    = javascript_include_tag "web/all"
-    = render "layouts/i18n_script"
-
     = yield :scripts
-
     = inject_current_hub
     = inject_current_user
     = inject_rails_flash
diff --git a/app/views/layouts/registration.html.haml b/app/views/layouts/registration.html.haml
index 815bff62c2..c5ef544a13 100644
--- a/app/views/layouts/registration.html.haml
+++ b/app/views/layouts/registration.html.haml
@@ -11,9 +11,12 @@
     %link{href: "https://fonts.googleapis.com/css?family=Roboto:400,300italic,400italic,300,700,700italic|Oswald:300,400,700", rel: "stylesheet", type: "text/css"}
 
     = stylesheet_link_tag "darkswarm/all"
+    = javascript_include_tag "darkswarm/all"
+    = javascript_pack_tag "application"
+
     = csrf_meta_tags
 
-  %body.off-canvas{"ng-app" => "Darkswarm", style: "background-image: url(#{image_path('tile-wide.png')})" }
+  %body.off-canvas{ style: "background-image: url(#{image_path('tile-wide.png')})" }
     / [if lte IE 8]
       = render partial: "shared/ie_warning"
       = javascript_include_tag "iehack"
@@ -27,10 +30,7 @@
           #footer
     %loading
 
-    %script{src: "//maps.googleapis.com/maps/api/js?libraries=places#{ ENV['GOOGLE_MAPS_API_KEY'] ? '&key=' + ENV['GOOGLE_MAPS_API_KEY'] : ''}"}
-    = javascript_include_tag "darkswarm/all"
     = yield :scripts
-
     = inject_current_user
     = yield :injection_data