diff --git a/Gemfile b/Gemfile
index 00c7cdb..c3aab11 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,6 +14,9 @@ gem 'rails', '>0.a'
 # Provides basic authentication functionality for testing parts of your engine
 gem 'solidus_auth_devise'
 gem 'solidus_dev_support', github: "solidusio/solidus_dev_support", branch: "main"
+gem 'solidus_support', github: "mamhoff/solidus_support", branch: "re-enable-flickwerk"
+
+gem 'flickwerk'
 
 case ENV['DB']
 when 'mysql'
diff --git a/app/decorators/models/solidus_prototypes/spree/option_type_decorator.rb b/app/patches/models/solidus_prototypes/spree/option_type_patch.rb
similarity index 91%
rename from app/decorators/models/solidus_prototypes/spree/option_type_decorator.rb
rename to app/patches/models/solidus_prototypes/spree/option_type_patch.rb
index f4fa919..a01e9dd 100644
--- a/app/decorators/models/solidus_prototypes/spree/option_type_decorator.rb
+++ b/app/patches/models/solidus_prototypes/spree/option_type_patch.rb
@@ -2,7 +2,7 @@
 
 module SolidusPrototypes
   module Spree
-    module OptionTypeDecorator
+    module OptionTypePatch
 
       def self.prepended(base)
         base.class_eval do
diff --git a/app/decorators/models/solidus_prototypes/spree/permission_sets/product_display_decorator.rb b/app/patches/models/solidus_prototypes/spree/permission_sets/product_display_patch.rb
similarity index 88%
rename from app/decorators/models/solidus_prototypes/spree/permission_sets/product_display_decorator.rb
rename to app/patches/models/solidus_prototypes/spree/permission_sets/product_display_patch.rb
index f8852d8..1f33ab3 100644
--- a/app/decorators/models/solidus_prototypes/spree/permission_sets/product_display_decorator.rb
+++ b/app/patches/models/solidus_prototypes/spree/permission_sets/product_display_patch.rb
@@ -3,7 +3,7 @@
 module SolidusPrototypes
   module Spree
     module PermissionSets
-      module ProductDisplayDecorator
+      module ProductDisplayPatch
 
         def activate!
           super
diff --git a/app/decorators/models/solidus_prototypes/spree/permission_sets/product_management_decorator.rb b/app/patches/models/solidus_prototypes/spree/permission_sets/product_management_patch.rb
similarity index 87%
rename from app/decorators/models/solidus_prototypes/spree/permission_sets/product_management_decorator.rb
rename to app/patches/models/solidus_prototypes/spree/permission_sets/product_management_patch.rb
index 3ab8d47..88b9ebf 100644
--- a/app/decorators/models/solidus_prototypes/spree/permission_sets/product_management_decorator.rb
+++ b/app/patches/models/solidus_prototypes/spree/permission_sets/product_management_patch.rb
@@ -3,7 +3,7 @@
 module SolidusPrototypes
   module Spree
     module PermissionSets
-      module ProductManagementDecorator
+      module ProductManagementPatch
 
         def activate!
           can :manage, ::Spree::Prototype
diff --git a/app/decorators/models/solidus_prototypes/spree/product_decorator.rb b/app/patches/models/solidus_prototypes/spree/product_patch.rb
similarity index 97%
rename from app/decorators/models/solidus_prototypes/spree/product_decorator.rb
rename to app/patches/models/solidus_prototypes/spree/product_patch.rb
index ee4b0a7..bb750dd 100644
--- a/app/decorators/models/solidus_prototypes/spree/product_decorator.rb
+++ b/app/patches/models/solidus_prototypes/spree/product_patch.rb
@@ -2,7 +2,7 @@
 
 module SolidusPrototypes
   module Spree
-    module ProductDecorator
+    module ProductPatch
 
       def self.prepended(base)
         base.class_eval do
diff --git a/app/decorators/models/solidus_prototypes/spree/property_decorator.rb b/app/patches/models/solidus_prototypes/spree/property_patch.rb
similarity index 91%
rename from app/decorators/models/solidus_prototypes/spree/property_decorator.rb
rename to app/patches/models/solidus_prototypes/spree/property_patch.rb
index cbc90eb..3df8b51 100644
--- a/app/decorators/models/solidus_prototypes/spree/property_decorator.rb
+++ b/app/patches/models/solidus_prototypes/spree/property_patch.rb
@@ -2,7 +2,7 @@
 
 module SolidusPrototypes
   module Spree
-    module PropertyDecorator
+    module PropertyPatch
 
       def self.prepended(base)
         base.class_eval do
diff --git a/app/decorators/models/solidus_prototypes/spree/taxon_decorator.rb b/app/patches/models/solidus_prototypes/spree/taxon_patch.rb
similarity index 92%
rename from app/decorators/models/solidus_prototypes/spree/taxon_decorator.rb
rename to app/patches/models/solidus_prototypes/spree/taxon_patch.rb
index ac632a3..35c94d8 100644
--- a/app/decorators/models/solidus_prototypes/spree/taxon_decorator.rb
+++ b/app/patches/models/solidus_prototypes/spree/taxon_patch.rb
@@ -2,7 +2,7 @@
 
 module SolidusPrototypes
   module Spree
-    module TaxonDecorator
+    module TaxonPatch
 
       def self.prepended(base)
         base.class_eval do