diff --git a/src/main/java/org/terasology/economy/ShopManager.java b/src/main/java/org/terasology/economy/ShopManager.java
index 67e349b..5e99b53 100644
--- a/src/main/java/org/terasology/economy/ShopManager.java
+++ b/src/main/java/org/terasology/economy/ShopManager.java
@@ -10,10 +10,19 @@
 import org.terasology.economy.events.PurchaseItemEvent;
 import org.terasology.economy.events.WalletTransactionEvent;
 import org.terasology.economy.systems.WalletAuthoritySystem;
+import org.terasology.engine.entitySystem.ComponentContainer;
 import org.terasology.engine.entitySystem.entity.EntityManager;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.NetFilterEvent;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.logic.inventory.ItemComponent;
 import org.terasology.engine.logic.inventory.events.GiveItemEvent;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.registry.Share;
 import org.terasology.engine.world.block.Block;
 import org.terasology.engine.world.block.BlockExplorer;
 import org.terasology.engine.world.block.BlockManager;
@@ -21,15 +30,7 @@
 import org.terasology.engine.world.block.family.BlockFamily;
 import org.terasology.engine.world.block.items.BlockItemFactory;
 import org.terasology.gestalt.assets.management.AssetManager;
-import org.terasology.engine.entitySystem.ComponentContainer;
-import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.prefab.Prefab;
-import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
-import org.terasology.engine.entitySystem.systems.RegisterSystem;
-import org.terasology.engine.logic.inventory.ItemComponent;
-import org.terasology.engine.logic.players.LocalPlayer;
-import org.terasology.engine.registry.In;
-import org.terasology.engine.registry.Share;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.module.inventory.systems.InventoryAuthoritySystem;
 
 import java.util.HashSet;
@@ -135,7 +136,8 @@ void performTransaction(EntityRef entity, EntityRef item) {
         }
     }
 
-    @ReceiveEvent(netFilter = RegisterMode.AUTHORITY)
+    @NetFilterEvent(netFilter = RegisterMode.AUTHORITY)
+    @ReceiveEvent
     public void onPurchaseItem(PurchaseItemEvent event, EntityRef entity) {
         if (event.getTargetPrefab() != null && event.getTargetPrefab().hasComponent(ValueComponent.class)) {
             EntityRef item = entityManager.create(event.getTargetPrefab());
diff --git a/src/main/java/org/terasology/economy/events/ConditionedProductionEvent.java b/src/main/java/org/terasology/economy/events/ConditionedProductionEvent.java
index a506988..9885311 100644
--- a/src/main/java/org/terasology/economy/events/ConditionedProductionEvent.java
+++ b/src/main/java/org/terasology/economy/events/ConditionedProductionEvent.java
@@ -4,7 +4,7 @@
 
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/terasology/economy/events/MarketInfoClientRequestEvent.java b/src/main/java/org/terasology/economy/events/MarketInfoClientRequestEvent.java
index 7c767da..67b4232 100644
--- a/src/main/java/org/terasology/economy/events/MarketInfoClientRequestEvent.java
+++ b/src/main/java/org/terasology/economy/events/MarketInfoClientRequestEvent.java
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.economy.events;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.ServerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * A client-to-server request for info about a market's available resources. Response arrives
diff --git a/src/main/java/org/terasology/economy/events/MarketInfoClientResponseEvent.java b/src/main/java/org/terasology/economy/events/MarketInfoClientResponseEvent.java
index 39f64c5..476b5c8 100644
--- a/src/main/java/org/terasology/economy/events/MarketInfoClientResponseEvent.java
+++ b/src/main/java/org/terasology/economy/events/MarketInfoClientResponseEvent.java
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.economy.events;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/terasology/economy/events/PurchaseItemEvent.java b/src/main/java/org/terasology/economy/events/PurchaseItemEvent.java
index 7cf70e3..4083e16 100644
--- a/src/main/java/org/terasology/economy/events/PurchaseItemEvent.java
+++ b/src/main/java/org/terasology/economy/events/PurchaseItemEvent.java
@@ -4,9 +4,9 @@
 
 import com.google.common.base.MoreObjects;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.entitySystem.prefab.Prefab;
 import org.terasology.engine.network.ServerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * A trigger event to start a purchase transaction on the authority for the specified item or block.
diff --git a/src/main/java/org/terasology/economy/events/ResourceCreationEvent.java b/src/main/java/org/terasology/economy/events/ResourceCreationEvent.java
index 2d784bf..5411a5c 100644
--- a/src/main/java/org/terasology/economy/events/ResourceCreationEvent.java
+++ b/src/main/java/org/terasology/economy/events/ResourceCreationEvent.java
@@ -3,7 +3,7 @@
 package org.terasology.economy.events;
 
 
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 public class ResourceCreationEvent implements Event {
     private String resource;
diff --git a/src/main/java/org/terasology/economy/events/ResourceDestructionEvent.java b/src/main/java/org/terasology/economy/events/ResourceDestructionEvent.java
index a7dab1f..aa4036b 100644
--- a/src/main/java/org/terasology/economy/events/ResourceDestructionEvent.java
+++ b/src/main/java/org/terasology/economy/events/ResourceDestructionEvent.java
@@ -3,7 +3,7 @@
 package org.terasology.economy.events;
 
 
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 public class ResourceDestructionEvent implements Event {
     private String resource;
diff --git a/src/main/java/org/terasology/economy/events/ResourceDrawEvent.java b/src/main/java/org/terasology/economy/events/ResourceDrawEvent.java
index 5d11ea2..c13757e 100644
--- a/src/main/java/org/terasology/economy/events/ResourceDrawEvent.java
+++ b/src/main/java/org/terasology/economy/events/ResourceDrawEvent.java
@@ -4,7 +4,7 @@
 
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 public class ResourceDrawEvent implements Event {
     private String resource;
diff --git a/src/main/java/org/terasology/economy/events/ResourceInfoRequestEvent.java b/src/main/java/org/terasology/economy/events/ResourceInfoRequestEvent.java
index 3ef5e1d..a23e0e2 100644
--- a/src/main/java/org/terasology/economy/events/ResourceInfoRequestEvent.java
+++ b/src/main/java/org/terasology/economy/events/ResourceInfoRequestEvent.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.economy.events;
 
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/terasology/economy/events/ResourceStoreEvent.java b/src/main/java/org/terasology/economy/events/ResourceStoreEvent.java
index a3d5f57..aad4564 100644
--- a/src/main/java/org/terasology/economy/events/ResourceStoreEvent.java
+++ b/src/main/java/org/terasology/economy/events/ResourceStoreEvent.java
@@ -4,7 +4,7 @@
 
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 public class ResourceStoreEvent implements Event {
     private String resource;
diff --git a/src/main/java/org/terasology/economy/events/SubscriberRegistrationEvent.java b/src/main/java/org/terasology/economy/events/SubscriberRegistrationEvent.java
index d1c1990..60166ba 100644
--- a/src/main/java/org/terasology/economy/events/SubscriberRegistrationEvent.java
+++ b/src/main/java/org/terasology/economy/events/SubscriberRegistrationEvent.java
@@ -3,7 +3,7 @@
 package org.terasology.economy.events;
 
 
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 public class SubscriberRegistrationEvent implements Event {
 
diff --git a/src/main/java/org/terasology/economy/events/WalletTransactionEvent.java b/src/main/java/org/terasology/economy/events/WalletTransactionEvent.java
index 39c6014..bb04c1b 100644
--- a/src/main/java/org/terasology/economy/events/WalletTransactionEvent.java
+++ b/src/main/java/org/terasology/economy/events/WalletTransactionEvent.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.economy.events;
 
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 import org.terasology.engine.network.ServerEvent;
 
 /**
diff --git a/src/main/java/org/terasology/economy/events/WalletUpdatedEvent.java b/src/main/java/org/terasology/economy/events/WalletUpdatedEvent.java
index 17f0f34..68ab971 100644
--- a/src/main/java/org/terasology/economy/events/WalletUpdatedEvent.java
+++ b/src/main/java/org/terasology/economy/events/WalletUpdatedEvent.java
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.economy.events;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * A server-to-client event that updates all player wallet UIs with currency information.
diff --git a/src/main/java/org/terasology/economy/systems/MarketLogisticSystem.java b/src/main/java/org/terasology/economy/systems/MarketLogisticSystem.java
index f432137..e7880bc 100644
--- a/src/main/java/org/terasology/economy/systems/MarketLogisticSystem.java
+++ b/src/main/java/org/terasology/economy/systems/MarketLogisticSystem.java
@@ -16,13 +16,13 @@
 import org.terasology.economy.handler.StorageComponentHandler;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.registry.Share;
 import org.terasology.gestalt.entitysystem.component.Component;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/org/terasology/economy/systems/MarketUpdaterSystem.java b/src/main/java/org/terasology/economy/systems/MarketUpdaterSystem.java
index 5b8e867..9c72c99 100644
--- a/src/main/java/org/terasology/economy/systems/MarketUpdaterSystem.java
+++ b/src/main/java/org/terasology/economy/systems/MarketUpdaterSystem.java
@@ -10,12 +10,13 @@
 import org.terasology.economy.events.ConditionedProductionEvent;
 import org.terasology.economy.events.SubscriberRegistrationEvent;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
 import org.terasology.engine.registry.Share;
+import org.terasology.gestalt.assets.management.AssetManager;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 import java.util.Collection;
 
diff --git a/src/main/java/org/terasology/economy/systems/WalletAuthoritySystem.java b/src/main/java/org/terasology/economy/systems/WalletAuthoritySystem.java
index 7332b2a..dc5f561 100644
--- a/src/main/java/org/terasology/economy/systems/WalletAuthoritySystem.java
+++ b/src/main/java/org/terasology/economy/systems/WalletAuthoritySystem.java
@@ -9,7 +9,6 @@
 import org.terasology.economy.events.WalletUpdatedEvent;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
@@ -18,6 +17,7 @@
 import org.terasology.engine.registry.In;
 import org.terasology.engine.registry.Share;
 import org.terasology.engine.world.time.WorldTimeEvent;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 /**
  * Deals with all server-side wallet operations, such as transactions and initial wallet creation.
diff --git a/src/main/java/org/terasology/economy/systems/WalletClientSystem.java b/src/main/java/org/terasology/economy/systems/WalletClientSystem.java
index 0d78b1b..1eb4716 100644
--- a/src/main/java/org/terasology/economy/systems/WalletClientSystem.java
+++ b/src/main/java/org/terasology/economy/systems/WalletClientSystem.java
@@ -5,13 +5,13 @@
 import org.terasology.economy.events.WalletUpdatedEvent;
 import org.terasology.economy.ui.WalletHud;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.logic.players.LocalPlayer;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.rendering.nui.NUIManager;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.nui.databinding.Binding;
 import org.terasology.nui.databinding.DefaultBinding;
 
diff --git a/src/main/java/org/terasology/economy/ui/MarketUiClientSystem.java b/src/main/java/org/terasology/economy/ui/MarketUiClientSystem.java
index 0d52666..9952a1e 100644
--- a/src/main/java/org/terasology/economy/ui/MarketUiClientSystem.java
+++ b/src/main/java/org/terasology/economy/ui/MarketUiClientSystem.java
@@ -6,13 +6,14 @@
 import org.terasology.economy.components.AllowShopScreenComponent;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.EventPriority;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.event.Priority;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.network.ClientComponent;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.rendering.nui.NUIManager;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.input.ButtonState;
 import org.terasology.module.inventory.input.InventoryButton;
 
@@ -33,7 +34,8 @@ public class MarketUiClientSystem extends BaseComponentSystem {
      * @param event the input event to open the inventory screen
      * @param entity the client entity requesting to open the inventory screen
      */
-    @ReceiveEvent(components = {ClientComponent.class, AllowShopScreenComponent.class}, priority = EventPriority.PRIORITY_HIGH)
+    @Priority(EventPriority.PRIORITY_HIGH)
+    @ReceiveEvent(components = {ClientComponent.class, AllowShopScreenComponent.class})
     public void onToggleInventory(InventoryButton event, EntityRef entity) {
         if (event.getState() == ButtonState.DOWN) {
             nuiManager.toggleScreen("Economy:shopScreen");