diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee
index 2b48de4dcf..9b0944cbd5 100644
--- a/app/assets/javascripts/darkswarm/all.js.coffee
+++ b/app/assets/javascripts/darkswarm/all.js.coffee
@@ -28,7 +28,6 @@
 #= require angular-rails-templates
 #= require_tree ../templates
 #
-#= require angular-backstretch.js
 #= require angular-flash.min.js
 #
 #= require moment/min/moment.min.js
@@ -52,7 +51,6 @@
 #= require modernizr
 #
 #= require ./darkswarm
-#= require ./overrides
 #= require_tree ./mixins
 #= require_tree ./directives
 #= require_tree .
diff --git a/app/assets/javascripts/darkswarm/controllers/authentication/forgot_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/authentication/forgot_controller.js.coffee
index 7c3b67d823..62b211279a 100644
--- a/app/assets/javascripts/darkswarm/controllers/authentication/forgot_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/authentication/forgot_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "ForgotCtrl", ($scope, $http, $location, AuthenticationService) ->
+angular.module('Darkswarm').controller "ForgotCtrl", ($scope, $http, $location, AuthenticationService) ->
   $scope.path = "/forgot"
   $scope.sent = false
 
diff --git a/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee
index c6c54e38d1..19f8b41047 100644
--- a/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "LoginCtrl", ($scope, $timeout, $location, $http, $window, AuthenticationService, Redirections, Loading) ->
+angular.module('Darkswarm').controller "LoginCtrl", ($scope, $timeout, $location, $http, $window, AuthenticationService, Redirections, Loading) ->
   $scope.path = "/login"
 
   $scope.modalMessage = null
diff --git a/app/assets/javascripts/darkswarm/controllers/authentication/signup_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/authentication/signup_controller.js.coffee
index 220a96523e..041a31a009 100644
--- a/app/assets/javascripts/darkswarm/controllers/authentication/signup_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/authentication/signup_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "SignupCtrl", ($scope, $http, $window, $location, Redirections, AuthenticationService) ->
+angular.module('Darkswarm').controller "SignupCtrl", ($scope, $http, $window, $location, Redirections, AuthenticationService) ->
   $scope.path = "/signup"
 
   $scope.spree_user.password_confirmation = ''
diff --git a/app/assets/javascripts/darkswarm/controllers/authentication_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/authentication_controller.js.coffee
index 135fe37b89..689048722d 100644
--- a/app/assets/javascripts/darkswarm/controllers/authentication_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/authentication_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "AuthenticationCtrl", ($scope, AuthenticationService, SpreeUser)->
+angular.module('Darkswarm').controller "AuthenticationCtrl", ($scope, AuthenticationService, SpreeUser)->
   $scope.open = AuthenticationService.open
   $scope.toggle = AuthenticationService.toggle
 
diff --git a/app/assets/javascripts/darkswarm/controllers/cart_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/cart_controller.js.coffee
index 28d6cb4cfe..fb45ac4a22 100644
--- a/app/assets/javascripts/darkswarm/controllers/cart_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/cart_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "CartCtrl", ($scope, Cart, CurrentHub) ->
+angular.module('Darkswarm').controller "CartCtrl", ($scope, Cart, CurrentHub) ->
   $scope.Cart = Cart
   $scope.CurrentHub = CurrentHub
   $scope.max_characters = 20
diff --git a/app/assets/javascripts/darkswarm/controllers/cart_dropdown_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/cart_dropdown_controller.js.coffee
index 048459ecd8..78367b306b 100644
--- a/app/assets/javascripts/darkswarm/controllers/cart_dropdown_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/cart_dropdown_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "CartDropdownCtrl", ($scope, Cart, BodyScroll) ->
+angular.module('Darkswarm').controller "CartDropdownCtrl", ($scope, Cart, BodyScroll) ->
   $scope.Cart = Cart
   $scope.showCartSidebar = false
 
diff --git a/app/assets/javascripts/darkswarm/controllers/cart_form_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/cart_form_controller.js.coffee
index 73fe91793f..db36af33a1 100644
--- a/app/assets/javascripts/darkswarm/controllers/cart_form_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/cart_form_controller.js.coffee
@@ -1,2 +1,2 @@
-Darkswarm.controller "CartFormCtrl", ($scope) ->
+angular.module('Darkswarm').controller "CartFormCtrl", ($scope) ->
 
diff --git a/app/assets/javascripts/darkswarm/controllers/checkout/accordion_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/checkout/accordion_controller.js.coffee
index d61ff6ceb7..d10f4be1b9 100644
--- a/app/assets/javascripts/darkswarm/controllers/checkout/accordion_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/checkout/accordion_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "AccordionCtrl", ($scope, localStorageService, $timeout, $document, CurrentHub) ->
+angular.module('Darkswarm').controller "AccordionCtrl", ($scope, localStorageService, $timeout, $document, CurrentHub) ->
   $scope.accordionSections = ["details", "billing", "shipping", "payment"]
   $scope.accordion = { details: true, billing: true, shipping: true, payment: true }
 
diff --git a/app/assets/javascripts/darkswarm/controllers/checkout/billing_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/checkout/billing_controller.js.coffee
index b7246fddd9..4e7332be27 100644
--- a/app/assets/javascripts/darkswarm/controllers/checkout/billing_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/checkout/billing_controller.js.coffee
@@ -1,5 +1,6 @@
-Darkswarm.controller "BillingCtrl", ($scope, $timeout) ->
-  angular.extend(this, new FieldsetMixin($scope))
+angular.module('Darkswarm').controller "BillingCtrl", ($scope, $timeout, $controller) ->
+  angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
+
   $scope.name = "billing"
   $scope.nextPanel = "shipping"
 
diff --git a/app/assets/javascripts/darkswarm/controllers/checkout/checkout_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/checkout/checkout_controller.js.coffee
index 67ac51293c..854ba7e63c 100644
--- a/app/assets/javascripts/darkswarm/controllers/checkout/checkout_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/checkout/checkout_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "CheckoutCtrl", ($scope, localStorageService, Checkout, CurrentUser, CurrentHub, AuthenticationService, SpreeUser, $http) ->
+angular.module('Darkswarm').controller "CheckoutCtrl", ($scope, localStorageService, Checkout, CurrentUser, CurrentHub, AuthenticationService, SpreeUser, $http) ->
   $scope.Checkout = Checkout
   $scope.submitted = false
 
diff --git a/app/assets/javascripts/darkswarm/controllers/checkout/country_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/checkout/country_controller.js.coffee
index 347fa367ad..101469eac9 100644
--- a/app/assets/javascripts/darkswarm/controllers/checkout/country_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/checkout/country_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "CountryCtrl", ($scope, availableCountries) ->
+angular.module('Darkswarm').controller "CountryCtrl", ($scope, availableCountries) ->
 
   $scope.countries = availableCountries
 
diff --git a/app/assets/javascripts/darkswarm/controllers/checkout/details_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/checkout/details_controller.js.coffee
index 30c243ed7c..a163923597 100644
--- a/app/assets/javascripts/darkswarm/controllers/checkout/details_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/checkout/details_controller.js.coffee
@@ -1,5 +1,6 @@
-Darkswarm.controller "DetailsCtrl", ($scope, $timeout, $http, CurrentUser, AuthenticationService, SpreeUser) ->
-  angular.extend(this, new FieldsetMixin($scope))
+angular.module('Darkswarm').controller "DetailsCtrl", ($scope, $timeout, $http, CurrentUser, AuthenticationService, SpreeUser, $controller) ->
+  angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
+
   $scope.name = "details"
   $scope.nextPanel = "billing"
 
diff --git a/app/assets/javascripts/darkswarm/controllers/checkout/payment_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/checkout/payment_controller.js.coffee
index 261bf9759a..b95bb28338 100644
--- a/app/assets/javascripts/darkswarm/controllers/checkout/payment_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/checkout/payment_controller.js.coffee
@@ -1,5 +1,5 @@
-Darkswarm.controller "PaymentCtrl", ($scope, $timeout, savedCreditCards, Dates) ->
-  angular.extend(this, new FieldsetMixin($scope))
+angular.module('Darkswarm').controller "PaymentCtrl", ($scope, $timeout, savedCreditCards, Dates, $controller) ->
+  angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
 
   $scope.savedCreditCards = savedCreditCards
   $scope.name = "payment"
diff --git a/app/assets/javascripts/darkswarm/controllers/checkout/shipping_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/checkout/shipping_controller.js.coffee
index e2647e5761..58aaad5574 100644
--- a/app/assets/javascripts/darkswarm/controllers/checkout/shipping_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/checkout/shipping_controller.js.coffee
@@ -1,5 +1,6 @@
-Darkswarm.controller "ShippingCtrl", ($scope, $timeout, ShippingMethods) ->
-  angular.extend(this, new FieldsetMixin($scope))
+angular.module('Darkswarm').controller "ShippingCtrl", ($scope, $timeout, ShippingMethods, $controller) ->
+  angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
+
   $scope.ShippingMethods = ShippingMethods
   $scope.name = "shipping"
   $scope.nextPanel = "payment"
diff --git a/app/assets/javascripts/darkswarm/controllers/credit_cards_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/credit_cards_controller.js.coffee
index d079e15d93..72e63f4694 100644
--- a/app/assets/javascripts/darkswarm/controllers/credit_cards_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/credit_cards_controller.js.coffee
@@ -1,5 +1,6 @@
-Darkswarm.controller "CreditCardsCtrl", ($scope, CreditCard, CreditCards) ->
-  angular.extend(this, new FieldsetMixin($scope))
+angular.module('Darkswarm').controller "CreditCardsCtrl", ($scope, CreditCard, CreditCards, $controller) ->
+  angular.extend this, $controller('FieldsetMixin', {$scope: $scope})
+
   $scope.savedCreditCards = CreditCards.saved
   $scope.confirmSetDefault = CreditCards.confirmSetDefault
   $scope.CreditCard = CreditCard
diff --git a/app/assets/javascripts/darkswarm/controllers/current_hub_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/current_hub_controller.js.coffee
index 80a2af33fe..3b60d18675 100644
--- a/app/assets/javascripts/darkswarm/controllers/current_hub_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/current_hub_controller.js.coffee
@@ -1,2 +1,2 @@
-Darkswarm.controller "CurrentHubCtrl", ($scope, CurrentHub) ->
+angular.module('Darkswarm').controller "CurrentHubCtrl", ($scope, CurrentHub) ->
   $scope.CurrentHub = CurrentHub
diff --git a/app/assets/javascripts/darkswarm/controllers/edit_bought_order_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/edit_bought_order_controller.js.coffee
index 618ffe286d..4587b03907 100644
--- a/app/assets/javascripts/darkswarm/controllers/edit_bought_order_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/edit_bought_order_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "EditBoughtOrderController", ($scope, $resource, $timeout, Cart, Messages) ->
+angular.module('Darkswarm').controller "EditBoughtOrderController", ($scope, $resource, $timeout, Cart, Messages) ->
   $scope.showBought = false
   $scope.removeEnabled = true
 
diff --git a/app/assets/javascripts/darkswarm/controllers/enterprises_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/enterprises_controller.js.coffee
index 0bc5c3a460..38f7e57ae4 100644
--- a/app/assets/javascripts/darkswarm/controllers/enterprises_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/enterprises_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "EnterprisesCtrl", ($scope, $rootScope, $timeout, $location, Enterprises, Search, $document, HashNavigation, FilterSelectorsService, EnterpriseModal, enterpriseMatchesNameQueryFilter, distanceWithinKmFilter) ->
+angular.module('Darkswarm').controller "EnterprisesCtrl", ($scope, $rootScope, $timeout, $location, Enterprises, Search, $document, HashNavigation, FilterSelectorsService, EnterpriseModal, enterpriseMatchesNameQueryFilter, distanceWithinKmFilter) ->
   $scope.Enterprises = Enterprises
   $scope.producers_to_filter = Enterprises.producers
   $scope.filterSelectors = FilterSelectorsService.createSelectors()
diff --git a/app/assets/javascripts/darkswarm/controllers/group_enterprises_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/group_enterprises_controller.js.coffee
index 567767be7b..b38cf94e22 100644
--- a/app/assets/javascripts/darkswarm/controllers/group_enterprises_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/group_enterprises_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "GroupEnterprisesCtrl", ($scope, Search, FilterSelectorsService, EnterpriseModal) ->
+angular.module('Darkswarm').controller "GroupEnterprisesCtrl", ($scope, Search, FilterSelectorsService, EnterpriseModal) ->
   $scope.filterSelectors = FilterSelectorsService.createSelectors()
   $scope.query = Search.search()
   $scope.openModal = EnterpriseModal.open
diff --git a/app/assets/javascripts/darkswarm/controllers/group_page_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/group_page_controller.js.coffee
index ff7a695777..3b3280a002 100644
--- a/app/assets/javascripts/darkswarm/controllers/group_page_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/group_page_controller.js.coffee
@@ -1,3 +1,3 @@
-Darkswarm.controller "GroupPageCtrl", ($scope, enterprises, Enterprises) ->
+angular.module('Darkswarm').controller "GroupPageCtrl", ($scope, enterprises, Enterprises) ->
   $scope.Enterprises = Enterprises
   $scope.embedded_layout = window.location.search.indexOf("embedded_shopfront=true") != -1
diff --git a/app/assets/javascripts/darkswarm/controllers/group_tabs_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/group_tabs_controller.js.coffee
index c9a8f88f58..1751531dfd 100644
--- a/app/assets/javascripts/darkswarm/controllers/group_tabs_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/group_tabs_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "GroupTabsCtrl", ($scope, $controller, Navigation) ->
+angular.module('Darkswarm').controller "GroupTabsCtrl", ($scope, $controller, Navigation) ->
   angular.extend this, $controller('TabsCtrl', {$scope: $scope})
 
   $scope.tabs =
diff --git a/app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee
index 91cbe0bf54..8bc52ddc22 100644
--- a/app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "GroupsCtrl", ($scope, Groups, Search) ->
+angular.module('Darkswarm').controller "GroupsCtrl", ($scope, Groups, Search) ->
   $scope.Groups = Groups
   $scope.order = 'position'
   $scope.query = Search.search()
diff --git a/app/assets/javascripts/darkswarm/controllers/home_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/home_controller.js.coffee
index 928f9a4fa1..ddc73075c2 100644
--- a/app/assets/javascripts/darkswarm/controllers/home_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/home_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "HomeCtrl", ($scope) ->
+angular.module('Darkswarm').controller "HomeCtrl", ($scope) ->
   $scope.brandStoryExpanded = false
 
   $scope.toggleBrandStory = ->
diff --git a/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee
index 5f9862dd50..80af9e195b 100644
--- a/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "HubNodeCtrl", ($scope, HashNavigation, CurrentHub, $http, $timeout) ->
+angular.module('Darkswarm').controller "HubNodeCtrl", ($scope, HashNavigation, CurrentHub, $http, $timeout) ->
   $scope.shopfront_loading = false
   $scope.enterprise_details = []
 
diff --git a/app/assets/javascripts/darkswarm/controllers/map_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/map_controller.js.coffee
index 853e86d510..dbe0a3539a 100644
--- a/app/assets/javascripts/darkswarm/controllers/map_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/map_controller.js.coffee
@@ -1,3 +1,3 @@
-Darkswarm.controller "MapCtrl", ($scope, MapConfiguration, OfnMap)->
+angular.module('Darkswarm').controller "MapCtrl", ($scope, MapConfiguration, OfnMap)->
   $scope.OfnMap = OfnMap
   $scope.map = angular.copy MapConfiguration.options
diff --git a/app/assets/javascripts/darkswarm/controllers/offcanvas_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/offcanvas_controller.js.coffee
index 4b1558a998..1492b009b4 100644
--- a/app/assets/javascripts/darkswarm/controllers/offcanvas_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/offcanvas_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "OffcanvasCtrl", ($scope) ->
+angular.module('Darkswarm').controller "OffcanvasCtrl", ($scope) ->
   $scope.menu = $(".left-off-canvas-menu")
 
   $scope.setOffcanvasMenuHeight = ->
@@ -9,3 +9,6 @@ Darkswarm.controller "OffcanvasCtrl", ($scope) ->
     $scope.setOffcanvasMenuHeight()
 
   $scope.bind()
+
+  $scope.$on "$destroy", ->
+    $(window).off("resize")
diff --git a/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
index a4ddc59860..7c4d43fff2 100644
--- a/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
@@ -1,8 +1,8 @@
-Darkswarm.controller "OrderCycleCtrl", ($scope, $rootScope, $timeout, OrderCycle) ->
+angular.module('Darkswarm').controller "OrderCycleCtrl", ($scope, $rootScope, $timeout, OrderCycle) ->
   $scope.order_cycle = OrderCycle.order_cycle
   $scope.OrderCycle = OrderCycle
 
-Darkswarm.controller "OrderCycleChangeCtrl", ($scope, $rootScope, $timeout, OrderCycle, Products, Variants, Cart, ChangeableOrdersAlert) ->
+angular.module('Darkswarm').controller "OrderCycleChangeCtrl", ($scope, $rootScope, $timeout, OrderCycle, Products, Variants, Cart, ChangeableOrdersAlert) ->
   # Track previous order cycle id for use with revertOrderCycle()
   $scope.previous_order_cycle_id = OrderCycle.order_cycle.order_cycle_id
   $scope.$watch 'order_cycle.order_cycle_id', (newValue, oldValue)->
diff --git a/app/assets/javascripts/darkswarm/controllers/orders_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/orders_controller.js.coffee
index 63e28f77a8..cfb7f31b59 100644
--- a/app/assets/javascripts/darkswarm/controllers/orders_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/orders_controller.js.coffee
@@ -1,2 +1,2 @@
-Darkswarm.controller "OrdersCtrl", ($scope, Orders) ->
+angular.module('Darkswarm').controller "OrdersCtrl", ($scope, Orders) ->
   $scope.Orders = Orders
diff --git a/app/assets/javascripts/darkswarm/controllers/page_selection_ctrl.js.coffee b/app/assets/javascripts/darkswarm/controllers/page_selection_ctrl.js.coffee
index d05e901396..09f2cca98f 100644
--- a/app/assets/javascripts/darkswarm/controllers/page_selection_ctrl.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/page_selection_ctrl.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "PageSelectionCtrl", ($scope, $rootScope, $location) ->
+angular.module('Darkswarm').controller "PageSelectionCtrl", ($scope, $rootScope, $location) ->
   $scope.selectedPage = ->
     # The path looks like `/contact` for the URL `https://ofn.org/shop#/contact`.
     # We remove the slash at the beginning.
diff --git a/app/assets/javascripts/darkswarm/controllers/producer_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/producer_node_controller.js.coffee
index 6639a2398c..cdb3c54bc0 100644
--- a/app/assets/javascripts/darkswarm/controllers/producer_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/producer_node_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "ProducerNodeCtrl", ($scope, HashNavigation, $anchorScroll, $http, $timeout) ->
+angular.module('Darkswarm').controller "ProducerNodeCtrl", ($scope, HashNavigation, $anchorScroll, $http, $timeout) ->
   $scope.shopfront_loading = false
   $scope.enterprise_details = []
 
diff --git a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
index 5a723fb8b1..a5cb284216 100644
--- a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "ProductNodeCtrl", ($scope, $modal, FilterSelectorsService) ->
+angular.module('Darkswarm').controller "ProductNodeCtrl", ($scope, $modal, FilterSelectorsService) ->
   $scope.enterprise = $scope.product.supplier # For the modal, so it's consistent
   $scope.productPropertySelectors = FilterSelectorsService.createSelectors()
 
diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
index 5546d49360..d2f18b6362 100644
--- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "ProductsCtrl", ($scope, $sce, $filter, $rootScope, Products, OrderCycle, OrderCycleResource, FilterSelectorsService, Cart, Dereferencer, Taxons, Properties, currentHub, $timeout) ->
+angular.module('Darkswarm').controller "ProductsCtrl", ($scope, $sce, $filter, $rootScope, Products, OrderCycle, OrderCycleResource, FilterSelectorsService, Cart, Dereferencer, Taxons, Properties, currentHub, $timeout) ->
   $scope.Products = Products
   $scope.Cart = Cart
   $scope.query = ""
diff --git a/app/assets/javascripts/darkswarm/controllers/registration/registration_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/registration/registration_controller.js.coffee
index a01575fc8d..5145c05ea1 100644
--- a/app/assets/javascripts/darkswarm/controllers/registration/registration_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/registration/registration_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "RegistrationCtrl", ($scope, RegistrationService, EnterpriseRegistrationService, availableCountries, GmapsGeo) ->
+angular.module('Darkswarm').controller "RegistrationCtrl", ($scope, RegistrationService, EnterpriseRegistrationService, availableCountries, GmapsGeo) ->
   $scope.currentStep = RegistrationService.currentStep
   $scope.enterprise = EnterpriseRegistrationService.enterprise
   $scope.select = RegistrationService.select
diff --git a/app/assets/javascripts/darkswarm/controllers/registration/registration_form_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/registration/registration_form_controller.js.coffee
index 546186f53d..f5ea72fe52 100644
--- a/app/assets/javascripts/darkswarm/controllers/registration/registration_form_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/registration/registration_form_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "RegistrationFormCtrl", ($scope, RegistrationService, EnterpriseRegistrationService) ->
+angular.module('Darkswarm').controller "RegistrationFormCtrl", ($scope, RegistrationService, EnterpriseRegistrationService) ->
   $scope.submitted = false
   $scope.isDisabled = false
 
diff --git a/app/assets/javascripts/darkswarm/controllers/shop_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/shop_node_controller.js.coffee
index 34c72f21b7..b8331e0f72 100644
--- a/app/assets/javascripts/darkswarm/controllers/shop_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/shop_node_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "ShopNodeCtrl", ($scope, HashNavigation, $anchorScroll) ->
+angular.module('Darkswarm').controller "ShopNodeCtrl", ($scope, HashNavigation, $anchorScroll) ->
   $scope.toggle = ->
     HashNavigation.toggle $scope.shop.hash
 
diff --git a/app/assets/javascripts/darkswarm/controllers/shop_variant_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/shop_variant_controller.js.coffee
index e71a7a0a29..d6772d7e89 100644
--- a/app/assets/javascripts/darkswarm/controllers/shop_variant_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/shop_variant_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "ShopVariantCtrl", ($scope, $modal, Cart) ->
+angular.module('Darkswarm').controller "ShopVariantCtrl", ($scope, $modal, Cart) ->
   $scope.updateCart = (line_item) ->
     Cart.adjust($scope.variant.line_item)
 
diff --git a/app/assets/javascripts/darkswarm/controllers/tabs/about_us_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/tabs/about_us_controller.js.coffee
index 3fe16194f0..1f43906a62 100644
--- a/app/assets/javascripts/darkswarm/controllers/tabs/about_us_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/tabs/about_us_controller.js.coffee
@@ -1,2 +1,2 @@
-Darkswarm.controller "AboutUsCtrl", ($scope, Shopfront) ->
+angular.module('Darkswarm').controller "AboutUsCtrl", ($scope, Shopfront) ->
   $scope.shopfront = Shopfront.shopfront
diff --git a/app/assets/javascripts/darkswarm/controllers/tabs/producers_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/tabs/producers_controller.js.coffee
index e62357f4e8..e0ce4e10c5 100644
--- a/app/assets/javascripts/darkswarm/controllers/tabs/producers_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/tabs/producers_controller.js.coffee
@@ -1,2 +1,2 @@
-Darkswarm.controller "ProducersTabCtrl", ($scope, Shopfront) ->
+angular.module('Darkswarm').controller "ProducersTabCtrl", ($scope, Shopfront) ->
   $scope.shopfront = Shopfront.shopfront
diff --git a/app/assets/javascripts/darkswarm/controllers/tabs_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/tabs_controller.js.coffee
index 09095ebd42..6ff0bfacb3 100644
--- a/app/assets/javascripts/darkswarm/controllers/tabs_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/tabs_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "TabsCtrl", ($scope, Navigation) ->
+angular.module('Darkswarm').controller "TabsCtrl", ($scope, Navigation) ->
   $scope.isActive = Navigation.isActive
 
   # Select tab by setting the url hash path.
diff --git a/app/assets/javascripts/darkswarm/controllers/tmp_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/tmp_controller.js.coffee
index 8f173df154..76b4d6cb3f 100644
--- a/app/assets/javascripts/darkswarm/controllers/tmp_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/tmp_controller.js.coffee
@@ -1,2 +1,2 @@
-Darkswarm.controller "TmpCtrl", ($scope)->
+angular.module('Darkswarm').controller "TmpCtrl", ($scope)->
   $scope.test = {foo: "bar"}
diff --git a/app/assets/javascripts/darkswarm/darkswarm.js.coffee b/app/assets/javascripts/darkswarm/darkswarm.js.coffee
index 86bc4ef0f2..5f6953b494 100644
--- a/app/assets/javascripts/darkswarm/darkswarm.js.coffee
+++ b/app/assets/javascripts/darkswarm/darkswarm.js.coffee
@@ -1,4 +1,4 @@
-window.Darkswarm = angular.module("Darkswarm", [
+angular.module("Darkswarm", [
   'ngResource',
   'mm.foundation',
   'LocalStorageModule',
diff --git a/app/assets/javascripts/darkswarm/directives/active_selector.js.coffee b/app/assets/javascripts/darkswarm/directives/active_selector.js.coffee
index 46be338610..80c2db4b86 100644
--- a/app/assets/javascripts/darkswarm/directives/active_selector.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/active_selector.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "activeSelector",  ->
+angular.module('Darkswarm').directive "activeSelector",  ->
   # A generic selector that allows an object/scope to be toggled between active and inactive
   # Used in the filters, but hypothetically useable anywhere
   restrict: 'E'
diff --git a/app/assets/javascripts/darkswarm/directives/active_table_hub_link.js.coffee b/app/assets/javascripts/darkswarm/directives/active_table_hub_link.js.coffee
index 994a7ced48..43a92a9908 100644
--- a/app/assets/javascripts/darkswarm/directives/active_table_hub_link.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/active_table_hub_link.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "activeTableHubLink", (CurrentHub, CurrentOrder) ->
+angular.module('Darkswarm').directive "activeTableHubLink", (CurrentHub, CurrentOrder) ->
   # Change the text of the hub link based on CurrentHub
   # To be used with ofnEmptiesCart
   # Takes "change" and "shop" as text string attributes
diff --git a/app/assets/javascripts/darkswarm/directives/auth.js.coffee b/app/assets/javascripts/darkswarm/directives/auth.js.coffee
index 46ae301651..f554e9de20 100644
--- a/app/assets/javascripts/darkswarm/directives/auth.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/auth.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive 'auth', (AuthenticationService) ->
+angular.module('Darkswarm').directive 'auth', (AuthenticationService) ->
   restrict: 'A'
   link: (scope, elem, attrs) ->
     elem.bind "click", ->
diff --git a/app/assets/javascripts/darkswarm/directives/body_scroll.js.coffee b/app/assets/javascripts/darkswarm/directives/body_scroll.js.coffee
index dce6d4c5e5..6066fbf768 100644
--- a/app/assets/javascripts/darkswarm/directives/body_scroll.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/body_scroll.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "bodyScroll", ($rootScope, BodyScroll) ->
+angular.module('Darkswarm').directive "bodyScroll", ($rootScope, BodyScroll) ->
   restrict: 'A'
   scope: true
   link: (scope, elem, attrs) ->
diff --git a/app/assets/javascripts/darkswarm/directives/change_hub.js.coffee b/app/assets/javascripts/darkswarm/directives/change_hub.js.coffee
index 8629edfce2..20b7fd6956 100644
--- a/app/assets/javascripts/darkswarm/directives/change_hub.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/change_hub.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "ofnChangeHub", (CurrentHub, Cart) ->
+angular.module('Darkswarm').directive "ofnChangeHub", (CurrentHub, Cart) ->
   # Compares scope.hub with CurrentHub. Will trigger an confirmation if they are different,
   # and Cart isn't empty
   restrict: "A"
diff --git a/app/assets/javascripts/darkswarm/directives/change_order_cycle.js.coffee b/app/assets/javascripts/darkswarm/directives/change_order_cycle.js.coffee
index 574c29cc30..73c8494d21 100644
--- a/app/assets/javascripts/darkswarm/directives/change_order_cycle.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/change_order_cycle.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "ofnChangeOrderCycle", (OrderCycle, Cart) ->
+angular.module('Darkswarm').directive "ofnChangeOrderCycle", (OrderCycle, Cart) ->
   # Compares chosen order cycle with pre-set OrderCycle. Will trigger
   # a confirmation if they are different, and Cart isn't empty
   restrict: "A"
diff --git a/app/assets/javascripts/darkswarm/directives/changeable_order_alert.js.coffee b/app/assets/javascripts/darkswarm/directives/changeable_order_alert.js.coffee
index 7fec779ce1..40cf9463c0 100644
--- a/app/assets/javascripts/darkswarm/directives/changeable_order_alert.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/changeable_order_alert.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "changeableOrdersAlert", (ChangeableOrdersAlert) ->
+angular.module('Darkswarm').directive "changeableOrdersAlert", (ChangeableOrdersAlert) ->
   restrict: "C"
   scope: true
   link: (scope, element, attrs) ->
diff --git a/app/assets/javascripts/darkswarm/directives/confirm_link_click.js.coffee b/app/assets/javascripts/darkswarm/directives/confirm_link_click.js.coffee
index b5da68d4dc..c4a861fda6 100644
--- a/app/assets/javascripts/darkswarm/directives/confirm_link_click.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/confirm_link_click.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "confirmLinkClick", ($window) ->
+angular.module('Darkswarm').directive "confirmLinkClick", ($window) ->
   restrict: 'A'
   scope:
     confirmMsg: '@confirmLinkClick'
diff --git a/app/assets/javascripts/darkswarm/directives/darker_background.js.coffee b/app/assets/javascripts/darkswarm/directives/darker_background.js.coffee
index 629b6a377a..b41541fab1 100644
--- a/app/assets/javascripts/darkswarm/directives/darker_background.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/darker_background.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "darkerBackground", ->
+angular.module('Darkswarm').directive "darkerBackground", ->
   restrict: "A"
   link: (scope, elm, attr)->
     toggleClass = (value) ->
diff --git a/app/assets/javascripts/darkswarm/directives/debounce.js.coffee b/app/assets/javascripts/darkswarm/directives/debounce.js.coffee
index 80f55de1d7..c6ee9a1ca6 100644
--- a/app/assets/javascripts/darkswarm/directives/debounce.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/debounce.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "ngDebounce", ($timeout) ->
+angular.module('Darkswarm').directive "ngDebounce", ($timeout) ->
   # Slows down ng-model updates, only triggering binding ngDebounce milliseconds
   # after the last change. Used to prevent squirrely UI
   restrict: "A"
diff --git a/app/assets/javascripts/darkswarm/directives/disable_dynamically.js.coffee b/app/assets/javascripts/darkswarm/directives/disable_dynamically.js.coffee
index 7cff41f3f4..33df890ead 100644
--- a/app/assets/javascripts/darkswarm/directives/disable_dynamically.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/disable_dynamically.js.coffee
@@ -1,7 +1,7 @@
 # Allows disabling of link buttons via disabled attribute.
 # This is normally ignored, ie the link appears disabled but is still clickable.
 
-Darkswarm.directive "disableDynamically", ->
+angular.module('Darkswarm').directive "disableDynamically", ->
   restrict: 'A'
 
   link: (scope, element, attrs) ->
@@ -10,3 +10,5 @@ Darkswarm.directive "disableDynamically", ->
         e.preventDefault()
       return
 
+    scope.$on "$destroy", ->
+      element.off("click")
diff --git a/app/assets/javascripts/darkswarm/directives/disable_enter.js.coffee b/app/assets/javascripts/darkswarm/directives/disable_enter.js.coffee
index ce1178e15e..bf4194fc20 100644
--- a/app/assets/javascripts/darkswarm/directives/disable_enter.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/disable_enter.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "ofnDisableEnter", ()->
+angular.module('Darkswarm').directive "ofnDisableEnter", ()->
   # Stops enter from doing normal enter things
   restrict: 'A'
   link: (scope, element, attrs)->
diff --git a/app/assets/javascripts/darkswarm/directives/disable_enter_with_blur.js.coffee b/app/assets/javascripts/darkswarm/directives/disable_enter_with_blur.js.coffee
index 1704d4c0f9..6210b8a065 100644
--- a/app/assets/javascripts/darkswarm/directives/disable_enter_with_blur.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/disable_enter_with_blur.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "disableEnterWithBlur", ()->
+angular.module('Darkswarm').directive "disableEnterWithBlur", ()->
   # Stops enter from doing normal enter things, and blurs the input
   restrict: 'A'
   link: (scope, element, attrs)->
diff --git a/app/assets/javascripts/darkswarm/directives/disable_scroll.js.coffee b/app/assets/javascripts/darkswarm/directives/disable_scroll.js.coffee
index 40b8230e65..aafdf57392 100644
--- a/app/assets/javascripts/darkswarm/directives/disable_scroll.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/disable_scroll.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "ofnDisableScroll", ()->
+angular.module('Darkswarm').directive "ofnDisableScroll", ()->
   # Stops scrolling from incrementing or decrementing input value
   # Useful for number inputs
   restrict: 'A'
diff --git a/app/assets/javascripts/darkswarm/directives/enterprise_modal.js.coffee b/app/assets/javascripts/darkswarm/directives/enterprise_modal.js.coffee
index 1bd5d177c1..27995efc5f 100644
--- a/app/assets/javascripts/darkswarm/directives/enterprise_modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/enterprise_modal.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "enterpriseModal", (EnterpriseModal) ->
+angular.module('Darkswarm').directive "enterpriseModal", (EnterpriseModal) ->
   restrict: 'E'
   replace: true
   template: "<a ng-transclude></a>"
@@ -6,5 +6,7 @@ Darkswarm.directive "enterpriseModal", (EnterpriseModal) ->
   link: (scope, elem, attrs, ctrl) ->
     elem.on "click", (event) =>
       event.stopPropagation()
-
       scope.modalInstance = EnterpriseModal.open scope.enterprise
+
+    scope.$on "$destroy", ->
+      elem.off("click")
diff --git a/app/assets/javascripts/darkswarm/directives/fill_vertical.js.coffee b/app/assets/javascripts/darkswarm/directives/fill_vertical.js.coffee
index c9d05428ce..b22de98f05 100644
--- a/app/assets/javascripts/darkswarm/directives/fill_vertical.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/fill_vertical.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "fillVertical", ($window)->
+angular.module('Darkswarm').directive "fillVertical", ($window)->
   # Makes something fill the window vertically. Used on the Google Map.
   restrict: 'A'
   link: (scope, element, attrs)->
diff --git a/app/assets/javascripts/darkswarm/directives/filter_selector.js.coffee b/app/assets/javascripts/darkswarm/directives/filter_selector.js.coffee
index 2090c481f7..5a3b3ccaa6 100644
--- a/app/assets/javascripts/darkswarm/directives/filter_selector.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/filter_selector.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "filterSelector", ->
+angular.module('Darkswarm').directive "filterSelector", ->
   # Automatically builds activeSelectors for taxons
   # Lots of magic here
   restrict: 'E'
diff --git a/app/assets/javascripts/darkswarm/directives/flash.js.coffee b/app/assets/javascripts/darkswarm/directives/flash.js.coffee
index 74f6571f73..40337ed5f2 100644
--- a/app/assets/javascripts/darkswarm/directives/flash.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/flash.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "ofnFlash", (flash, $timeout, RailsFlashLoader)->
+angular.module('Darkswarm').directive "ofnFlash", (flash, $timeout, RailsFlashLoader)->
   # Our own flash class. Uses the "flash" service (third party), and a directive 
   # called RailsFlashLoader to render
   typePairings =
diff --git a/app/assets/javascripts/darkswarm/directives/focus.js.coffee b/app/assets/javascripts/darkswarm/directives/focus.js.coffee
index 3c3bb4f05a..62eb3d5a39 100644
--- a/app/assets/javascripts/darkswarm/directives/focus.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/focus.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "ofnFocus", ->
+angular.module('Darkswarm').directive "ofnFocus", ->
   # Takes an expression attrs.ofnFocus
   # Watches value of expression, triggers element.focus() when value is truthy
   # Used to automatically focus on specific inputs in various circumstances
diff --git a/app/assets/javascripts/darkswarm/directives/focus_search.coffee b/app/assets/javascripts/darkswarm/directives/focus_search.coffee
index 076c310351..33e53343f9 100644
--- a/app/assets/javascripts/darkswarm/directives/focus_search.coffee
+++ b/app/assets/javascripts/darkswarm/directives/focus_search.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "focusSearch", ->
+angular.module('Darkswarm').directive "focusSearch", ->
   restrict: 'A'
   link: (scope, element, attr)->
     element.bind 'click', (event) ->
diff --git a/app/assets/javascripts/darkswarm/directives/help_modal.js.coffee b/app/assets/javascripts/darkswarm/directives/help_modal.js.coffee
index 6aef4f481b..69e730315c 100644
--- a/app/assets/javascripts/darkswarm/directives/help_modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/help_modal.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "helpModal", ($modal, $compile, $templateCache)->
+angular.module('Darkswarm').directive "helpModal", ($modal, $compile, $templateCache)->
   restrict: 'A'
   scope:
     helpText: "@helpModal"
@@ -8,3 +8,6 @@ Darkswarm.directive "helpModal", ($modal, $compile, $templateCache)->
 
     elem.on "click", =>
       $modal.open(controller: ctrl, template: compiled, scope: scope, windowClass: 'help-modal small')
+
+    scope.$on "$destroy", ->
+      elem.off("click")
diff --git a/app/assets/javascripts/darkswarm/directives/inline_alert.js.coffee b/app/assets/javascripts/darkswarm/directives/inline_alert.js.coffee
index 9b37934375..217a82b35b 100644
--- a/app/assets/javascripts/darkswarm/directives/inline_alert.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/inline_alert.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "ofnInlineAlert", ->
+angular.module('Darkswarm').directive "ofnInlineAlert", ->
   restrict: 'A'
   scope: true
   link: (scope, elem, attrs) ->
diff --git a/app/assets/javascripts/darkswarm/directives/integer.js.coffee b/app/assets/javascripts/darkswarm/directives/integer.js.coffee
index e162246122..1ad89777ee 100644
--- a/app/assets/javascripts/darkswarm/directives/integer.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/integer.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "integer", ->
+angular.module('Darkswarm').directive "integer", ->
   restrict: 'A'
   link: (scope, elem, attr) ->
     elem.bind 'input', ->
diff --git a/app/assets/javascripts/darkswarm/directives/link_to_service.js.coffee b/app/assets/javascripts/darkswarm/directives/link_to_service.js.coffee
index dc0f513588..74a11b0082 100644
--- a/app/assets/javascripts/darkswarm/directives/link_to_service.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/link_to_service.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "linkToService", ->
+angular.module('Darkswarm').directive "linkToService", ->
   restrict: 'E'
   replace: true
   scope: {
diff --git a/app/assets/javascripts/darkswarm/directives/loading.js.coffee b/app/assets/javascripts/darkswarm/directives/loading.js.coffee
index c7191b4fe2..c8063ae075 100644
--- a/app/assets/javascripts/darkswarm/directives/loading.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/loading.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "loading", (Loading)->
+angular.module('Darkswarm').directive "loading", (Loading)->
   # Triggers a screen-wide "loading" thing when Ajaxy stuff is happening
   scope: {}
   restrict: 'E'
diff --git a/app/assets/javascripts/darkswarm/directives/logo_fallback.js.coffee b/app/assets/javascripts/darkswarm/directives/logo_fallback.js.coffee
index 85f697af3d..6bb3098398 100644
--- a/app/assets/javascripts/darkswarm/directives/logo_fallback.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/logo_fallback.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "logoFallback", () ->
+angular.module('Darkswarm').directive "logoFallback", () ->
   restrict: "A"
   link: (scope, elm, attr)->
     elm.bind('error', ->
diff --git a/app/assets/javascripts/darkswarm/directives/mailto.js.coffee b/app/assets/javascripts/darkswarm/directives/mailto.js.coffee
index 27299005a9..7c4a3284d5 100644
--- a/app/assets/javascripts/darkswarm/directives/mailto.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/mailto.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "mailto", (Navigation)->
+angular.module('Darkswarm').directive "mailto", (Navigation)->
   restrict: 'A'
   link: (scope, element, attrs)->
     element.bind 'click', (e)->
diff --git a/app/assets/javascripts/darkswarm/directives/map_search.js.coffee b/app/assets/javascripts/darkswarm/directives/map_search.js.coffee
index bd46a9c80d..d885e18a79 100644
--- a/app/assets/javascripts/darkswarm/directives/map_search.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/map_search.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive 'mapSearch', ($timeout, Search) ->
+angular.module('Darkswarm').directive 'mapSearch', ($timeout, Search) ->
   # Install a basic search field in a map
   restrict: 'E'
   require: ['^uiGmapGoogleMap', 'ngModel']
diff --git a/app/assets/javascripts/darkswarm/directives/max.js.coffee b/app/assets/javascripts/darkswarm/directives/max.js.coffee
index ed3d7b3253..97ce457e05 100644
--- a/app/assets/javascripts/darkswarm/directives/max.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/max.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "max",  ->
+angular.module('Darkswarm').directive "max",  ->
   restrict: 'A'
   link: (scope, elem, attr)->
     elem.bind 'input', ->
diff --git a/app/assets/javascripts/darkswarm/directives/modal.js.coffee b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
index 7c1babe215..fb5c0dedca 100644
--- a/app/assets/javascripts/darkswarm/directives/modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "ofnModal", ($modal)->
+angular.module('Darkswarm').directive "ofnModal", ($modal)->
   # Generic modal! Uses transclusion so designer-types can do stuff like:
   # %ofn-modal 
   #   CONTENT
@@ -17,3 +17,6 @@ Darkswarm.directive "ofnModal", ($modal)->
     elem.on "click", =>
       transclude scope, (clone)->
         scope.modalInstance = $modal.open(controller: ctrl, template: clone, scope: scope)
+
+    scope.$on "$destroy", ->
+      elem.off("click")
diff --git a/app/assets/javascripts/darkswarm/directives/on_hand.js.coffee b/app/assets/javascripts/darkswarm/directives/on_hand.js.coffee
index 66c20d86fb..0edae73c22 100644
--- a/app/assets/javascripts/darkswarm/directives/on_hand.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/on_hand.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "ofnOnHand", (StockQuantity) ->
+angular.module('Darkswarm').directive "ofnOnHand", (StockQuantity) ->
   restrict: 'A'
   require: "ngModel"
   scope: true
diff --git a/app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee b/app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee
index 32f0d921b0..9cf7b450b3 100644
--- a/app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/open_street_map.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive 'ofnOpenStreetMap', ($window, MapCentreCalculator, Enterprises, EnterpriseModal, availableCountries, openStreetMapConfig) ->
+angular.module('Darkswarm').directive 'ofnOpenStreetMap', ($window, MapCentreCalculator, Enterprises, EnterpriseModal, availableCountries, openStreetMapConfig) ->
   restrict: 'E'
   replace: true
   scope: true
@@ -23,6 +23,11 @@ Darkswarm.directive 'ofnOpenStreetMap', ($window, MapCentreCalculator, Enterpris
         EnterpriseModal.open enterprise
       marker
 
+    # Remove event handlers on $destroy
+    scope.$on "$destroy", ->
+      markers.forEach(marker_element) ->
+        marker_element.off("click")
+
     enterpriseName = (enterprise) ->
       return enterprise.name + " (" + enterprise.address.address1 + ", " + enterprise.address.city + ", " + enterprise.address.state_name + ")";
 
diff --git a/app/assets/javascripts/darkswarm/directives/page_alert.js.coffee b/app/assets/javascripts/darkswarm/directives/page_alert.js.coffee
index 666daaec64..d0fadadde7 100644
--- a/app/assets/javascripts/darkswarm/directives/page_alert.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/page_alert.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "ofnPageAlert", ($timeout) ->
+angular.module('Darkswarm').directive "ofnPageAlert", ($timeout) ->
   restrict: 'A'
   scope: true
   link: (scope, elem, attrs) ->
diff --git a/app/assets/javascripts/darkswarm/directives/price_breakdown.js.coffee b/app/assets/javascripts/darkswarm/directives/price_breakdown.js.coffee
index 1b4609ff4d..77979ed82d 100644
--- a/app/assets/javascripts/darkswarm/directives/price_breakdown.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/price_breakdown.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "priceBreakdown", ($tooltip)->
+angular.module('Darkswarm').directive "priceBreakdown", ($tooltip)->
   # We use the $tooltip service from Angular foundation to give us boilerplate
   # Subsequently we patch the scope, template and restrictions
   tooltip = $tooltip 'priceBreakdown', 'priceBreakdown', 'click'
@@ -10,7 +10,7 @@ Darkswarm.directive "priceBreakdown", ($tooltip)->
   tooltip
 
 # This is automatically referenced via naming convention in $tooltip
-Darkswarm.directive 'priceBreakdownPopup', ->
+angular.module('Darkswarm').directive 'priceBreakdownPopup', ->
   restrict: 'EA'
   replace: true
   templateUrl: 'price_breakdown.html'
diff --git a/app/assets/javascripts/darkswarm/directives/registration_limit_modal.js.coffee b/app/assets/javascripts/darkswarm/directives/registration_limit_modal.js.coffee
index fce9a7ee59..2b7a25041a 100644
--- a/app/assets/javascripts/darkswarm/directives/registration_limit_modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/registration_limit_modal.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "ofnRegistrationLimitModal", (Navigation, $modal, Loading) ->
+angular.module('Darkswarm').directive "ofnRegistrationLimitModal", (Navigation, $modal, Loading) ->
   restrict: 'A'
   link: (scope, elem, attr)->
     scope.modalInstance = $modal.open
diff --git a/app/assets/javascripts/darkswarm/directives/render_svg.js.coffee b/app/assets/javascripts/darkswarm/directives/render_svg.js.coffee
index c53448473d..4329b3ca4c 100644
--- a/app/assets/javascripts/darkswarm/directives/render_svg.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/render_svg.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "renderSvg", ()->
+angular.module('Darkswarm').directive "renderSvg", ()->
   # Magical directive that'll render SVGs from URLs
   # If only there were a neater way of doing this
   restrict: 'E'
diff --git a/app/assets/javascripts/darkswarm/directives/scroll_after_load.js.coffee b/app/assets/javascripts/darkswarm/directives/scroll_after_load.js.coffee
index e29dcbb8f8..1fdda2c4ed 100644
--- a/app/assets/javascripts/darkswarm/directives/scroll_after_load.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/scroll_after_load.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive 'scrollAfterLoad', ($timeout, $location, $document)->
+angular.module('Darkswarm').directive 'scrollAfterLoad', ($timeout, $location, $document)->
   # Scroll to an element on page load
   restrict: "A"
   link: (scope, element, attr) ->
diff --git a/app/assets/javascripts/darkswarm/directives/scrollto.js.coffee b/app/assets/javascripts/darkswarm/directives/scrollto.js.coffee
index a63337dc70..7fd5d6c99c 100644
--- a/app/assets/javascripts/darkswarm/directives/scrollto.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/scrollto.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "ofnScrollTo", ($location, $anchorScroll)->
+angular.module('Darkswarm').directive "ofnScrollTo", ($location, $anchorScroll)->
   # Onclick sets $location.hash to attrs.ofnScrollTo
   # Then triggers anchorScroll
   restrict: 'A'
diff --git a/app/assets/javascripts/darkswarm/directives/shipping_type_selector.js.coffee b/app/assets/javascripts/darkswarm/directives/shipping_type_selector.js.coffee
index 1f0196f9fe..b7ffe71eb9 100644
--- a/app/assets/javascripts/darkswarm/directives/shipping_type_selector.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/shipping_type_selector.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "shippingTypeSelector", ->
+angular.module('Darkswarm').directive "shippingTypeSelector", ->
   # Builds selector for shipping types
   restrict: 'E'
   replace: true
diff --git a/app/assets/javascripts/darkswarm/directives/shop_variant.js.coffee b/app/assets/javascripts/darkswarm/directives/shop_variant.js.coffee
index 1872b55dfd..372a92b69d 100644
--- a/app/assets/javascripts/darkswarm/directives/shop_variant.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/shop_variant.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "shopVariant", ->
+angular.module('Darkswarm').directive "shopVariant", ->
   restrict: 'E'
   replace: true
   templateUrl: 'shop_variant.html'
diff --git a/app/assets/javascripts/darkswarm/directives/single_line_selectors.coffee b/app/assets/javascripts/darkswarm/directives/single_line_selectors.coffee
index 9cc125a537..5bc3daa635 100644
--- a/app/assets/javascripts/darkswarm/directives/single_line_selectors.coffee
+++ b/app/assets/javascripts/darkswarm/directives/single_line_selectors.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive 'singleLineSelectors', ($timeout, $filter) ->
+angular.module('Darkswarm').directive 'singleLineSelectors', ($timeout, $filter) ->
   restrict: 'E'
   templateUrl: "single_line_selectors.html"
   scope:
diff --git a/app/assets/javascripts/darkswarm/directives/smooth_scroll_to.js.coffee b/app/assets/javascripts/darkswarm/directives/smooth_scroll_to.js.coffee
deleted file mode 100644
index 34552016c4..0000000000
--- a/app/assets/javascripts/darkswarm/directives/smooth_scroll_to.js.coffee
+++ /dev/null
@@ -1,14 +0,0 @@
-Darkswarm.directive "ofnSmoothScrollTo", ($location, $document)->
-  # Onclick sets $location.hash to attrs.ofnScrollTo
-  # Then triggers $document.scrollTo
-  restrict: 'A'
-  link: (scope, element, attrs)->
-    element.bind 'click', (ev)->
-      ev.stopPropagation()
-      $location.hash attrs.ofnScrollTo
-      target = $("a[name='#{attrs.ofnSmoothScrollTo}']")
-      # Scrolling is confused by our position:fixed top bar and page alert bar
-      # - add an offset to scroll to the correct location, plus 5px buffer
-      offset  = $("nav.top-bar").height()
-      offset += 5
-      $document.scrollTo target, offset, 1000
diff --git a/app/assets/javascripts/darkswarm/directives/stripe_elements.js.coffee b/app/assets/javascripts/darkswarm/directives/stripe_elements.js.coffee
index d88e0868a6..5aaa1ac2ab 100644
--- a/app/assets/javascripts/darkswarm/directives/stripe_elements.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/stripe_elements.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "stripeElements", ($injector, StripeElements) ->
+angular.module('Darkswarm').directive "stripeElements", ($injector, StripeElements) ->
   restrict: 'E'
   template: "<label for='card-element'>\
              <div id='card-element'></div>\
diff --git a/app/assets/javascripts/darkswarm/directives/tab.js.coffee b/app/assets/javascripts/darkswarm/directives/tab.js.coffee
index d68e629688..28a1289a8b 100644
--- a/app/assets/javascripts/darkswarm/directives/tab.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/tab.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "tab", ->
+angular.module('Darkswarm').directive "tab", ->
   restrict: "C"
   require: "^^tabsetCtrl"
   scope:
@@ -8,5 +8,8 @@ Darkswarm.directive "tab", ->
       scope.$apply ->
         ctrl.toggle(scope.name)
 
+    scope.$on "$destroy", ->
+      element.off("click")
+
     ctrl.registerSelectionListener (prefix, selection) ->
       element.toggleClass('selected', selection == scope.name)
diff --git a/app/assets/javascripts/darkswarm/directives/tab_view.coffee b/app/assets/javascripts/darkswarm/directives/tab_view.coffee
index b9b35317b8..a23f6c17c0 100644
--- a/app/assets/javascripts/darkswarm/directives/tab_view.coffee
+++ b/app/assets/javascripts/darkswarm/directives/tab_view.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "tabView", ->
+angular.module('Darkswarm').directive "tabView", ->
   restrict: "C"
   require: "^^tabsetCtrl"
   template: "<div ng-include='template'></div>"
diff --git a/app/assets/javascripts/darkswarm/directives/tabset_ctrl.js.coffee b/app/assets/javascripts/darkswarm/directives/tabset_ctrl.js.coffee
index 4587a7cca4..69c86f080c 100644
--- a/app/assets/javascripts/darkswarm/directives/tabset_ctrl.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/tabset_ctrl.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "tabsetCtrl", (Tabsets, $location, $rootScope) ->
+angular.module('Darkswarm').directive "tabsetCtrl", (Tabsets, $location, $rootScope) ->
   restrict: "C"
   scope:
     id: "@"
diff --git a/app/assets/javascripts/darkswarm/directives/target_blank.js.coffee b/app/assets/javascripts/darkswarm/directives/target_blank.js.coffee
index f7d52f07bf..03e8308e7e 100644
--- a/app/assets/javascripts/darkswarm/directives/target_blank.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/target_blank.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "embeddedTargetBlank", ->
+angular.module('Darkswarm').directive "embeddedTargetBlank", ->
   restrict: 'A'
   compile: (element) ->
     elems = (element.children().find("a"))
diff --git a/app/assets/javascripts/darkswarm/directives/validate_stock_quantity.js.coffee b/app/assets/javascripts/darkswarm/directives/validate_stock_quantity.js.coffee
index 3ceee62a4d..93f5ac9b1a 100644
--- a/app/assets/javascripts/darkswarm/directives/validate_stock_quantity.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/validate_stock_quantity.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive "validateStockQuantity", (StockQuantity) ->
+angular.module('Darkswarm').directive "validateStockQuantity", (StockQuantity) ->
   restrict: 'A'
   require: "ngModel"
   scope: true
diff --git a/app/assets/javascripts/darkswarm/filters/active.js.coffee b/app/assets/javascripts/darkswarm/filters/active.js.coffee
index 93bf1c658c..9a60b5b1dc 100644
--- a/app/assets/javascripts/darkswarm/filters/active.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/active.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter 'active', ()-> 
+angular.module('Darkswarm').filter 'active', ()->
   (objects, options)->
     objects ||= []
     options ?= null
diff --git a/app/assets/javascripts/darkswarm/filters/by_producer.js.coffee b/app/assets/javascripts/darkswarm/filters/by_producer.js.coffee
index 3b9ec12d2b..56a655a6e6 100644
--- a/app/assets/javascripts/darkswarm/filters/by_producer.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/by_producer.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter "byProducer", ->
+angular.module('Darkswarm').filter "byProducer", ->
   (objects, id) ->
     objects ||= []
     id ?= 0
diff --git a/app/assets/javascripts/darkswarm/filters/capitalize.js.coffee b/app/assets/javascripts/darkswarm/filters/capitalize.js.coffee
index 5c2272135b..0548bb9d6a 100644
--- a/app/assets/javascripts/darkswarm/filters/capitalize.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/capitalize.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter "capitalize", ->
+angular.module('Darkswarm').filter "capitalize", ->
   # Convert to basic sentence case.
   (input, scope) ->
     input = input.toLowerCase() if input?
diff --git a/app/assets/javascripts/darkswarm/filters/closed_shops.js.coffee b/app/assets/javascripts/darkswarm/filters/closed_shops.js.coffee
index 23d5de8255..a8f5595ef4 100644
--- a/app/assets/javascripts/darkswarm/filters/closed_shops.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/closed_shops.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter 'closedShops', ->
+angular.module('Darkswarm').filter 'closedShops', ->
   (enterprises, show_closed) ->
     enterprises ||= []
     show_closed ?= false
diff --git a/app/assets/javascripts/darkswarm/filters/dates.js.coffee b/app/assets/javascripts/darkswarm/filters/dates.js.coffee
index cef73413a7..dbc4f08a10 100644
--- a/app/assets/javascripts/darkswarm/filters/dates.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/dates.js.coffee
@@ -1,11 +1,11 @@
 @API_DATETIME_FORMAT = "YYYY-MM-DD HH:mm:SS Z"
 
-Darkswarm.filter "date_in_words", ->
+angular.module('Darkswarm').filter "date_in_words", ->
   (date, dateFormat) ->
     dateFormat ?= @API_DATETIME_FORMAT
     moment(date, dateFormat).fromNow()
 
-Darkswarm.filter "sensible_timeframe", (date_in_wordsFilter)->
+angular.module('Darkswarm').filter "sensible_timeframe", (date_in_wordsFilter)->
   (date, dateFormat) ->
     dateFormat ?= @API_DATETIME_FORMAT
 
diff --git a/app/assets/javascripts/darkswarm/filters/distance_within_km.js.coffee b/app/assets/javascripts/darkswarm/filters/distance_within_km.js.coffee
index c6a37a2b40..9ebf5f9adf 100644
--- a/app/assets/javascripts/darkswarm/filters/distance_within_km.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/distance_within_km.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter 'distanceWithinKm', ->
+angular.module('Darkswarm').filter 'distanceWithinKm', ->
   (enterprises, range) ->
     enterprises ||= []
     enterprises.filter (enterprise) ->
diff --git a/app/assets/javascripts/darkswarm/filters/enterpriseMatchesNameQuery.js.coffee b/app/assets/javascripts/darkswarm/filters/enterpriseMatchesNameQuery.js.coffee
index 6e786a9f62..2f78f8632c 100644
--- a/app/assets/javascripts/darkswarm/filters/enterpriseMatchesNameQuery.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/enterpriseMatchesNameQuery.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter 'enterpriseMatchesNameQuery', ->
+angular.module('Darkswarm').filter 'enterpriseMatchesNameQuery', ->
   (enterprises, matches_name_query) ->
     enterprises.filter (enterprise) ->
       enterprise.matches_name_query == matches_name_query
diff --git a/app/assets/javascripts/darkswarm/filters/ext_url.js.coffee b/app/assets/javascripts/darkswarm/filters/ext_url.js.coffee
index 38eed7c294..f4939d2c63 100644
--- a/app/assets/javascripts/darkswarm/filters/ext_url.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/ext_url.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter "ext_url", ->
+angular.module('Darkswarm').filter "ext_url", ->
   urlPattern = /^https?:\/\//
   (url, prefix) ->
     if !url || url.match(urlPattern)
diff --git a/app/assets/javascripts/darkswarm/filters/filter_groups.js.coffee b/app/assets/javascripts/darkswarm/filters/filter_groups.js.coffee
index 519b6f6ae9..ba80c76214 100644
--- a/app/assets/javascripts/darkswarm/filters/filter_groups.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/filter_groups.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter "groups", (Matcher)->
+angular.module('Darkswarm').filter "groups", (Matcher)->
   (groups, text)->
     groups ||= []
     text ?= ""
diff --git a/app/assets/javascripts/darkswarm/filters/filter_products.js.coffee b/app/assets/javascripts/darkswarm/filters/filter_products.js.coffee
index bf0094bbd3..38888354d4 100644
--- a/app/assets/javascripts/darkswarm/filters/filter_products.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/filter_products.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter 'products', (Matcher) ->
+angular.module('Darkswarm').filter 'products', (Matcher) ->
   (products, text) ->
     products ||= []
     text ?= ""
diff --git a/app/assets/javascripts/darkswarm/filters/format_balance.js.coffee b/app/assets/javascripts/darkswarm/filters/format_balance.js.coffee
index 1b42e9e75d..89e2def640 100644
--- a/app/assets/javascripts/darkswarm/filters/format_balance.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/format_balance.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter "formatBalance", (localizeCurrencyFilter, tFilter)->
+angular.module('Darkswarm').filter "formatBalance", (localizeCurrencyFilter, tFilter)->
   # Convert number to string currency using injected currency configuration.
   (balance) ->
     if balance < 0
diff --git a/app/assets/javascripts/darkswarm/filters/localize_currency.js.coffee b/app/assets/javascripts/darkswarm/filters/localize_currency.js.coffee
index 484baf2574..44a44f6593 100644
--- a/app/assets/javascripts/darkswarm/filters/localize_currency.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/localize_currency.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter "localizeCurrency", (currencyConfig)->
+angular.module('Darkswarm').filter "localizeCurrency", (currencyConfig)->
   # Convert number to string currency using injected currency configuration.
   (amount) ->
     # Set country code (eg. "US").
diff --git a/app/assets/javascripts/darkswarm/filters/print_array.js.coffee b/app/assets/javascripts/darkswarm/filters/print_array.js.coffee
index 3ff940ded2..a4f48fc28e 100644
--- a/app/assets/javascripts/darkswarm/filters/print_array.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/print_array.js.coffee
@@ -1,11 +1,11 @@
-Darkswarm.filter "printArrayOfObjects", ->
+angular.module('Darkswarm').filter "printArrayOfObjects", ->
   (array, attr = 'name')->
     array ?= []
     array.map (a)->
       a[attr].toLowerCase()
     .join(", ")
 
-Darkswarm.filter "printArray", ->
+angular.module('Darkswarm').filter "printArray", ->
   (array)->
     array ?= []
     output = (item for item in array when item).join ", "
diff --git a/app/assets/javascripts/darkswarm/filters/properties.js.coffee b/app/assets/javascripts/darkswarm/filters/properties.js.coffee
index fe7ed71fa3..fcce0282a2 100644
--- a/app/assets/javascripts/darkswarm/filters/properties.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/properties.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter 'properties', ->
+angular.module('Darkswarm').filter 'properties', ->
   # Filter anything that responds to object.supplied_properties
   (objects, ids, source) ->
     objects ||= []
diff --git a/app/assets/javascripts/darkswarm/filters/properties_of.js.coffee b/app/assets/javascripts/darkswarm/filters/properties_of.js.coffee
index f3f4f51b5e..cfaccb399d 100644
--- a/app/assets/javascripts/darkswarm/filters/properties_of.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/properties_of.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter 'propertiesOf', ->
+angular.module('Darkswarm').filter 'propertiesOf', ->
   (objects, source) ->
     source ||= 'properties'
     return {} unless source in ['properties', 'supplied_properties', 'distributed_properties']
diff --git a/app/assets/javascripts/darkswarm/filters/properties_with_values_of.js.coffee b/app/assets/javascripts/darkswarm/filters/properties_with_values_of.js.coffee
index 7cdf962160..d78fe49d6b 100644
--- a/app/assets/javascripts/darkswarm/filters/properties_with_values_of.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/properties_with_values_of.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter 'propertiesWithValuesOf', ->
+angular.module('Darkswarm').filter 'propertiesWithValuesOf', ->
   (objects)->
     propertiesWithValues = {}
     for object in objects
diff --git a/app/assets/javascripts/darkswarm/filters/search_enterprises.js.coffee b/app/assets/javascripts/darkswarm/filters/search_enterprises.js.coffee
index 2c42fe93d3..2c90028e37 100644
--- a/app/assets/javascripts/darkswarm/filters/search_enterprises.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/search_enterprises.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter 'searchEnterprises', (Matcher)->
+angular.module('Darkswarm').filter 'searchEnterprises', (Matcher)->
   # Search multiple fields of enterprises for matching text fragment.
   (enterprises, text) ->
     enterprises ||= []
diff --git a/app/assets/javascripts/darkswarm/filters/shipping.js.coffee b/app/assets/javascripts/darkswarm/filters/shipping.js.coffee
index 7879568f0d..1168049c70 100644
--- a/app/assets/javascripts/darkswarm/filters/shipping.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/shipping.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter 'shipping', ()->
+angular.module('Darkswarm').filter 'shipping', ()->
   (objects, options)->
     objects ||= []
 
diff --git a/app/assets/javascripts/darkswarm/filters/show_hub_profiles.js.coffee b/app/assets/javascripts/darkswarm/filters/show_hub_profiles.js.coffee
index b97a0c35e4..5f8e1d6864 100644
--- a/app/assets/javascripts/darkswarm/filters/show_hub_profiles.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/show_hub_profiles.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter 'showHubProfiles', ()->
+angular.module('Darkswarm').filter 'showHubProfiles', ()->
   # Filter hub_profile enterprises in or out.
   (enterprises, show_profiles) ->
     enterprises ||= []
diff --git a/app/assets/javascripts/darkswarm/filters/strip_url.js.coffee b/app/assets/javascripts/darkswarm/filters/strip_url.js.coffee
index 31c893ddd3..d14bb78573 100644
--- a/app/assets/javascripts/darkswarm/filters/strip_url.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/strip_url.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter "stripUrl", ->
+angular.module('Darkswarm').filter "stripUrl", ->
   stripper = /(https?:\/\/)?(.*)/
   (url) ->
     url.match(stripper).pop()
diff --git a/app/assets/javascripts/darkswarm/filters/taxons.js.coffee b/app/assets/javascripts/darkswarm/filters/taxons.js.coffee
index a7ccc9b0cc..396eaecaac 100644
--- a/app/assets/javascripts/darkswarm/filters/taxons.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/taxons.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter 'taxons', ()->
+angular.module('Darkswarm').filter 'taxons', ()->
   # Filter anything that responds to object.taxons, object.supplied_taxon or object.primary_taxon.
   (objects, ids) ->
     objects ||= []
diff --git a/app/assets/javascripts/darkswarm/filters/taxons_of.js.coffee b/app/assets/javascripts/darkswarm/filters/taxons_of.js.coffee
index 6726a5c22e..54c2fef183 100644
--- a/app/assets/javascripts/darkswarm/filters/taxons_of.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/taxons_of.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter 'taxonsOf', ->
+angular.module('Darkswarm').filter 'taxonsOf', ->
   (objects)->
     taxons = {}
     for object in objects
diff --git a/app/assets/javascripts/darkswarm/filters/translate.js.coffee b/app/assets/javascripts/darkswarm/filters/translate.js.coffee
index 55606da2cf..0b6e2d5b47 100644
--- a/app/assets/javascripts/darkswarm/filters/translate.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/translate.js.coffee
@@ -1,7 +1,7 @@
-Darkswarm.filter "translate", ->
+angular.module('Darkswarm').filter "translate", ->
   (key, options) ->
     t(key, options)
 
-Darkswarm.filter "t", ->
+angular.module('Darkswarm').filter "t", ->
   (key, options) ->
     t(key, options)
diff --git a/app/assets/javascripts/darkswarm/filters/truncate.js.coffee b/app/assets/javascripts/darkswarm/filters/truncate.js.coffee
index 0f05cbc1b4..c0eb29cc10 100644
--- a/app/assets/javascripts/darkswarm/filters/truncate.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/truncate.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter "truncate", ->
+angular.module('Darkswarm').filter "truncate", ->
   (text, length, end) ->
     text = text || ""
     length = 10  if isNaN(length)
diff --git a/app/assets/javascripts/darkswarm/filters/visible.js.coffee b/app/assets/javascripts/darkswarm/filters/visible.js.coffee
index 7430c2e553..b6ad3e4c30 100644
--- a/app/assets/javascripts/darkswarm/filters/visible.js.coffee
+++ b/app/assets/javascripts/darkswarm/filters/visible.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.filter "visible", ->
+angular.module('Darkswarm').filter "visible", ->
   (objects)->
     objects.filter (obj)->
       obj.visible
diff --git a/app/assets/javascripts/darkswarm/mixins/fieldset_mixin.js.coffee b/app/assets/javascripts/darkswarm/mixins/fieldset_mixin.js.coffee
index d8bb1b262e..adf7081e00 100644
--- a/app/assets/javascripts/darkswarm/mixins/fieldset_mixin.js.coffee
+++ b/app/assets/javascripts/darkswarm/mixins/fieldset_mixin.js.coffee
@@ -1,4 +1,4 @@
-window.FieldsetMixin = ($scope)->
+angular.module('Darkswarm').controller "FieldsetMixin", ($scope, $timeout) ->
   $scope.next = (event = false)->
     event.preventDefault() if event
     return unless $scope.nextPanel
diff --git a/app/assets/javascripts/darkswarm/overrides.js.coffee b/app/assets/javascripts/darkswarm/overrides.js.coffee
deleted file mode 100644
index b9dd47500b..0000000000
--- a/app/assets/javascripts/darkswarm/overrides.js.coffee
+++ /dev/null
@@ -1,4 +0,0 @@
-Array::unique = ->
-  output = {}
-  output[@[key]] = @[key] for key in [0...@length]
-  value for key, value of output
diff --git a/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee b/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee
index 4b53ee2230..1160535b0b 100644
--- a/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee
@@ -3,7 +3,7 @@
 # between the tabs. It has direct access to the instance of the login modal,
 # and provides that access to other controllers as a service.
 
-Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location, Redirections, Loading)->
+angular.module('Darkswarm').factory "AuthenticationService", (Navigation, $modal, $location, Redirections, Loading)->
 
   new class AuthenticationService
     selectedPath: "/login"
diff --git a/app/assets/javascripts/darkswarm/services/cart.js.coffee b/app/assets/javascripts/darkswarm/services/cart.js.coffee
index 22c3436d44..95823d4a38 100644
--- a/app/assets/javascripts/darkswarm/services/cart.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/cart.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $rootScope, $resource, localStorageService, Messages) ->
+angular.module('Darkswarm').factory 'Cart', (CurrentOrder, Variants, $timeout, $http, $modal, $rootScope, $resource, localStorageService, Messages) ->
   # Handles syncing of current cart/order state to server
   new class Cart
     dirty: false
diff --git a/app/assets/javascripts/darkswarm/services/changeable_orders_alert.js.coffee b/app/assets/javascripts/darkswarm/services/changeable_orders_alert.js.coffee
index e4b597c57b..e2442cc86c 100644
--- a/app/assets/javascripts/darkswarm/services/changeable_orders_alert.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/changeable_orders_alert.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'ChangeableOrdersAlert', ($http) ->
+angular.module('Darkswarm').factory 'ChangeableOrdersAlert', ($http) ->
   new class ChangeableOrdersAlert
     html: ''
     visible: true
diff --git a/app/assets/javascripts/darkswarm/services/checkout.js.coffee b/app/assets/javascripts/darkswarm/services/checkout.js.coffee
index ef865012c2..3ea08bd400 100644
--- a/app/assets/javascripts/darkswarm/services/checkout.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/checkout.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeElements, PaymentMethods, $http, Navigation, CurrentHub, Messages)->
+angular.module('Darkswarm').factory 'Checkout', ($injector, CurrentOrder, ShippingMethods, StripeElements, PaymentMethods, $http, Navigation, CurrentHub, Messages)->
   new class Checkout
     errors: {}
     secrets: {}
diff --git a/app/assets/javascripts/darkswarm/services/credit_card.js.coffee b/app/assets/javascripts/darkswarm/services/credit_card.js.coffee
index becb7498fb..84518081cd 100644
--- a/app/assets/javascripts/darkswarm/services/credit_card.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/credit_card.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'CreditCard', ($injector, $rootScope, CreditCards, StripeElements, Navigation, $http, Messages)->
+angular.module('Darkswarm').factory 'CreditCard', ($injector, $rootScope, CreditCards, StripeElements, Navigation, $http, Messages)->
   new class CreditCard
     visible: false
     errors: {}
diff --git a/app/assets/javascripts/darkswarm/services/credit_cards.js.coffee b/app/assets/javascripts/darkswarm/services/credit_cards.js.coffee
index b7f1e34324..c771cadf12 100644
--- a/app/assets/javascripts/darkswarm/services/credit_cards.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/credit_cards.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'CreditCards', ($http, $filter, savedCreditCards, Messages, Customers)->
+angular.module('Darkswarm').factory 'CreditCards', ($http, $filter, savedCreditCards, Messages, Customers)->
   new class CreditCard
     saved: $filter('orderBy')(savedCreditCards,'-is_default')
 
diff --git a/app/assets/javascripts/darkswarm/services/current_hub.js.coffee b/app/assets/javascripts/darkswarm/services/current_hub.js.coffee
index ade8d75d18..ed435ea541 100644
--- a/app/assets/javascripts/darkswarm/services/current_hub.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/current_hub.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'CurrentHub', (currentHub) ->
+angular.module('Darkswarm').factory 'CurrentHub', (currentHub) ->
   # Populate CurrentHub.hub from json in page. This is probably redundant now.
   new class CurrentHub
     hub: currentHub
diff --git a/app/assets/javascripts/darkswarm/services/current_order.js.coffee b/app/assets/javascripts/darkswarm/services/current_order.js.coffee
index 6570ddcd06..af2e04d8a8 100644
--- a/app/assets/javascripts/darkswarm/services/current_order.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/current_order.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'CurrentOrder', (currentOrder) ->
+angular.module('Darkswarm').factory 'CurrentOrder', (currentOrder) ->
   # Populate Currentorder.order from json in page. This is probably redundant now.
   new class CurrentOrder
     order: currentOrder
diff --git a/app/assets/javascripts/darkswarm/services/current_user.js.coffee b/app/assets/javascripts/darkswarm/services/current_user.js.coffee
index 0098efaa2b..c5aa9fd443 100644
--- a/app/assets/javascripts/darkswarm/services/current_user.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/current_user.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'CurrentUser', (user)-> # This is for the current user
+angular.module('Darkswarm').factory 'CurrentUser', (user)-> # This is for the current user
   new class CurrentUser
     constructor: ->
       @[k] = v for k, v of user if user and !$.isEmptyObject(user)
diff --git a/app/assets/javascripts/darkswarm/services/dates.js.coffee b/app/assets/javascripts/darkswarm/services/dates.js.coffee
index d9a0b6e8c4..0167abdb3f 100644
--- a/app/assets/javascripts/darkswarm/services/dates.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/dates.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "Dates", ->
+angular.module('Darkswarm').factory "Dates", ->
   new class Dates
     months: [
       {key: t("january"), value: "1"},
diff --git a/app/assets/javascripts/darkswarm/services/dereferencer.js.coffee b/app/assets/javascripts/darkswarm/services/dereferencer.js.coffee
index b68a716a4d..b450539943 100644
--- a/app/assets/javascripts/darkswarm/services/dereferencer.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/dereferencer.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'Dereferencer', ->
+angular.module('Darkswarm').factory 'Dereferencer', ->
   new class Dereferencer
     dereference: (array, data) ->
       @dereference_from(array, array, data)
diff --git a/app/assets/javascripts/darkswarm/services/enterprise_image_service.js.coffee b/app/assets/javascripts/darkswarm/services/enterprise_image_service.js.coffee
index 13cd140cc4..3964458ca7 100644
--- a/app/assets/javascripts/darkswarm/services/enterprise_image_service.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/enterprise_image_service.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "EnterpriseImageService", (FileUploader, spreeApiKey) ->
+angular.module('Darkswarm').factory "EnterpriseImageService", (FileUploader, spreeApiKey) ->
   new class EnterpriseImageService
     imageSrc: null
 
diff --git a/app/assets/javascripts/darkswarm/services/enterprise_list_modal.js.coffee b/app/assets/javascripts/darkswarm/services/enterprise_list_modal.js.coffee
index 62412f7e59..d584b75576 100644
--- a/app/assets/javascripts/darkswarm/services/enterprise_list_modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/enterprise_list_modal.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "EnterpriseListModal", ($modal, $rootScope, $http, EnterpriseModal)->
+angular.module('Darkswarm').factory "EnterpriseListModal", ($modal, $rootScope, $http, EnterpriseModal)->
   new class EnterpriseListModal
     open: (enterprises)->
       scope = $rootScope.$new(true)
diff --git a/app/assets/javascripts/darkswarm/services/enterprise_modal.js.coffee b/app/assets/javascripts/darkswarm/services/enterprise_modal.js.coffee
index 4eab4d79ac..90f05ff392 100644
--- a/app/assets/javascripts/darkswarm/services/enterprise_modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/enterprise_modal.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "EnterpriseModal", ($modal, $rootScope, $http)->
+angular.module('Darkswarm').factory "EnterpriseModal", ($modal, $rootScope, $http)->
   # Build a modal popup for an enterprise.
   new class EnterpriseModal
     open: (enterprise)->
diff --git a/app/assets/javascripts/darkswarm/services/enterprise_registration_service.js.coffee b/app/assets/javascripts/darkswarm/services/enterprise_registration_service.js.coffee
index 2db0cedba5..d7cc5b3386 100644
--- a/app/assets/javascripts/darkswarm/services/enterprise_registration_service.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/enterprise_registration_service.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "EnterpriseRegistrationService", ($http, RegistrationService, EnterpriseImageService, CurrentUser, spreeApiKey, Loading, availableCountries, enterpriseAttributes) ->
+angular.module('Darkswarm').factory "EnterpriseRegistrationService", ($http, RegistrationService, EnterpriseImageService, CurrentUser, spreeApiKey, Loading, availableCountries, enterpriseAttributes) ->
   new class EnterpriseRegistrationService
     enterprise:
       user_ids: [CurrentUser.id]
diff --git a/app/assets/javascripts/darkswarm/services/enterprise_resource.js.coffee b/app/assets/javascripts/darkswarm/services/enterprise_resource.js.coffee
index e66ec7c176..c6993c00da 100644
--- a/app/assets/javascripts/darkswarm/services/enterprise_resource.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/enterprise_resource.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'EnterpriseResource', ($resource) ->
+angular.module('Darkswarm').factory 'EnterpriseResource', ($resource) ->
   $resource('/enterprise/:id.json', {}, {
     'relatives':
       method: 'GET'
diff --git a/app/assets/javascripts/darkswarm/services/enterprises.js.coffee b/app/assets/javascripts/darkswarm/services/enterprises.js.coffee
index d8347c7e41..a88fd30453 100644
--- a/app/assets/javascripts/darkswarm/services/enterprises.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/enterprises.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'Enterprises', (enterprises, ShopsResource, CurrentHub, Taxons, Dereferencer, Matcher, GmapsGeo, $rootScope) ->
+angular.module('Darkswarm').factory 'Enterprises', (enterprises, ShopsResource, CurrentHub, Taxons, Dereferencer, Matcher, GmapsGeo, $rootScope) ->
   new class Enterprises
     enterprises: []
     enterprises_by_id: {}
diff --git a/app/assets/javascripts/darkswarm/services/filter_selectors.js.coffee b/app/assets/javascripts/darkswarm/services/filter_selectors.js.coffee
index e94a098b3a..d1bc80b5bf 100644
--- a/app/assets/javascripts/darkswarm/services/filter_selectors.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/filter_selectors.js.coffee
@@ -1,6 +1,6 @@
 # Returns a factory with the only function `createSelectors()`.
 # That function creates objects managing a list of filter selectors.
-Darkswarm.factory "FilterSelectorsService", ->
+angular.module('Darkswarm').factory "FilterSelectorsService", ->
   # This stores all filters so we can access in-use counts etc
   class FilterSelectors
     constructor: ->
diff --git a/app/assets/javascripts/darkswarm/services/gmaps_geo.js.erb.coffee b/app/assets/javascripts/darkswarm/services/gmaps_geo.js.erb.coffee
index 45b4628641..beb16342b4 100644
--- a/app/assets/javascripts/darkswarm/services/gmaps_geo.js.erb.coffee
+++ b/app/assets/javascripts/darkswarm/services/gmaps_geo.js.erb.coffee
@@ -1,4 +1,4 @@
-Darkswarm.service "GmapsGeo", ->
+angular.module('Darkswarm').service "GmapsGeo", ->
   new class GmapsGeo
     OK: google?.maps?.GeocoderStatus?.OK
 
diff --git a/app/assets/javascripts/darkswarm/services/groups.js.coffee b/app/assets/javascripts/darkswarm/services/groups.js.coffee
index 69a7d2f564..6d3bd60285 100644
--- a/app/assets/javascripts/darkswarm/services/groups.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/groups.js.coffee
@@ -1,3 +1,3 @@
-Darkswarm.factory 'Groups', (groups) ->
+angular.module('Darkswarm').factory 'Groups', (groups) ->
   new class Groups
     groups: groups
diff --git a/app/assets/javascripts/darkswarm/services/hash_navigation.js.coffee b/app/assets/javascripts/darkswarm/services/hash_navigation.js.coffee
index 2cf6ad588b..bf18f503f8 100644
--- a/app/assets/javascripts/darkswarm/services/hash_navigation.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/hash_navigation.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'HashNavigation', ($location) ->
+angular.module('Darkswarm').factory 'HashNavigation', ($location) ->
   new class HashNavigation
     hash: null
 
diff --git a/app/assets/javascripts/darkswarm/services/loading.js.coffee b/app/assets/javascripts/darkswarm/services/loading.js.coffee
index b44e86de0f..91e90353d1 100644
--- a/app/assets/javascripts/darkswarm/services/loading.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/loading.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "Loading", ->
+angular.module('Darkswarm').factory "Loading", ->
   new class Loading
     message: null
     clear: =>
diff --git a/app/assets/javascripts/darkswarm/services/map.js.coffee b/app/assets/javascripts/darkswarm/services/map.js.coffee
index 9aa23a7155..f0dbf7e15a 100644
--- a/app/assets/javascripts/darkswarm/services/map.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/map.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "OfnMap", (Enterprises, EnterpriseListModal, MapConfiguration) ->
+angular.module('Darkswarm').factory "OfnMap", (Enterprises, EnterpriseListModal, MapConfiguration) ->
   new class OfnMap
     constructor: ->
       @coordinates = {}
diff --git a/app/assets/javascripts/darkswarm/services/map_centre_calculator.js.coffee b/app/assets/javascripts/darkswarm/services/map_centre_calculator.js.coffee
index 978afb5858..74a669690f 100644
--- a/app/assets/javascripts/darkswarm/services/map_centre_calculator.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/map_centre_calculator.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'MapCentreCalculator', (Enterprises, openStreetMapConfig) ->
+angular.module('Darkswarm').factory 'MapCentreCalculator', (Enterprises, openStreetMapConfig) ->
   new class MapCentreCalculator
 
     initialLatitude: =>
diff --git a/app/assets/javascripts/darkswarm/services/map_configuration.js.erb.coffee b/app/assets/javascripts/darkswarm/services/map_configuration.js.erb.coffee
index 094c06f2ac..94bac1eea8 100644
--- a/app/assets/javascripts/darkswarm/services/map_configuration.js.erb.coffee
+++ b/app/assets/javascripts/darkswarm/services/map_configuration.js.erb.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "MapConfiguration", ->
+angular.module('Darkswarm').factory "MapConfiguration", ->
   new class MapConfiguration
     options:
       center:
diff --git a/app/assets/javascripts/darkswarm/services/matcher.js.coffee b/app/assets/javascripts/darkswarm/services/matcher.js.coffee
index db871f6a0d..7fcf7fab98 100644
--- a/app/assets/javascripts/darkswarm/services/matcher.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/matcher.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "Matcher", ->
+angular.module('Darkswarm').factory "Matcher", ->
   new class Matcher
 
     # Match text fragment in an array of strings.
diff --git a/app/assets/javascripts/darkswarm/services/messages.js.coffee b/app/assets/javascripts/darkswarm/services/messages.js.coffee
index f05811ac5c..19ab3e8219 100644
--- a/app/assets/javascripts/darkswarm/services/messages.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/messages.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "Messages", (Loading, RailsFlashLoader)->
+angular.module('Darkswarm').factory "Messages", (Loading, RailsFlashLoader)->
   new class Messages
     loading: (message) ->
       Loading.message = message
diff --git a/app/assets/javascripts/darkswarm/services/navigation.js.coffee b/app/assets/javascripts/darkswarm/services/navigation.js.coffee
index b58786e930..c806d5dfee 100644
--- a/app/assets/javascripts/darkswarm/services/navigation.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/navigation.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'Navigation', ($location, $window) ->
+angular.module('Darkswarm').factory 'Navigation', ($location, $window) ->
   new class Navigation
     path: null
 
diff --git a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
index c3f9a0a48f..ad92ccb608 100644
--- a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'OrderCycle', ($resource, orderCycleData) ->
+angular.module('Darkswarm').factory 'OrderCycle', ($resource, orderCycleData) ->
   class OrderCycle
     @order_cycle = orderCycleData # Object or {}
     @push_order_cycle: (callback) ->
diff --git a/app/assets/javascripts/darkswarm/services/order_cycle_resource.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle_resource.js.coffee
index b8dd81d42c..092ea51345 100644
--- a/app/assets/javascripts/darkswarm/services/order_cycle_resource.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order_cycle_resource.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'OrderCycleResource', ($resource) ->
+angular.module('Darkswarm').factory 'OrderCycleResource', ($resource) ->
   $resource('/api/v0/order_cycles/:id.json', {}, {
     'products':
       method: 'GET'
diff --git a/app/assets/javascripts/darkswarm/services/orders.js.coffee b/app/assets/javascripts/darkswarm/services/orders.js.coffee
index 2e44f4010a..9b97d380f8 100644
--- a/app/assets/javascripts/darkswarm/services/orders.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/orders.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'Orders', (orders, shops, currencyConfig)->
+angular.module('Darkswarm').factory 'Orders', (orders, shops, currencyConfig)->
   new class Orders
     all: orders
     changeable: []
diff --git a/app/assets/javascripts/darkswarm/services/payment_methods.js.coffee b/app/assets/javascripts/darkswarm/services/payment_methods.js.coffee
index 423ceb57e2..a9a10c5c76 100644
--- a/app/assets/javascripts/darkswarm/services/payment_methods.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/payment_methods.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "PaymentMethods", (paymentMethods)->
+angular.module('Darkswarm').factory "PaymentMethods", (paymentMethods)->
   new class PaymentMethods
     payment_methods: paymentMethods
     payment_methods_by_id: {}
diff --git a/app/assets/javascripts/darkswarm/services/products.js.coffee b/app/assets/javascripts/darkswarm/services/products.js.coffee
index 83b19251bb..c791be2600 100644
--- a/app/assets/javascripts/darkswarm/services/products.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/products.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'Products', (OrderCycleResource, OrderCycle, Shopfront, currentHub, Dereferencer, Taxons, Properties, Cart, Variants) ->
+angular.module('Darkswarm').factory 'Products', (OrderCycleResource, OrderCycle, Shopfront, currentHub, Dereferencer, Taxons, Properties, Cart, Variants) ->
   new class Products
     constructor: ->
       @update()
diff --git a/app/assets/javascripts/darkswarm/services/properties.js.coffee b/app/assets/javascripts/darkswarm/services/properties.js.coffee
index 37314947b4..dee3f9d125 100644
--- a/app/assets/javascripts/darkswarm/services/properties.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/properties.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "Properties", (properties)->
+angular.module('Darkswarm').factory "Properties", (properties)->
   new class Properties
     # Populate ProductProperties.properties from json in page.
     properties: properties
diff --git a/app/assets/javascripts/darkswarm/services/rails_flash_loader.js.coffee b/app/assets/javascripts/darkswarm/services/rails_flash_loader.js.coffee
index 4ef72122a7..bea7576891 100644
--- a/app/assets/javascripts/darkswarm/services/rails_flash_loader.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/rails_flash_loader.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'RailsFlashLoader', (flash, railsFlash)->
+angular.module('Darkswarm').factory 'RailsFlashLoader', (flash, railsFlash)->
   new class RailsFlashLoader
     # The 'flash' service requires type key to
     # be one of: success, info, warn, error
diff --git a/app/assets/javascripts/darkswarm/services/redirections.js.coffee b/app/assets/javascripts/darkswarm/services/redirections.js.coffee
index a479964e9e..a2950b123a 100644
--- a/app/assets/javascripts/darkswarm/services/redirections.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/redirections.js.coffee
@@ -1,3 +1,3 @@
-Darkswarm.factory "Redirections", ($location)->
+angular.module('Darkswarm').factory "Redirections", ($location)->
   new class Redirections
     after_login: $location.search().after_login
diff --git a/app/assets/javascripts/darkswarm/services/search.js.coffee b/app/assets/javascripts/darkswarm/services/search.js.coffee
index 10e601c4e0..68aab60b5b 100644
--- a/app/assets/javascripts/darkswarm/services/search.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/search.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "Search", ($location)->
+angular.module('Darkswarm').factory "Search", ($location)->
   new class Search
     search: (query = false)->
       if query
diff --git a/app/assets/javascripts/darkswarm/services/shipping_methods.js.coffee b/app/assets/javascripts/darkswarm/services/shipping_methods.js.coffee
index 6d060179b3..fef0f3070f 100644
--- a/app/assets/javascripts/darkswarm/services/shipping_methods.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/shipping_methods.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "ShippingMethods", (shippingMethods)->
+angular.module('Darkswarm').factory "ShippingMethods", (shippingMethods)->
   new class ShippingMethods
     shipping_methods: shippingMethods
     shipping_methods_by_id: {}
diff --git a/app/assets/javascripts/darkswarm/services/shopfront.js.coffee b/app/assets/javascripts/darkswarm/services/shopfront.js.coffee
index 3c4812a676..2dd0837946 100644
--- a/app/assets/javascripts/darkswarm/services/shopfront.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/shopfront.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'Shopfront', (shopfront) ->
+angular.module('Darkswarm').factory 'Shopfront', (shopfront) ->
   new class Shopfront
     shopfront: shopfront
     producers_by_id: {}
diff --git a/app/assets/javascripts/darkswarm/services/shops_resource.js.coffee b/app/assets/javascripts/darkswarm/services/shops_resource.js.coffee
index 946eb21832..e23ebaafaa 100644
--- a/app/assets/javascripts/darkswarm/services/shops_resource.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/shops_resource.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'ShopsResource', ($resource) ->
+angular.module('Darkswarm').factory 'ShopsResource', ($resource) ->
   $resource('/api/v0/shops/:id.json', {}, {
     'closed_shops':
       method: 'GET'
diff --git a/app/assets/javascripts/darkswarm/services/sidebar.js.coffee b/app/assets/javascripts/darkswarm/services/sidebar.js.coffee
index c05f6659f2..d996bd1ef6 100644
--- a/app/assets/javascripts/darkswarm/services/sidebar.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/sidebar.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "Sidebar", ($location, Navigation)->
+angular.module('Darkswarm').factory "Sidebar", ($location, Navigation)->
   new class Sidebar
     paths: ["/login", "/signup", "/forgot", "/account"] 
 
diff --git a/app/assets/javascripts/darkswarm/services/spree_user.js.coffee b/app/assets/javascripts/darkswarm/services/spree_user.js.coffee
index f16ede8a46..080564191b 100644
--- a/app/assets/javascripts/darkswarm/services/spree_user.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/spree_user.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'SpreeUser', () ->
+angular.module('Darkswarm').factory 'SpreeUser', () ->
   # This is for storing Login/Signup/Forgot data to send to server
   # This does NOT represent our current user
   new class SpreeUser
diff --git a/app/assets/javascripts/darkswarm/services/stock_quantity.js.coffee b/app/assets/javascripts/darkswarm/services/stock_quantity.js.coffee
index efc6b67eb4..164c7ad95d 100644
--- a/app/assets/javascripts/darkswarm/services/stock_quantity.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/stock_quantity.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "StockQuantity", ->
+angular.module('Darkswarm').factory "StockQuantity", ->
   new class StockQuantity
     available_quantity: (on_hand, finalized_quantity) ->
       on_hand = parseInt(on_hand)
diff --git a/app/assets/javascripts/darkswarm/services/stripe_elements.js.coffee b/app/assets/javascripts/darkswarm/services/stripe_elements.js.coffee
index e656fbbbe0..9d66876716 100644
--- a/app/assets/javascripts/darkswarm/services/stripe_elements.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/stripe_elements.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'StripeElements', ($rootScope, Messages) ->
+angular.module('Darkswarm').factory 'StripeElements', ($rootScope, Messages) ->
   new class StripeElements
     # These are both set from the StripeElements directive
     stripe: null
diff --git a/app/assets/javascripts/darkswarm/services/tabsets.js.coffee b/app/assets/javascripts/darkswarm/services/tabsets.js.coffee
index 744e885fe7..bfe77acfbe 100644
--- a/app/assets/javascripts/darkswarm/services/tabsets.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/tabsets.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'Tabsets', ->
+angular.module('Darkswarm').factory 'Tabsets', ->
   new class Tabsets
     tabsets: []
 
diff --git a/app/assets/javascripts/darkswarm/services/taxons.js.coffee b/app/assets/javascripts/darkswarm/services/taxons.js.coffee
index 984eb0df22..3c4a528540 100644
--- a/app/assets/javascripts/darkswarm/services/taxons.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/taxons.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "Taxons", (taxons)->
+angular.module('Darkswarm').factory "Taxons", (taxons)->
   new class Taxons
     # Populate Taxons.taxons from json in page.
     taxons: taxons
diff --git a/app/assets/javascripts/darkswarm/services/variants.js.coffee b/app/assets/javascripts/darkswarm/services/variants.js.coffee
index bcca5be825..7c31576aaa 100644
--- a/app/assets/javascripts/darkswarm/services/variants.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/variants.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'Variants', ->
+angular.module('Darkswarm').factory 'Variants', ->
   new class Variants
     variants: {}
 
diff --git a/engines/web/app/assets/javascripts/web/cookies_banner/cookies_banner_controller.js.coffee b/engines/web/app/assets/javascripts/web/cookies_banner/cookies_banner_controller.js.coffee
index b9ee459a78..61b3af83df 100644
--- a/engines/web/app/assets/javascripts/web/cookies_banner/cookies_banner_controller.js.coffee
+++ b/engines/web/app/assets/javascripts/web/cookies_banner/cookies_banner_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "CookiesBannerCtrl", ($scope, CookiesBannerService, $http, $window)->
+angular.module('Darkswarm').controller "CookiesBannerCtrl", ($scope, CookiesBannerService, $http, $window)->
 
   $scope.acceptCookies = ->
     $http.post('/api/v0/cookies/consent')
diff --git a/engines/web/app/assets/javascripts/web/cookies_banner/cookies_banner_directive.js.coffee b/engines/web/app/assets/javascripts/web/cookies_banner/cookies_banner_directive.js.coffee
index a00354774c..eb2b4d9fc8 100644
--- a/engines/web/app/assets/javascripts/web/cookies_banner/cookies_banner_directive.js.coffee
+++ b/engines/web/app/assets/javascripts/web/cookies_banner/cookies_banner_directive.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive 'cookiesBanner', (CookiesBannerService, CookiesPolicyModalService) ->
+angular.module('Darkswarm').directive 'cookiesBanner', (CookiesBannerService, CookiesPolicyModalService) ->
   restrict: 'A'
   link: (scope, elm, attr)->
     return if not attr.cookiesBanner? || attr.cookiesBanner == 'false'
diff --git a/engines/web/app/assets/javascripts/web/cookies_banner/cookies_banner_service.js.coffee b/engines/web/app/assets/javascripts/web/cookies_banner/cookies_banner_service.js.coffee
index f239cd7f33..2fd9fbb4c7 100644
--- a/engines/web/app/assets/javascripts/web/cookies_banner/cookies_banner_service.js.coffee
+++ b/engines/web/app/assets/javascripts/web/cookies_banner/cookies_banner_service.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "CookiesBannerService", (Navigation, $modal, $location, Redirections, Loading)->
+angular.module('Darkswarm').factory "CookiesBannerService", (Navigation, $modal, $location, Redirections, Loading)->
 
   new class CookiesBannerService
     modalMessage: null
diff --git a/engines/web/app/assets/javascripts/web/cookies_policy/cookies_policy_modal_controller.js.coffee b/engines/web/app/assets/javascripts/web/cookies_policy/cookies_policy_modal_controller.js.coffee
index 675f88e98f..33b8aa1667 100644
--- a/engines/web/app/assets/javascripts/web/cookies_policy/cookies_policy_modal_controller.js.coffee
+++ b/engines/web/app/assets/javascripts/web/cookies_policy/cookies_policy_modal_controller.js.coffee
@@ -1,3 +1,3 @@
-Darkswarm.controller "CookiesPolicyModalCtrl", ($scope, $window)->
+angular.module('Darkswarm').controller "CookiesPolicyModalCtrl", ($scope, $window)->
 
   $scope.instance_hostname = $window.location.hostname
diff --git a/engines/web/app/assets/javascripts/web/cookies_policy/cookies_policy_modal_directive.js.coffee b/engines/web/app/assets/javascripts/web/cookies_policy/cookies_policy_modal_directive.js.coffee
index b007f11e46..198925ba00 100644
--- a/engines/web/app/assets/javascripts/web/cookies_policy/cookies_policy_modal_directive.js.coffee
+++ b/engines/web/app/assets/javascripts/web/cookies_policy/cookies_policy_modal_directive.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.directive 'cookiesPolicyModal', (CookiesPolicyModalService) ->
+angular.module('Darkswarm').directive 'cookiesPolicyModal', (CookiesPolicyModalService) ->
   restrict: 'A'
   link: (scope, elem, attrs) ->
     elem.bind "click", ->
diff --git a/engines/web/app/assets/javascripts/web/cookies_policy/cookies_policy_modal_service.js.coffee b/engines/web/app/assets/javascripts/web/cookies_policy/cookies_policy_modal_service.js.coffee
index 1e14853e35..014e89641c 100644
--- a/engines/web/app/assets/javascripts/web/cookies_policy/cookies_policy_modal_service.js.coffee
+++ b/engines/web/app/assets/javascripts/web/cookies_policy/cookies_policy_modal_service.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "CookiesPolicyModalService", (Navigation, $modal, $location, CookiesBannerService)->
+angular.module('Darkswarm').factory "CookiesPolicyModalService", (Navigation, $modal, $location, CookiesBannerService)->
 
   new class CookiesPolicyModalService
     defaultPath: "/policies/cookies"
diff --git a/spec/javascripts/application_spec.js b/spec/javascripts/application_spec.js
index 3759a72033..6f5831dace 100644
--- a/spec/javascripts/application_spec.js
+++ b/spec/javascripts/application_spec.js
@@ -3,7 +3,6 @@
 //= require angular-animate
 //= require angular-mocks
 //= require angular-cookies
-//= require angular-backstretch.js
 //= require angularjs-file-upload
 //= require lodash.underscore.js
 //= require angular-flash.min.js
diff --git a/vendor/assets/javascripts/angular-backstretch.js b/vendor/assets/javascripts/angular-backstretch.js
deleted file mode 100644
index 80e14aa4fb..0000000000
--- a/vendor/assets/javascripts/angular-backstretch.js
+++ /dev/null
@@ -1,10 +0,0 @@
-angular.module('backstretch', []);
-angular.module('backstretch')
-	.directive('backstretch', function () {
-		return {
-			restrict: 'A',
-			link: function (scope, element, attr) {
-				element.backstretch(attr.backgroundUrl);
-			}
-		}
-	});