diff --git a/data/manifest.yaml b/data/manifest.yaml
index 0d769fe6..675754cb 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -20081,7 +20081,7 @@ Aion:
     AION: {}
   launch:
     "<base>/NCLauncher.exe":
-      - arguments: "/LauncherID:\\\"GameForge\\\" /CompanyID:\\\"11\\\" /GameID:\\\"AION-LIVE\\\" /LUpdateAddr:\\\"update.aion.gfsrv.net\\\" /ExAccessToken:\\\"gfsteam\\\""
+      - arguments: "-usehqserver -hqip:79.110.83.108 -hqport:13001 -np:79.110.83.118  -noweb -noauthgg -st -charnamemenu -ingamebrowser -webshopevent:6 -f2p -lbox -ncping /SessKey:\"\" /CompanyID:\"11\" /ChannelGroupIndex:\"-1\" -60f2p -aiontv -nobs -dnpshop -hidepromo -probability -megaphone -rollingmegaphone /ExAccessToken:\"gfsteam\""
         when:
           - os: windows
             store: steam
@@ -477708,6 +477708,11 @@ SizeBlock:
 "Skald: Against the Black Priory":
   gog:
     id: 1514991646
+  id:
+    gogExtra:
+      - 1830130181
+    steamExtra:
+      - 1609100
   steam:
     id: 1069160
 Skara - The Blade Remains:
diff --git a/data/steam-game-cache.yaml b/data/steam-game-cache.yaml
index fbf59985..9b734e89 100644
--- a/data/steam-game-cache.yaml
+++ b/data/steam-game-cache.yaml
@@ -28250,33 +28250,48 @@
 261430:
   installDir: AION
   launch:
-    - arguments: "/LauncherID:\\\"GameForge\\\" /CompanyID:\\\"11\\\" /GameID:\\\"AION-LIVE\\\" /LUpdateAddr:\\\"update.aion.gfsrv.net\\\" /ExAccessToken:\\\"gfsteam\\\""
+    - arguments: "-usehqserver -hqip:79.110.83.108 -hqport:13001 -np:79.110.83.118  -noweb -noauthgg -st -charnamemenu -ingamebrowser -webshopevent:6 -f2p -lbox -ncping /SessKey:\"\" /CompanyID:\"11\" /ChannelGroupIndex:\"-1\" -60f2p -aiontv -nobs -dnpshop -hidepromo -probability -megaphone -rollingmegaphone /ExAccessToken:\"gfsteam\""
       config:
         oslist: windows
       description: AION Live
       executable: NCLauncher.exe
-      type: none
-    - arguments: "/LauncherID:\\\"GameForge\\\" /CompanyID:\\\"11\\\" /GameID:\\\"AION-QA\\\" /LUpdateAddr:\\\"dev.update.aion.gfsrv.net\\\" /ExAccessToken:\\\"gfsteam\\\""
+      type: default
+    - arguments: "-usehqserver -hqip:79.110.83.221 -hqport:13001 -np:79.110.83.200 -noweb -noauthgg -st -charnamemenu -ingamebrowser -webshopevent:6 -f2p -lbox -ncping /SessKey:\"\" /CompanyID:\"11\" /ChannelGroupIndex:\"-1\" -60f2p -aiontv -nobs -dnpshop -hidepromo -probability /ExAccessToken:\"gfsteam\""
       config:
         betakey: aion-qa1
         oslist: windows
       description: AION QA1
       executable: NCLauncher.exe
-      type: none
-    - arguments: "/LauncherID:\\\"GameForge\\\" /CompanyID:\\\"11\\\" /GameID:\\\"AION-QA2\\\" /LUpdateAddr:\\\"dev.update.aion.gfsrv.net\\\" /ExAccessToken:\\\"gfsteam\\\""
+    - arguments: "-usehqserver -hqip:79.110.83.98 -hqport:13001 -np:79.110.83.99 -noweb -noauthgg -st -charnamemenu -ingamebrowser -webshopevent:6 -f2p -lbox -ncping /SessKey:\"\" /CompanyID:\"11\" /ChannelGroupIndex:\"-1\" -60f2p -aiontv -nobs -dnpshop -hidepromo -probability /ExAccessToken:\"gfsteam\""
       config:
         betakey: aion-qa2
         oslist: windows
       description: AION QA2
       executable: NCLauncher.exe
-      type: none
-    - arguments: "/LauncherID:\\\"GameForge\\\" /CompanyID:\\\"11\\\" /GameID:\\\"AION-LIVE\\\" /LUpdateAddr:\\\"update.aion.gfsrv.net\\\" /ExAccessToken:\\\"gfsteam\\\""
+    - arguments: "-usehqserver -hqip:79.110.83.221 -hqport:13001 -np:79.110.83.200 -noweb -noauthgg -st -charnamemenu -ingamebrowser -webshopevent:6 -f2p -lbox -ncping /SessKey:\"\" /CompanyID:\"11\" /ChannelGroupIndex:\"-1\" -60f2p -aiontv -nobs -dnpshop -hidepromo -probability /ExAccessToken:\"gfsteam\""
       config:
-        betakey: beta
+        betakey: aion-dev
         oslist: windows
-      description: Debug
+      description: AION QA1 Test (32bit)
+      executable: NCLauncher32.exe
+    - arguments: "-lang:ENG -usehqserver -hqip:79.110.83.108 -hqport:13001 -np:79.110.83.118 -noweb -noauthgg -st -charnamemenu -ingamebrowser -webshopevent:6 -f2p -lbox -ncping /SessKey:\"\" /CompanyID:\"11\" /ChannelGroupIndex:\"-1\" -60f2p -aiontv -nobs -dnpshop -hidepromo -probability /ExAccessToken:\"gfsteam\""
+      config:
+        betakey: ncs-test
+        oslist: windows
+      description: AION NCS Test
+      executable: NCLauncher.exe
+    - arguments: "-usehqserver -hqip:79.110.83.221 -hqport:13001 -np:79.110.83.200 -noweb -noauthgg -st -charnamemenu -ingamebrowser -webshopevent:6 -f2p -lbox -ncping /SessKey:\"\" /CompanyID:\"11\" /ChannelGroupIndex:\"-1\" -60f2p -aiontv -nobs -dnpshop -hidepromo -probability /ExAccessToken:\"gfsteam\""
+      config:
+        betakey: aion-dev
+        oslist: windows
+      description: AION QA1 Test (64bit)
+      executable: NCLauncher.exe
+    - arguments: "-usehqserver -hqip:79.110.83.108 -hqport:13001 -np:79.110.83.118  -noweb -noauthgg -st -charnamemenu -ingamebrowser -webshopevent:6 -f2p -lbox -ncping /SessKey:\"\" /CompanyID:\"11\" /ChannelGroupIndex:\"-1\" -60f2p -aiontv -nobs -dnpshop -hidepromo -probability -megaphone -rollingmegaphone /ExAccessToken:\"gfsteam\""
+      config:
+        betakey: prelive
+        oslist: windows
+      description: AION Prelive
       executable: NCLauncher.exe
-      type: default
 261470:
   installDir: Distant Worlds Universe
   launch:
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 464c5ad1..086d3b6a 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -142975,8 +142975,12 @@ SizeBlock:
   steam: 508960
 "Skald: Against the Black Priory":
   gog: 1514991646
+  gogSide:
+    - 1830130181
   pageId: 167908
   steam: 1069160
+  steamSide:
+    - 1609100
 Skara - The Blade Remains:
   pageId: 61199
   steam: 274620