diff --git a/config/itemTypes.json b/config/itemTypes.json
old mode 100755
new mode 100644
index 79826de465..e5e36905a4
--- a/config/itemTypes.json
+++ b/config/itemTypes.json
@@ -903,6 +903,38 @@
     "id": "Pistol",
     "name": "Pistol"
   },
+  {
+    "id": "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/",
+    "name": "Pistol"
+  },
+  {
+    "id": "/Lotus/Weapons/VoidTrader/VTDetron",
+    "name": "Pistol"
+  },
+  {
+    "id": "/Lotus/Weapons/MK1Series/MK1Furis",
+    "name": "Pistol"
+  },
+  {
+    "id": "/Lotus/Weapons/MK1Series/MK1Kunai",
+    "name": "Throwing"
+  },
+  {
+    "id": "/Lotus/Weapons/Tenno/Grimoire/TnDoppelgangerGrimoire",
+    "name": "Pistol"
+  },
+  {
+    "id": "/Lotus/Weapons/Tenno/Grimoire/TnGrimoire",
+    "name": "Pistol"
+  },
+  {
+    "id": "/Lotus/Weapons/Thanotech/EntratiWristGun/EntratiWristGunWeapon",
+    "name": "Pistol"
+  },
+  {
+    "id": "/Lotus/Weapons/Grineer/LongGuns/GrineerAssaultRifle/TwinGrakatas",
+    "name": "Dual Pistols"
+  },
   {
     "id": "/ZanukaPets/ZanukaPetPrecepts",
     "name": "Companion Mod"
@@ -932,9 +964,150 @@
     "name": "Shotgun"
   },
   {
-    "id": "/LongGuns/PrimeStrun",
+    "id": "/Lotus/Weapons/Tenno/LongGuns/PrimeStrun/PrimeStrunWeapon",
+    "name": "Shotgun"
+  },
+  {
+    "id": "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Hek/KuvaHekWeapon",
+    "name": "Shotgun"
+  },
+  {
+    "id": "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Sobek/KuvaSobek",
+    "name": "Shotgun"
+  },
+  {
+    "id": "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Drakgoon/KuvaDrakgoon",
+    "name": "Shotgun"
+  },
+  {
+    "id": "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Kohm/KuvaKohm",
+    "name": "Shotgun"
+  },
+  {
+    "id": "/Lotus/Weapons/Syndicates/SteelMeridian/LongGuns/SMHek",
+    "name": "Shotgun"
+  },
+  {
+    "id": "/Lotus/Weapons/Grineer/LongGuns/GrineerFlakCannon/FlakCannon",
+    "name": "Shotgun"
+  },
+  {
+    "id": "/Lotus/Weapons/Grineer/LongGuns/GrnSpark/GrnSparkRifle",
+    "name": "Shotgun"
+  },
+  {
+    "id": "/Lotus/Weapons/Syndicates/NewLoka/LongGuns/NLTigris",
+    "name": "Shotgun"
+  },
+  {
+    "id": "/Lotus/Weapons/Tenno/LongGuns/PrimeTigris/PrimeTigris",
+    "name": "Shotgun"
+  },
+  {
+    "id": "/Lotus/Weapons/Tenno/LongGuns/PrimeAstilla/AstillaPrimeWeapon",
+    "name": "Shotgun"
+  },
+  {
+    "id": "/Lotus/Weapons/Tenno/LongGuns/PrimeCorinth/PrimeCorinth",
     "name": "Shotgun"
   },
+  {
+    "id": "/Lotus/Weapons/Tenno/LongGuns/PrimeCedo/PrimeCedoWeapon",
+    "name": "Shotgun"
+  },
+  {
+    "id": "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEArcaPlasmor/CrpBEArcaPlasmor",
+    "name": "Shotgun"
+  },
+  {
+    "id": "/Lotus/Weapons/MK1Series/MK1Strun",
+    "name": "Shotgun"
+  },
+  {
+    "id": "/Lotus/Weapons/MK1Series/MK1Paris",
+    "name": "Bow"
+  },
+  {
+    "id": "/(Tenno|Grineer|Corpus)/Bows?",
+    "regex": true,
+    "name": "Bow"
+  },
+  {
+    "id": "/Syndicates/[a-zA-Z]+/Bows?",
+    "regex": true,
+    "name": "Bow"
+  },
+  {
+    "id": "/Lotus/Weapons/Infested/LongGuns/InfArmCannon/InfArmCannon",
+    "name": "Shotgun"
+  },
+  {
+    "id": "/Lotus/Weapons/Corpus/LongGuns/CrpSplitLaser/CrpSplitLaser",
+    "name": "Shotgun"
+  },
+  {
+    "id": "/LongGuns/(Grn)?(Grenade|Cannon)[a-zA-Z]*/",
+    "regex": true,
+    "name": "Launcher"
+  },
+  {
+    "id": "/Lotus/Weapons/Corpus/LongGuns/CrpBriefcaseLauncher/CrpBriefcaseLauncher",
+    "name": "Launcher"
+  },
+  {
+    "id": "/Lotus/Weapons/ClanTech/Chemical/RocketLauncher",
+    "name": "Launcher"
+  },
+  {
+    "id": "/Lotus/Weapons/ClanTech/Bio/BioWeapon",
+    "name": "Launcher"
+  },
+  {
+    "id": "/Lotus/Weapons/Syndicates/PerrinSequence/LongGuns/PSPenta",
+    "name": "Launcher"
+  },
+  {
+    "id": "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Tonkor/KuvaTonkor",
+    "name": "Launcher"
+  },
+  {
+    "id": "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Ogris/KuvaOgris",
+    "name": "Launcher"
+  },
+  {
+    "id": "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Zarr/KuvaZarr",
+    "name": "Launcher"
+  },
+  {
+    "id": "/LongGuns/[a-zA-Z]*Sniper(Rifle)?/",
+    "regex": true,
+    "name": "Sniper"
+  },
+  {
+    "id": "/(Tenno|Grineer|Corpus)/Rifle/[a-zA-Z]*Sniper(Rifle)?",
+    "regex": true,
+    "name": "Sniper"
+  },
+  {
+    "id": "/Lotus/Weapons/ClanTech/Energy/Railgun",
+    "name": "Sniper"
+  },
+  {
+    "id": "/Lotus/Weapons/Tenno/LongGuns/RubicoPrime/RubicoPrimeWeapon",
+    "name": "Sniper"
+  },
+  {
+    "id": "/Lotus/Weapons/Infested/InfestedLich/LongGuns/CodaSporothrix",
+    "name": "Sniper"
+  },
+  {
+    "id": "/Lotus/Weapons/Tenno/LongGuns/PrimeLightningGun/PrimeLightningGun",
+    "name": "Sniper"
+  },
+  {
+    "id": "/Lotus/Weapons/Tenno/LongGuns/PrimeVectis/PrimeVectisRifle",
+    "name": "Sniper"
+  },
   {
     "id": "/LongGuns",
     "name": "Rifle"
@@ -1062,4 +1235,4 @@
     "id": "Challenges/Seasons",
     "name": "Nightwave Challenge"
   }
-]
\ No newline at end of file
+]
diff --git a/index.d.ts b/index.d.ts
old mode 100755
new mode 100644
index d2752ef923..d7dc00fd77
--- a/index.d.ts
+++ b/index.d.ts
@@ -816,7 +816,6 @@ declare module '@wfcd/items' {
     | 'Companion Weapon'
     | 'Conservation Tag'
     | 'Conservation Prey'
-    | 'Crossbow'
     | 'Currency'
     | 'Cut Gem'
     | 'Dual Pistols'
@@ -878,10 +877,9 @@ declare module '@wfcd/items' {
     | 'Simulacrum'
     | 'Skin'
     | 'Skins'
-    | 'Sniper Rifle'
+    | 'Sniper'
     | 'Solaris Bounty Rewards'
     | 'Sortie Rewards'
-    | 'Speargun'
     | 'Specter'
     | 'Syandana'
     | 'Theme Background'
@@ -941,13 +939,16 @@ declare module '@wfcd/items' {
     | 'Amp'
     | 'Arch-Gun'
     | 'Arch-Melee'
-    | 'Rifle'
-    | 'Pistol'
+    | 'Bow'
+    | 'Kitgun'
+    | 'Launcher'
+    | 'Companion Weapon'
     | 'Melee'
     | 'Orb'
+    | 'Pistol'
+    | 'Rifle'
     | 'Shotgun'
-    | 'Kitgun'
-    | 'Companion Weapon'
+    | 'Sniper'
     | 'Zaw';
 
   type SystemName =