diff --git a/src/prelude/data.rs b/src/prelude/data.rs
index 833e6fc..e02f20b 100644
--- a/src/prelude/data.rs
+++ b/src/prelude/data.rs
@@ -125,11 +125,6 @@ impl Data {
                 MaterialName::BaseParts => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Talking,
                             base: 7,
@@ -140,18 +135,8 @@ impl Data {
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::Inaccurate,
-                            base: 8,
-                            roll: 33
-                        },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Talking,
                             base: 7,
@@ -169,11 +154,6 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Talking,
                             base: 7,
@@ -189,45 +169,20 @@ impl Data {
                 MaterialName::BladeParts => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Biting,
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::JunkFood,
-                            base: 8,
-                            roll: 33
-                        },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Biting,
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::JunkFood,
-                            base: 8,
-                            roll: 33
-                        },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Honed,
                             base: 7,
@@ -341,11 +296,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 7,
-                            roll: 27
-                        },
                         ComponentValues {
                             perk: PerkName::Hallucinogenic,
                             base: 7,
@@ -363,11 +313,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 7,
-                            roll: 27
-                        },
                         ComponentValues {
                             perk: PerkName::Hallucinogenic,
                             base: 7,
@@ -378,11 +323,6 @@ impl Data {
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::Profane,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::CrystalShield,
                             base: 5,
@@ -395,11 +335,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 7,
-                            roll: 27
-                        },
                         ComponentValues {
                             perk: PerkName::Hallucinogenic,
                             base: 7,
@@ -454,16 +389,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::DragonBait,
-                            base: 8,
-                            roll: 32
-                        },
-                        ComponentValues {
-                            perk: PerkName::UndeadBait,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::Mobile,
                             base: 7,
@@ -481,16 +406,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::DragonBait,
-                            base: 8,
-                            roll: 32
-                        },
-                        ComponentValues {
-                            perk: PerkName::UndeadBait,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::Mobile,
                             base: 7,
@@ -529,11 +444,6 @@ impl Data {
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::Profane,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::Bulwark,
                             base: 9,
@@ -541,11 +451,6 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Confused,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::Furnace,
                             base: 7,
@@ -561,16 +466,6 @@ impl Data {
                             base: 7,
                             roll: 28
                         },
-                        ComponentValues {
-                            perk: PerkName::Fatiguing,
-                            base: 8,
-                            roll: 32
-                        },
-                        ComponentValues {
-                            perk: PerkName::Mediocrity,
-                            base: 8,
-                            roll: 33
-                        },
                     ]),
                     armour: StackVec::new(&[
                         ComponentValues {
@@ -578,11 +473,6 @@ impl Data {
                             base: 7,
                             roll: 28
                         },
-                        ComponentValues {
-                            perk: PerkName::Fatiguing,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Preparation,
                             base: 5,
@@ -620,11 +510,6 @@ impl Data {
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::DemonBait,
-                            base: 8,
-                            roll: 32
-                        },
                     ]),
                     armour: StackVec::new(&[
                         ComponentValues {
@@ -642,21 +527,11 @@ impl Data {
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::DemonBait,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Turtling,
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::Profane,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::EnhancedDevoted,
                             base: 5,
@@ -669,11 +544,6 @@ impl Data {
                             base: 5,
                             roll: 13
                         },
-                        ComponentValues {
-                            perk: PerkName::Cheapskate,
-                            base: 8,
-                            roll: 32
-                        },
                     ])
                 },
                 MaterialName::CulinaryComponents => CompPerksPerGizmoType {
@@ -722,16 +592,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::Inaccurate,
-                            base: 8,
-                            roll: 33
-                        },
-                        ComponentValues {
-                            perk: PerkName::Mediocrity,
-                            base: 8,
-                            roll: 32
-                        },
                     ]),
                     armour: StackVec::new(&[
                         ComponentValues {
@@ -756,16 +616,6 @@ impl Data {
                 MaterialName::DelicateParts => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::DemonBait,
-                            base: 8,
-                            roll: 32
-                        },
-                        ComponentValues {
-                            perk: PerkName::JunkFood,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::Eruptive,
                             base: 5,
@@ -778,16 +628,6 @@ impl Data {
                         },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::DemonBait,
-                            base: 8,
-                            roll: 32
-                        },
-                        ComponentValues {
-                            perk: PerkName::JunkFood,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::Lucky,
                             base: 5,
@@ -800,11 +640,6 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Butterfingers,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Charitable,
                             base: 7,
@@ -830,11 +665,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::DragonBait,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Mobile,
                             base: 12,
@@ -847,11 +677,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::DragonBait,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Mobile,
                             base: 12,
@@ -869,38 +694,18 @@ impl Data {
                             base: 12,
                             roll: 44
                         },
-                        ComponentValues {
-                            perk: PerkName::Butterfingers,
-                            base: 9,
-                            roll: 33
-                        },
                     ])
                 },
                 MaterialName::DirectComponents => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 12,
-                            roll: 44
-                        },
                         ComponentValues {
                             perk: PerkName::Biting,
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::Blunted,
-                            base: 12,
-                            roll: 45
-                        },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 12,
-                            roll: 44
-                        },
                         ComponentValues {
                             perk: PerkName::Biting,
                             base: 9,
@@ -908,11 +713,6 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 12,
-                            roll: 44
-                        },
                         ComponentValues {
                             perk: PerkName::Charitable,
                             base: 12,
@@ -967,11 +767,6 @@ impl Data {
                             base: 12,
                             roll: 44
                         },
-                        ComponentValues {
-                            perk: PerkName::Inaccurate,
-                            base: 12,
-                            roll: 45
-                        },
                     ]),
                     armour: StackVec::new(&[
                         ComponentValues {
@@ -991,11 +786,6 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Cheapskate,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Refined,
                             base: 9,
@@ -1011,11 +801,6 @@ impl Data {
                 MaterialName::EtherealComponents => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Wise,
                             base: 12,
@@ -1023,11 +808,6 @@ impl Data {
                         },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Wise,
                             base: 12,
@@ -1040,11 +820,6 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Wise,
                             base: 12,
@@ -1055,23 +830,8 @@ impl Data {
                 MaterialName::EvasiveComponents => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 12,
-                            roll: 44
-                        },
-                        ComponentValues {
-                            perk: PerkName::Blunted,
-                            base: 12,
-                            roll: 45
-                        },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 12,
-                            roll: 44
-                        },
                         ComponentValues {
                             perk: PerkName::Turtling,
                             base: 12,
@@ -1084,11 +844,6 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 12,
-                            roll: 44
-                        },
                         ComponentValues {
                             perk: PerkName::Prosper,
                             base: 12,
@@ -1157,21 +912,11 @@ impl Data {
                 MaterialName::FlexibleParts => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 7,
-                            roll: 27
-                        },
                         ComponentValues {
                             perk: PerkName::Wise,
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::DragonBait,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Mobile,
                             base: 7,
@@ -1184,21 +929,11 @@ impl Data {
                         },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 7,
-                            roll: 27
-                        },
                         ComponentValues {
                             perk: PerkName::Wise,
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::DragonBait,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Mobile,
                             base: 7,
@@ -1209,18 +944,8 @@ impl Data {
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::Profane,
-                            base: 8,
-                            roll: 33
-                        },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 7,
-                            roll: 27
-                        },
                         ComponentValues {
                             perk: PerkName::Wise,
                             base: 9,
@@ -1343,16 +1068,6 @@ impl Data {
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::Inaccurate,
-                            base: 8,
-                            roll: 33
-                        },
-                        ComponentValues {
-                            perk: PerkName::Mediocrity,
-                            base: 8,
-                            roll: 32
-                        },
                     ]),
                     armour: StackVec::new(&[
                         ComponentValues {
@@ -1377,28 +1092,13 @@ impl Data {
                 MaterialName::HealthyComponents => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 12,
-                            roll: 44
-                        },
                         ComponentValues {
                             perk: PerkName::Efficient,
                             base: 9,
                             roll: 32
                         },
-                        ComponentValues {
-                            perk: PerkName::Inaccurate,
-                            base: 12,
-                            roll: 45
-                        },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 12,
-                            roll: 44
-                        },
                         ComponentValues {
                             perk: PerkName::Efficient,
                             base: 9,
@@ -1411,11 +1111,6 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 12,
-                            roll: 44
-                        },
                         ComponentValues {
                             perk: PerkName::Efficient,
                             base: 9,
@@ -1426,28 +1121,8 @@ impl Data {
                 MaterialName::HeavyComponents => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 12,
-                            roll: 44
-                        },
-                        ComponentValues {
-                            perk: PerkName::DemonBait,
-                            base: 12,
-                            roll: 45
-                        },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 12,
-                            roll: 44
-                        },
-                        ComponentValues {
-                            perk: PerkName::DemonBait,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Bulwark,
                             base: 12,
@@ -1460,16 +1135,6 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 12,
-                            roll: 44
-                        },
-                        ComponentValues {
-                            perk: PerkName::Butterfingers,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Breakdown,
                             base: 12,
@@ -1558,11 +1223,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::JunkFood,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Energising,
                             base: 12,
@@ -1580,11 +1240,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::JunkFood,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Energising,
                             base: 12,
@@ -1640,11 +1295,6 @@ impl Data {
                             base: 12,
                             roll: 44
                         },
-                        ComponentValues {
-                            perk: PerkName::Inaccurate,
-                            base: 12,
-                            roll: 45
-                        },
                     ]),
                     armour: StackVec::new(&[
                         ComponentValues {
@@ -1711,11 +1361,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::Profane,
-                            base: 12,
-                            roll: 45
-                        },
                     ]),
                     tool: StackVec::new(&[
                         ComponentValues {
@@ -1728,16 +1373,6 @@ impl Data {
                 MaterialName::MagicParts => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
-                        ComponentValues {
-                            perk: PerkName::UndeadBait,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::Crackling,
                             base: 9,
@@ -1760,16 +1395,6 @@ impl Data {
                         },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
-                        ComponentValues {
-                            perk: PerkName::UndeadBait,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::Crackling,
                             base: 9,
@@ -1787,11 +1412,6 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Honed,
                             base: 7,
@@ -1836,23 +1456,8 @@ impl Data {
                 MaterialName::MetallicParts => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
-                        ComponentValues {
-                            perk: PerkName::Mediocrity,
-                            base: 8,
-                            roll: 33
-                        },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Bulwark,
                             base: 9,
@@ -1865,16 +1470,6 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
-                        ComponentValues {
-                            perk: PerkName::Confused,
-                            base: 7,
-                            roll: 27
-                        },
                     ])
                 },
                 MaterialName::NoxiousComponents => CompPerksPerGizmoType {
@@ -1962,16 +1557,6 @@ impl Data {
                             base: 5,
                             roll: 13
                         },
-                        ComponentValues {
-                            perk: PerkName::Inaccurate,
-                            base: 8,
-                            roll: 33
-                        },
-                        ComponentValues {
-                            perk: PerkName::Mediocrity,
-                            base: 8,
-                            roll: 32
-                        },
                     ]),
                     armour: StackVec::new(&[
                         ComponentValues {
@@ -2006,28 +1591,13 @@ impl Data {
                 MaterialName::PaddedParts => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::DemonBait,
-                            base: 8,
-                            roll: 32
-                        },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::DemonBait,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Absorbative,
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::Profane,
-                            base: 8,
-                            roll: 33
-                        },
                     ]),
                     tool: StackVec::new(&[
                         ComponentValues {
@@ -2035,11 +1605,6 @@ impl Data {
                             base: 7,
                             roll: 28
                         },
-                        ComponentValues {
-                            perk: PerkName::Butterfingers,
-                            base: 7,
-                            roll: 27
-                        },
                         ComponentValues {
                             perk: PerkName::Breakdown,
                             base: 7,
@@ -2079,16 +1644,6 @@ impl Data {
                             base: 12,
                             roll: 40
                         },
-                        ComponentValues {
-                            perk: PerkName::DragonBait,
-                            base: 12,
-                            roll: 45
-                        },
-                        ComponentValues {
-                            perk: PerkName::Mediocrity,
-                            base: 12,
-                            roll: 44
-                        },
                     ]),
                     armour: StackVec::new(&[
                         ComponentValues {
@@ -2106,11 +1661,6 @@ impl Data {
                             base: 12,
                             roll: 40
                         },
-                        ComponentValues {
-                            perk: PerkName::DragonBait,
-                            base: 12,
-                            roll: 45
-                        },
                     ]),
                     tool: StackVec::new(&[
                         ComponentValues {
@@ -2138,23 +1688,8 @@ impl Data {
                 MaterialName::PlatedParts => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 8,
-                            roll: 33
-                        },
-                        ComponentValues {
-                            perk: PerkName::Blunted,
-                            base: 8,
-                            roll: 32
-                        },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::Absorbative,
                             base: 5,
@@ -2162,11 +1697,6 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 8,
-                            roll: 33
-                        },
                     ])
                 },
                 MaterialName::PowerfulComponents => CompPerksPerGizmoType {
@@ -2182,11 +1712,6 @@ impl Data {
                             base: 12,
                             roll: 44
                         },
-                        ComponentValues {
-                            perk: PerkName::Blunted,
-                            base: 12,
-                            roll: 45
-                        },
                     ]),
                     armour: StackVec::new(&[
                         ComponentValues {
@@ -2216,11 +1741,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Scavenging,
                             base: 12,
@@ -2238,11 +1758,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Scavenging,
                             base: 12,
@@ -2250,26 +1765,11 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 12,
-                            roll: 45
-                        },
                     ])
                 },
                 MaterialName::PreciseComponents => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 12,
-                            roll: 44
-                        },
-                        ComponentValues {
-                            perk: PerkName::Blunted,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Eruptive,
                             base: 9,
@@ -2287,18 +1787,8 @@ impl Data {
                         },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 12,
-                            roll: 44
-                        },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 12,
-                            roll: 44
-                        },
                         ComponentValues {
                             perk: PerkName::Honed,
                             base: 9,
@@ -2314,11 +1804,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::DemonBait,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::ShieldBashing,
                             base: 12,
@@ -2328,95 +1813,45 @@ impl Data {
                     armour: StackVec::new(&[
                         ComponentValues {
                             perk: PerkName::Hoarding,
-                            base: 9,
-                            roll: 33
-                        },
-                        ComponentValues {
-                            perk: PerkName::DemonBait,
-                            base: 12,
-                            roll: 45
-                        },
-                        ComponentValues {
-                            perk: PerkName::ShieldBashing,
-                            base: 12,
-                            roll: 40
-                        },
-                    ]),
-                    tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Hoarding,
-                            base: 9,
-                            roll: 33
-                        },
-                        ComponentValues {
-                            perk: PerkName::Polishing,
-                            base: 12,
-                            roll: 40
-                        },
-                    ])
-                },
-                MaterialName::RefinedComponents => CompPerksPerGizmoType {
-                    ancient_only: false,
-                    weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Hoarding,
-                            base: 11,
-                            roll: 25
-                        },
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 11,
-                            roll: 25
-                        },
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 11,
-                            roll: 25
-                        },
-                        ComponentValues {
-                            perk: PerkName::DragonBait,
-                            base: 11,
-                            roll: 25
-                        },
-                        ComponentValues {
-                            perk: PerkName::DemonBait,
-                            base: 11,
-                            roll: 25
-                        },
-                        ComponentValues {
-                            perk: PerkName::Energising,
-                            base: 11,
-                            roll: 25
+                            base: 9,
+                            roll: 33
                         },
                         ComponentValues {
-                            perk: PerkName::Inaccurate,
-                            base: 11,
-                            roll: 25
+                            perk: PerkName::ShieldBashing,
+                            base: 12,
+                            roll: 40
                         },
                     ]),
-                    armour: StackVec::new(&[
+                    tool: StackVec::new(&[
                         ComponentValues {
                             perk: PerkName::Hoarding,
-                            base: 11,
-                            roll: 25
+                            base: 9,
+                            roll: 33
                         },
                         ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 11,
-                            roll: 25
+                            perk: PerkName::Polishing,
+                            base: 12,
+                            roll: 40
                         },
+                    ])
+                },
+                MaterialName::RefinedComponents => CompPerksPerGizmoType {
+                    ancient_only: false,
+                    weapon: StackVec::new(&[
                         ComponentValues {
-                            perk: PerkName::Cautious,
+                            perk: PerkName::Hoarding,
                             base: 11,
                             roll: 25
                         },
                         ComponentValues {
-                            perk: PerkName::DragonBait,
+                            perk: PerkName::Energising,
                             base: 11,
                             roll: 25
                         },
+                    ]),
+                    armour: StackVec::new(&[
                         ComponentValues {
-                            perk: PerkName::DemonBait,
+                            perk: PerkName::Hoarding,
                             base: 11,
                             roll: 25
                         },
@@ -2437,16 +1872,6 @@ impl Data {
                             base: 11,
                             roll: 25
                         },
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 11,
-                            roll: 25
-                        },
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 11,
-                            roll: 25
-                        },
                         ComponentValues {
                             perk: PerkName::Refined,
                             base: 11,
@@ -2562,11 +1987,6 @@ impl Data {
                 MaterialName::SharpComponents => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::DragonBait,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Taunting,
                             base: 9,
@@ -2579,11 +1999,6 @@ impl Data {
                         },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::DragonBait,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Taunting,
                             base: 9,
@@ -2679,11 +2094,6 @@ impl Data {
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Hallucinogenic,
                             base: 7,
@@ -2701,11 +2111,6 @@ impl Data {
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Hallucinogenic,
                             base: 7,
@@ -2716,18 +2121,8 @@ impl Data {
                             base: 7,
                             roll: 27
                         },
-                        ComponentValues {
-                            perk: PerkName::Profane,
-                            base: 8,
-                            roll: 33
-                        },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Hallucinogenic,
                             base: 7,
@@ -2748,21 +2143,11 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::UndeadBait,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::Energising,
                             base: 7,
                             roll: 27
                         },
-                        ComponentValues {
-                            perk: PerkName::Blunted,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Eruptive,
                             base: 5,
@@ -2775,11 +2160,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::UndeadBait,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::Energising,
                             base: 7,
@@ -2792,11 +2172,6 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Cheapskate,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::Refined,
                             base: 7,
@@ -2807,16 +2182,6 @@ impl Data {
                 MaterialName::SpikedParts => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 7,
-                            roll: 28
-                        },
-                        ComponentValues {
-                            perk: PerkName::Fatiguing,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Genocidal,
                             base: 5,
@@ -2832,11 +2197,6 @@ impl Data {
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::JunkFood,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::Flanking,
                             base: 5,
@@ -2844,16 +2204,6 @@ impl Data {
                         },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 7,
-                            roll: 28
-                        },
-                        ComponentValues {
-                            perk: PerkName::Fatiguing,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Genocidal,
                             base: 5,
@@ -2869,23 +2219,8 @@ impl Data {
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::JunkFood,
-                            base: 8,
-                            roll: 33
-                        },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 7,
-                            roll: 28
-                        },
-                        ComponentValues {
-                            perk: PerkName::Fatiguing,
-                            base: 8,
-                            roll: 32
-                        },
                     ])
                 },
                 MaterialName::SpiritualParts => CompPerksPerGizmoType {
@@ -2896,31 +2231,16 @@ impl Data {
                             base: 5,
                             roll: 13
                         },
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Hoarding,
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 7,
-                            roll: 27
-                        },
                         ComponentValues {
                             perk: PerkName::Wise,
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::Inaccurate,
-                            base: 8,
-                            roll: 33
-                        },
                     ]),
                     armour: StackVec::new(&[
                         ComponentValues {
@@ -2928,21 +2248,11 @@ impl Data {
                             base: 5,
                             roll: 13
                         },
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Hoarding,
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 7,
-                            roll: 27
-                        },
                         ComponentValues {
                             perk: PerkName::Wise,
                             base: 9,
@@ -2955,21 +2265,11 @@ impl Data {
                             base: 5,
                             roll: 13
                         },
-                        ComponentValues {
-                            perk: PerkName::Antitheism,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Hoarding,
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::Cautious,
-                            base: 7,
-                            roll: 27
-                        },
                         ComponentValues {
                             perk: PerkName::Wise,
                             base: 9,
@@ -2985,21 +2285,6 @@ impl Data {
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 7,
-                            roll: 28
-                        },
-                        ComponentValues {
-                            perk: PerkName::Fatiguing,
-                            base: 8,
-                            roll: 32
-                        },
-                        ComponentValues {
-                            perk: PerkName::UndeadBait,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::Energising,
                             base: 7,
@@ -3012,21 +2297,6 @@ impl Data {
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 7,
-                            roll: 28
-                        },
-                        ComponentValues {
-                            perk: PerkName::Fatiguing,
-                            base: 8,
-                            roll: 32
-                        },
-                        ComponentValues {
-                            perk: PerkName::UndeadBait,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::Energising,
                             base: 7,
@@ -3039,16 +2309,6 @@ impl Data {
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 7,
-                            roll: 28
-                        },
-                        ComponentValues {
-                            perk: PerkName::Fatiguing,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Rapid,
                             base: 7,
@@ -3064,28 +2324,8 @@ impl Data {
                 MaterialName::StrongComponents => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 12,
-                            roll: 44
-                        },
-                        ComponentValues {
-                            perk: PerkName::Fatiguing,
-                            base: 12,
-                            roll: 45
-                        },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 12,
-                            roll: 44
-                        },
-                        ComponentValues {
-                            perk: PerkName::Fatiguing,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Absorbative,
                             base: 9,
@@ -3098,36 +2338,16 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Committed,
-                            base: 12,
-                            roll: 44
-                        },
-                        ComponentValues {
-                            perk: PerkName::Fatiguing,
-                            base: 12,
-                            roll: 45
-                        },
                     ])
                 },
                 MaterialName::StunningComponents => CompPerksPerGizmoType {
                     ancient_only: false,
                     weapon: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Fatiguing,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::ClearHeaded,
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::Mediocrity,
-                            base: 12,
-                            roll: 44
-                        },
                         ComponentValues {
                             perk: PerkName::Mysterious,
                             base: 12,
@@ -3135,11 +2355,6 @@ impl Data {
                         },
                     ]),
                     armour: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Fatiguing,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::ClearHeaded,
                             base: 9,
@@ -3152,21 +2367,11 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Fatiguing,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Mysterious,
                             base: 12,
                             roll: 44
                         },
-                        ComponentValues {
-                            perk: PerkName::Confused,
-                            base: 12,
-                            roll: 40
-                        },
                     ])
                 },
                 MaterialName::SubtleComponents => CompPerksPerGizmoType {
@@ -3177,11 +2382,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::DemonBait,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Mobile,
                             base: 12,
@@ -3194,11 +2394,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::DemonBait,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::Mobile,
                             base: 12,
@@ -3211,11 +2406,6 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Confused,
-                            base: 12,
-                            roll: 45
-                        },
                     ])
                 },
                 MaterialName::SwiftComponents => CompPerksPerGizmoType {
@@ -3231,11 +2421,6 @@ impl Data {
                             base: 12,
                             roll: 40
                         },
-                        ComponentValues {
-                            perk: PerkName::Blunted,
-                            base: 12,
-                            roll: 45
-                        },
                     ]),
                     armour: StackVec::new(&[
                         ComponentValues {
@@ -3265,11 +2450,6 @@ impl Data {
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::Blunted,
-                            base: 8,
-                            roll: 32
-                        },
                         ComponentValues {
                             perk: PerkName::Mysterious,
                             base: 9,
@@ -3282,11 +2462,6 @@ impl Data {
                             base: 5,
                             roll: 15
                         },
-                        ComponentValues {
-                            perk: PerkName::Profane,
-                            base: 8,
-                            roll: 33
-                        },
                         ComponentValues {
                             perk: PerkName::Mysterious,
                             base: 9,
@@ -3304,11 +2479,6 @@ impl Data {
                             base: 9,
                             roll: 33
                         },
-                        ComponentValues {
-                            perk: PerkName::Butterfingers,
-                            base: 8,
-                            roll: 32
-                        },
                     ])
                 },
                 MaterialName::ThirdAgeComponents => CompPerksPerGizmoType {
@@ -3406,11 +2576,6 @@ impl Data {
                             base: 12,
                             roll: 44
                         },
-                        ComponentValues {
-                            perk: PerkName::DemonBait,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::ClearHeaded,
                             base: 12,
@@ -3428,11 +2593,6 @@ impl Data {
                             base: 12,
                             roll: 44
                         },
-                        ComponentValues {
-                            perk: PerkName::DemonBait,
-                            base: 12,
-                            roll: 45
-                        },
                         ComponentValues {
                             perk: PerkName::ClearHeaded,
                             base: 12,
@@ -3445,11 +2605,6 @@ impl Data {
                         },
                     ]),
                     tool: StackVec::new(&[
-                        ComponentValues {
-                            perk: PerkName::Cheapskate,
-                            base: 12,
-                            roll: 40
-                        },
                         ComponentValues {
                             perk: PerkName::EnhancedEfficient,
                             base: 9,
@@ -4035,7 +3190,7 @@ impl Data {
                             rank: 3,
                             cost: 120,
                             threshold: 130,
-                            ancient_only: true,
+                            ancient_only: false,
                             doubleslot: false
                         },
                         PerkRankValues {
@@ -4043,7 +3198,7 @@ impl Data {
                             rank: 4,
                             cost: 160,
                             threshold: 170,
-                            ancient_only: true,
+                            ancient_only: false,
                             doubleslot: false
                         },
                         PerkRankValues {
@@ -4051,7 +3206,7 @@ impl Data {
                             rank: 5,
                             cost: 195,
                             threshold: 210,
-                            ancient_only: true,
+                            ancient_only: false,
                             doubleslot: false
                         },
                     ])