diff --git a/home/games/awakened-poe-trading/awakened-poe-trading.nix b/home/games/awakened-poe-trading/awakened-poe-trading.nix
new file mode 100644
index 00000000..d04d8307
--- /dev/null
+++ b/home/games/awakened-poe-trading/awakened-poe-trading.nix
@@ -0,0 +1,26 @@
+{ pkgs }:
+let
+  appimage = pkgs.appimageTools.wrapType2 {
+    pname = "awakened-poe-trade";
+    version = "3.24.10004";
+    src = pkgs.fetchurl {
+      url = "https://github.com/SnosMe/awakened-poe-trade/releases/download/v3.24.10004/Awakened-PoE-Trade-3.24.10004.AppImage";
+      hash = "sha256-0FSePkDZYCU32EUpyymuSIGcRXUomIOrd38QPMaFV4E=";
+    };
+    meta = {
+      homepage = "https://github.com/SnosMe/awakened-poe-trade";
+      description = "💲 🔨 Path of Exile trading app for price checking";
+      platforms =  pkgs.lib.platforms.linux;
+    };
+  };
+  desktopItem = pkgs.makeDesktopItem {
+    name = "AwakenedPoETrade";
+    exec = appimage.name;
+    icon = "${appimage}/awakened-poe-trade.png";
+    desktopName = "Awakened PoE Trade";
+    comment = appimage.meta.description;
+  };
+in
+  {
+    inherit appimage desktopItem;
+  }
diff --git a/home/games/awakened-poe-trading/default.nix b/home/games/awakened-poe-trading/default.nix
new file mode 100644
index 00000000..a9f27d04
--- /dev/null
+++ b/home/games/awakened-poe-trading/default.nix
@@ -0,0 +1,8 @@
+{ pkgs, ...}: let 
+  awakened-poe-trade = pkgs.callPackage ./awakened-poe-trade.nix;
+in {
+  home.packages = [
+    awakened-poe-trade.app
+    awakened-poe-trade.desktop
+  ];
+}
diff --git a/home/games/default.nix b/home/games/default.nix
new file mode 100644
index 00000000..fb1a9e51
--- /dev/null
+++ b/home/games/default.nix
@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ./awakened-poe-trading
+  ];
+}
diff --git a/system/poe.nix b/system/poe.nix
deleted file mode 100644
index d8544ad3..00000000
--- a/system/poe.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-let
-  awakened-poe-trade = import (builtins.fetchGit { url = "https://github.com/hukasu/awakened-poe-trade-nix"; ref = "refs/tags/v0.0.3"; });
-in {
-  environment.systemPackages = [
-    # This is the to add the application
-    awakened-poe-trade.app
-    # Add this to add a Desktop Item
-    # This requires the `app`, but the way it's setup right now,
-    # it does not install the `app` automatically 
-    awakened-poe-trade.desktop
-  ];
-}
-