From b2eeed7bb72d3a93c9a29b83f8f72ed5412f0e5e Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Tue, 7 Jul 2026 00:20:48 +0200
Subject: [PATCH] [Fix] Cleanup RangeDependant (#2039)

* Made the RangeDependent setting for ActiveEffects Nullable
* Removed all RangeDependent data from SRD where enabled was false before
* Fixed random flickerfly SRD
---
 daggerheart.mjs                               |   2 +-
 lang/en.json                                  |   4 +-
 .../sheets-configs/activeEffectConfig.mjs     |  18 +++
 module/config/itemConfig.mjs                  |  28 ++--
 module/data/activeEffect/baseEffect.mjs       |  23 ++-
 ...ersary_Acid_Burrower_89yAh30vaNQOALlz.json |   6 -
 ...ary_Adult_Flickerfly_G7jiltRjgvVhZewm.json |  37 ++---
 ...ary_Arch_Necromancer_WPEOIGfclNJxWb87.json |   6 -
 ...versary_Archer_Guard_JRhrrEg5UroURiAD.json |  22 ++-
 ...sary_Archer_Squadron_0ts6CGd93lLqGZI5.json |   8 +-
 ...ry_Assassin_Poisoner_h5RuhzGL17dW5FBT.json |  34 ++---
 ...adversary_Battle_Box_dgH3fW9FTYLaIDvS.json |  12 --
 .../adversary_Bear_71qKDLKO3CsrNkdy.json      |   6 -
 ...versary_Bladed_Guard_B4LZcGuBAHzyVdzy.json |   6 -
 ...ersary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json |   6 -
 ...dversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json |  44 +++---
 .../adversary_Construct_uOP5oT9QzXPlnf3p.json |  22 ++-
 .../adversary_Courtesan_ZxWaWPdzFIUPNC62.json |   6 -
 .../adversary_Courtier_CBBuEXAlLKFMJdjg.json  |   6 -
 ...adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json |  12 --
 .../adversary_Cult_Fang_tyBOpLfigAhI9bU3.json |   6 -
 ...ry_Deeproot_Defender_9x2xY9zwc3xzbXo5.json |   6 -
 ...ary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json |  22 ++-
 ...ary_Demon_of_Despair_kE4dfhqmIQpNd44e.json |  28 ++--
 ...rsary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json |   6 -
 ...y_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json |   8 +-
 .../adversary_Dire_Bat_tBWHW00epmMnkawe.json  |   6 -
 .../adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json |   6 -
 ...ersary_Electric_Eels_TLzY1nDw0Bu9Ud40.json |   8 +-
 ...ry_Failed_Experiment_ChwwVqowFw8hJQwT.json |  44 +++---
 ...sary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json |  12 --
 ..._Undefeated_Champion_RXkZTwBRi4dJ3JE5.json |   6 -
 ...ry_Giant_Beastmaster_8VZIgU12cB3cvlyH.json |   6 -
 ...dversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json |  36 ++---
 ...ary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json |  30 ++--
 ...rsary_Giant_Scorpion_fmfntuJ8mHRCAktP.json |   6 -
 ...dversary_Glass_Snake_8KWVLWXFhlY2kYx0.json |   6 -
 .../adversary_Gorgon_8mJYMpbLTb8qIOrr.json    |   6 -
 ...ater_Earth_Elemental_dsfB3YhoL5SudvS2.json |  28 ++--
 ...ater_Water_Elemental_xIICT6tEdnA7dKDV.json |  28 ++--
 ...adversary_Green_Ooze_SHXedd9zZPVfUgUa.json |   6 -
 ...sary_Hallowed_Archer_kabueAo6BALApWqp.json |  22 ++-
 ...dversary_High_Seraph_r1mbfSSwKWdcFdAU.json |   6 -
 ...sary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json |   6 -
 .../adversary_Hydra_MI126iMOOobQ1Obn.json     |   6 -
 ...y_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json |   6 -
 ...ed_Knife_Kneebreaker_CBKixLH3yhivZZuL.json |   6 -
 ..._Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json |  22 ++-
 ..._Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json |  22 ++-
 ..._Knight_of_the_Realm_7ai2opemrclQe3VF.json |  44 +++---
 .../adversary_Kraken_4nqv3ZwJGjnmic8j.json    |   6 -
 ...versary_Masked_Thief_niBpVU7yeo5ccskE.json |   6 -
 ...inor_Chaos_Elemental_sRn4bqerfARvhgSV.json |  28 ++--
 ...ersary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json |   6 -
 ...adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json |   6 -
 ...r_Realms_Abomination_A0SeeDzwjvqOsyof.json |  28 ++--
 ...ary_Perfected_Zombie_CP6iRfHdyFWniTHY.json |   6 -
 ...rsary_Pirate_Raiders_5YgEajn0wa4i85kC.json |   8 +-
 .../adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json  |   6 -
 .../adversary_Siren_BK4jwyXSRx7IOQiO.json     |   6 -
 ...sary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json |  22 ++-
 ...ary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json |  22 ++-
 ...sary_Spectral_Archer_5tCkhnBByUIN5UdG.json |  22 ++-
 ...ary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json |  22 ++-
 ...ry_Spectral_Guardian_UFVGl1osOsJTneLf.json |  22 ++-
 ...dversary_Stonewraith_3aAS2Qm3R6cgaYfE.json |   6 -
 ...ersary_Swarm_of_Rats_qNgs3AbLyJrY19nt.json |   8 +-
 ...rsary_Sylvan_Soldier_VtFBt9XBE0WrGGxP.json |   8 +-
 ...Tangle_Bramble_Swarm_PKSXFuaIHUCoH63A.json |  16 +--
 ...ault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json |   6 -
 ...lt_Guardian_Sentinel_FVgYb28fhxlVcGwA.json |  22 ++-
 ...ault_Guardian_Turret_c5hGdvY5UnSjlHws.json |  22 ++-
 ...Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json |  28 ++--
 ...agon__Molten_Scourge_eArAPuB38CNR0ZIM.json |   6 -
 ...n__Obsidian_Predator_ladm7wykhZczYzrQ.json |  50 +++----
 ...versary_Weaponmaster_ZNbQ2jg35LG4t9eH.json |   6 -
 ...dversary_Young_Dryad_8yUj2Mzvnifhxegm.json |   6 -
 ...ary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json |  18 ---
 ...ersary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json |  30 ++--
 ...dversary_Zombie_Pack_Nf0v43rtflV56V2T.json |   8 +-
 ...ure_Celestial_Trance_TfolXWFG2W2hx6sK.json |  34 ++---
 ...feature_Dread_Visage_i92lYjDhVB0LyPid.json |  22 ++-
 .../feature_Efficient_2xlqKOkDxWHbuj4t.json   |  34 ++---
 .../feature_Endurance_tXWEMdLXafUSZTbK.json   |  22 ++-
 ...feature_High_Stamina_HMXNJZ7ynzajR2KT.json |  22 ++-
 ...ture_Natural_Climber_soQvPL0MrTLLcc31.json |  22 ++-
 .../feature_Nimble_3lNqft3LmOlEIEkw.json      |  22 ++-
 .../feature_Retract_UFR67BUOhNGLFyg9.json     |   6 -
 ...ure_Retracting_Claws_Zj69cAeb3NjIa8Hn.json |   6 -
 .../feature_Scales_u8ZhV962rNmUlzkp.json      |  22 ++-
 .../feature_Shell_A6a87OWA3tx16g9V.json       |  34 ++---
 .../feature_Thick_Skin_S0Ww7pYOSREt8qKg.json  |  22 ++-
 .../feature_Tusks_YhxD1ujZpftPu19w.json       |  34 ++---
 .../feature_Wings_WquAjoOcso8lwySW.json       |  22 ++-
 .../feature_Rampage_8upqfcZvi7b5hRLE.json     |  22 ++-
 ...ture_Combat_Training_eoSmuAJmgHUyULtp.json |  34 ++---
 ...feature_Make_a_Scene_N9E5skDDK2VgvohR.json |   6 -
 .../feature_No_Mercy_njj2C3tMDeCHHOoh.json    |   6 -
 .../feature_Rally_PydiMnNCKpd44SGS.json       |  22 ++-
 ...ature_Ranger_s_Focus_ncLx2P8BOUtrAD38.json |   8 +-
 ...eature_Rogue_s_Dodge_hVaaPIjxoextIgSL.json |   6 -
 ...feature_Sneak_Attack_5QqpEwmwkPfZHpMW.json |  34 ++---
 .../feature_Unstoppable_PnD2UCgzIlwX6cY3.json |  70 +++++----
 .../feature_Lightfoot_TQ1AIQjndC4mYmmU.json   |  22 ++-
 ...ure_Low_Light_Living_aMla3xQuCHEwORGD.json |   6 -
 .../feature_Privilege_C7NR6qRatawZusmg.json   |  46 +++---
 .../feature_Scoundrel_ZmEuBdL0JrvuA8le.json   |  46 +++---
 .../feature_Steady_DYmmr5CknLtHnwuj.json      |  46 +++---
 .../feature_Well_Read_JBZJmywisJg5X3tH.json   |  22 ++-
 ...nCard_Arcana_Touched_5PvMQKCjrgSxzstn.json |  22 ++-
 ...omainCard_Battle_Cry_Ef1JsUG50LIoKx2F.json |   6 -
 ...inCard_Blade_Touched_Gb5bqpFSBiuBxUix.json |  34 ++---
 ...mainCard_Body_Basher_aQz8jKkCd8M9aKMA.json |  30 ++--
 ...inCard_Bold_Presence_tdsL00yTSLNgZWs6.json |  22 ++-
 ...mainCard_Bolt_Beacon_BNevJyGk7hmN7XOY.json |   6 -
 ...ainCard_Bone_Touched_ON5bvnoQBy0SYc9Y.json |  22 ++-
 ...mainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json |   6 -
 ...nCard_Book_of_Illiat_df4iRqQzRntrF6Qw.json |  12 --
 ...inCard_Book_of_Norai_WtwSWXTRZa7QVvmo.json |   6 -
 ...inCard_Book_of_Ronin_SZMNR3uGNinJcN4N.json |  16 +--
 ...inCard_Book_of_Sitil_eq8VNqYMRHhF9xw9.json |  16 +--
 ...inCard_Book_of_Vyola_VOIgm2j2Ijszwc5m.json |   8 +-
 ...nCard_Book_of_Yarrow_J1ovx2FpNDvPq1o6.json |   6 -
 .../domainCard_Brace_QXs4vssSqNGQu5b8.json    |  22 ++-
 ...inCard_Breaking_Blow_8UANBgSdhMZ0sqfO.json |   8 +-
 ...domainCard_Chokehold_R5GYUalYXLLFRlNl.json |   8 +-
 ...ainCard_Cinder_Grasp_5EP2Lgf7ojfrc0Is.json |   6 -
 ...nCard_Cloaking_Blast_Zhw7PtK8nMPlsOqD.json |   6 -
 ...inCard_Codex_Touched_7Pu83ABdMukTxu3e.json |  22 ++-
 ...inCard_Conjure_Swarm_rZPH0BY8Sznc9sFG.json |   6 -
 ...Card_Conjured_Steeds_Jkp6cMDiHHaBZQRS.json |  46 +++---
 ...Corrosive_Projectile_qJaSNTuDfbPVr8Lb.json |   6 -
 ...Card_Cruel_Precision_bap1eCWryPNowbyo.json |  68 ++++-----
 ...ainCard_Deadly_Focus_xxZOXC4tiZQ6kg1e.json |  22 ++-
 ...omainCard_Death_Grip_x0FVGE1YbfXalJiw.json |  18 ---
 ...inCard_Deft_Deceiver_38znCh6kHTkaPwYi.json |  22 ++-
 ...nCard_Deft_Maneuvers_dc4rAXlv95srZUct.json |  22 ++-
 ...omainCard_Earthquake_C0qLOwSSvZ6PG3Ws.json |   6 -
 .../domainCard_Eclipse_62Sj67PdPFzwWVe3.json  |   6 -
 ...domainCard_Enrapture_a8lFiKX1o8T924ze.json |   6 -
 .../domainCard_Flight_54GUjNuBEy7xdzMz.json   |   8 +-
 ...ainCard_Floating_Eye_wOQLu7nLMQ7v6Ogw.json |   8 +-
 .../domainCard_Forager_06UapZuaA5S6fAKl.json  |  22 ++-
 ...Card_Force_of_Nature_LzVpMkD5I4QeaIHf.json |  46 +++---
 ...inCard_Forceful_Push_z8FFPhDh2SdFkFfS.json |   6 -
 ...nCard_Forest_Sprites_JrkUMTzaFmQNBHVm.json |  22 ++-
 ...Card_Fortified_Armor_oVa49lI107eZILZr.json |  34 ++---
 .../domainCard_Frenzy_MMl7abdGRLl7TJLO.json   |   6 -
 ...omainCard_Full_Surge_SgvjJfMyubZowPxS.json |   6 -
 ...mainCard_Get_Back_Up_BFWN2cObMdlk9uVz.json |  22 ++-
 ...nCard_Gifted_Tracker_VZ2b4zfRzV73XTuT.json |  22 ++-
 ...d_Glyph_of_Nightfall_B5HXqYRJiL3xMNKT.json |   6 -
 ...ainCard_Goad_Them_On_HufF5KzuNfEb9RTi.json |  22 ++-
 ...inCard_Grace_Touched_KAuNb51AwhD8KEXk.json |   8 +-
 ...inCard_Healing_Hands_WTlhnQMajc1r8i50.json |   8 +-
 ...inCard_Hold_the_Line_kdFoLo3KXwn4LqTG.json |  14 +-
 .../domainCard_Hush_gwmYasmfgXZ7tFS6.json     |   6 -
 ...ard_Hypnotic_Shimmer_2ZeuCGVatQdPOVC6.json |   6 -
 ...omainCard_Inevitable_XTT8c8uJ4D7fvtbL.json |  22 ++-
 ...ainCard_Invisibility_KHkzA4Zrw8EWN1CH.json |   8 +-
 ...Card_Lead_by_Example_YWCRplmtwpCjpq5i.json |   8 +-
 ...domainCard_Life_Ward_OszbCj0jTqq2ADx9.json |   6 -
 ...inCard_Mass_Disguise_dT95m0Jam8sWbeuC.json |  22 ++-
 ...nCard_Mass_Enrapture_ubpixIgZrJXKyM3b.json |   6 -
 ...ard_Midnight_Touched_uSyGKVxOJcnp28po.json |   8 +-
 ...ard_Natural_Familiar_Tag303LoRNC5zGgl.json |  34 ++---
 ...Card_Nature_s_Tongue_atWLorlCOxcrq8WB.json |  22 ++-
 ...nCard_Never_Upstaged_McdncxmO9K1YNP7Y.json | 136 ++++++++----------
 ...ainCard_Night_Terror_zcldCuqOg3dphUVI.json |   6 -
 ...ainCard_On_the_Brink_zbxPl81kbWEegKQN.json |  22 ++-
 ...rd_Overwhelming_Aura_iEBLySZD9z8CLdz7.json |   6 -
 ...inCard_Pick_and_Pull_HdgZUfWd7Hyj7nBW.json |  46 +++---
 .../domainCard_Rage_Up_GRL0cvs96vrTDckZ.json  |  12 --
 .../domainCard_Recovery_gsiQFT6q3WOgqerJ.json |  68 ++++-----
 ...Rejuvenation_Barrier_HtWx5IIemCoorMj2.json |   6 -
 .../domainCard_Rise_Up_oDIZoC4l19Nli0Fj.json  |  22 ++-
 ...omainCard_Safe_Haven_lmBLMPuR8qLbuzNf.json |  34 ++---
 ...ainCard_Sage_Touched_VOSFaQHZbmhMyXwi.json |  66 ++++-----
 ...omainCard_Shadowbind_kguhWlidhxe2GbT0.json |   6 -
 ...ainCard_Shadowhunter_A0XzD6MmBXYdk7Ps.json |  30 ++--
 ...mainCard_Shield_Aura_rfIv6lln40Fh6EIl.json |  22 ++-
 ...ainCard_Shrug_It_Off_JwfhtgmmuRxg4zhI.json |  22 ++-
 ...Sigil_of_Retribution_RiuN0lMlfoTAhLJz.json |   8 +-
 .../domainCard_Smite_U1uWJE94HZVudujz.json    |   8 +-
 ..._Specter_of_the_Dark_iQhgqmLwhcSTYnvr.json |  22 ++-
 ...ard_Splendor_Touched_JT5dM3gVL6chDBYU.json |  22 ++-
 ...rd_Stunning_Sunlight_lRHo6ZkK1zybeEoG.json |   6 -
 ...ainCard_Tell_No_Lies_HTv9QEPS466WsstP.json |   8 +-
 .../domainCard_Tempest_X7YaZgFieBlqaPdZ.json  |  18 ---
 ...omainCard_Thorn_Skin_oUipGK84E2KjoKqh.json |   8 +-
 ...nCard_Thought_Delver_B4choj481tqajWb9.json |   8 +-
 ...rd_Through_Your_Eyes_7b0mzV5QMPjVPT4o.json |   6 -
 ...d_Transcendent_Union_kVkoCLBXLAIifqpz.json |   6 -
 ...inCard_Twilight_Toll_SDjjV61TC1NceV1m.json |   8 +-
 ...ard_Uncanny_Disguise_TV56wSysbU5xAlOa.json |  22 ++-
 ...inCard_Unleash_Chaos_o62i0QdbUDIiAhSq.json |   8 +-
 ...mainCard_Untouchable_9QElncQUDSakuSdR.json |  22 ++-
 ...Card_Vanishing_Dodge_GBMIElIpk4cvk1Bd.json |   8 +-
 ...inCard_Veil_of_Night_gV4L5ZZmfPrEbIDh.json |   6 -
 ...ard_Vicious_Entangle_qvpvTnkAoRn9vYO4.json |  12 --
 .../domainCard_Vitality_sWUlSPOJEaXyQLCj.json |  78 ++++------
 ...Card_Voice_of_Reason_t3RRGH6mMYYJJCcF.json |  56 +++-----
 ...domainCard_Wall_Walk_1ROT08E1UVBwHLAS.json |   8 +-
 ...ard_Words_of_Discord_ZjAdi1FSNCDDHI3X.json |   8 +-
 ...ment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json |   6 -
 ...g_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json |   6 -
 ...ironment_Cult_Ritual_QAXXiOKBDmCTauHD.json |  64 +++------
 ...nt_Divine_Usurpation_4DLYez7VbMCFDAuZ.json |  66 ++++-----
 ...ronment_Haunted_City_OzYbizKraK92FDiI.json |  22 ++-
 ...ronment_Raging_River_t4cdqTfzcqP3H1vJ.json |   6 -
 ...consumable_Death_Tea_xDnJeF1grkmKck8Q.json |   8 +-
 ...nsumable_Featherbone_DpxEMpwfasEBpORU.json |   8 +-
 ...onsumable_Gill_Salve_Nvbb9mze6o5D0AEg.json |   8 +-
 ...e_Grindletooth_Venom_8WkhvSzeOmLdnoLJ.json |  22 ++-
 ...omet_s_Secret_Potion_VSwa1LpQ9PjZKsWF.json |   8 +-
 ...d_Grindletooth_Venom_BqBWXXe9T07AMV4u.json |  22 ++-
 ...umable_Morphing_Clay_f1NHVSIHJJCIOaBl.json |   6 -
 ...nsumable_Mythic_Dust_Zsh2AvZr8EkGtLyw.json |  22 ++-
 ...consumable_Ogre_Musk_qr1bosjFcUfuwq4B.json |   6 -
 ...able_Redthorn_Saliva_s2Exl2XFuoOhtIov.json |  22 ++-
 ...ble_Vial_of_Moondrip_VqEX5YwK5oL3r1t6.json |   6 -
 ...onsumable_Wingsprout_n10vozlmosVR6lo4.json |   8 +-
 ...ot_Bag_of_Ficklesand_v758j4FwNVAurhYK.json |   8 +-
 ...loot_Charging_Quiver_gsUDP90d4SRtLEUn.json |  34 ++---
 .../loot_Glamour_Stone_Pj17cvdJ1XG1jv6I.json  |   8 +-
 ...loot_Piercing_Arrows_I63LTFD6GXHgyGpR.json |  34 ++---
 ...t_Ring_of_Resistance_aUqRifqR5JXXa1dN.json |  34 ++---
 ...loot_Ring_of_Silence_K1ysGnTpNyxPu5Au.json |   8 +-
 .../weapon_Aantari_Bow_ijodu5yNBoMxpkHV.json  |  20 +--
 ...ane_Frame_Wheelchair_la3sAWgnvadc4NvP.json |  20 +--
 ..._Advanced_Broadsword_WtQAGz0TUgz8Xg70.json |  20 +--
 ..._Advanced_Shortsword_p3nz5CaGUoyuGVg0.json |  16 +--
 ...dvanced_Small_Dagger_0thN0BpN05KT8Avx.json |  20 +--
 ...ane_Frame_Wheelchair_XRChepscgr75Uug7.json |  20 +--
 .../weapon_Broadsword_1cwWNt4sqlgA8gCT.json   |  20 +--
 ...ane_Frame_Wheelchair_N9P695V5KKlJbAY5.json |  20 +--
 ..._Improved_Broadsword_OcKeLJxvmdT81VBc.json |  20 +--
 ..._Improved_Shortsword_rSyBNRwemBVuTo3H.json |  16 +--
 ...mproved_Small_Dagger_nMuF8ZDZ2aXZVTg6.json |  20 +--
 ...eapon_Keeper_s_Staff_q382JqMkqLaaFLIr.json |  20 +--
 ...ane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json |  20 +--
 ...Legendary_Broadsword_y3hfTPfZhMognyaJ.json |  20 +--
 ...Legendary_Shortsword_dEumq3BIZBk5xYTk.json |  16 +--
 ...gendary_Small_Dagger_Px3Rh3kIvAqyISxJ.json |  20 +--
 .../weapon_Shortsword_cjGZpXCoshEqi1FI.json   |  18 +--
 .../weapon_Small_Dagger_wKklDxs5nkzILNp4.json |  20 +--
 .../weapon_Thistlebow_I1nDGpulg29GpWOW.json   |  20 +--
 .../weapon_War_Scythe_z6yEdFYQJ5IzgTX3.json   |  20 +--
 ...ture_Act_of_Reprisal_k7vvMJtEcxMWUUrW.json |   6 -
 .../feature_Adrenaline_uByM34yQlw38yf1V.json  |  34 ++---
 ...re_Advanced_Training_uGcs785h94RMtueH.json |  22 ++-
 ...eature_Arcane_Charge_yA4MKQ1tbKFiJoDB.json |  22 ++-
 .../feature_Ascendant_fefLgx6kcYWusjBb.json   |  22 ++-
 .../feature_At_Ease_xPWFvGvtUjIcqgJq.json     |  22 ++-
 ...eature_Battle_Bonded_hWsKyed1vfILg0I8.json |   6 -
 .../feature_Battlemage_Y9eGMewnFZgPvX0M.json  |  22 ++-
 ...ature_Conjure_Shield_oirsCnN66GOlK3Fa.json |  22 ++-
 ...ature_Elemental_Aura_2JH9NaOh69yN80Gw.json |  18 ---
 ...e_Elemental_Dominion_EFUJHrkTuyv8uA9l.json |  58 +++-----
 ...lemental_Incarnation_f37TTgCc0Q3Ih1A1.json |  72 ++++------
 ...feature_Elementalist_dPcqKN5NeDkjB1HW.json |  56 +++-----
 ...ure_Elusive_Predator_Cjtc43V3IzAmfIFG.json |   6 -
 .../feature_Epic_Poetry_eCoEWkWuZPMZ9C6a.json |  22 ++-
 ...ture_Ethereal_Visage_tyGB6wRKjYdIBK1i.json |  22 ++-
 ...ture_Expert_Training_iCXtOWBKv1FdKdWz.json |  22 ++-
 ...ture_Fleeting_Shadow_EY7Eo6hNGppVL3dR.json |  22 ++-
 ...ure_Gifted_Performer_99U7YWNCxFZHCiT0.json |   6 -
 .../feature_Iron_Will_7AVRNyBcd1Nffjtn.json   |  22 ++-
 .../feature_Nemesis_DPKmipNRlSAMs2Cg.json     |   8 +-
 ...re_Ruthless_Predator_Qny2J3R35bvC0Cey.json |  22 ++-
 ...ature_Shadow_Stepper_hAwTXjhyphiE3aeW.json |   8 +-
 ...eature_Transcendence_th6HZwEFnVBjUtqm.json |  44 ++----
 .../feature_Undaunted_866b2jjyzXP8nPRQ.json   |  34 ++---
 .../feature_Unrelenting_4qP7bNyxVHBmr4Rb.json |  34 ++---
 .../feature_Unwavering_WBiFZaYNoQNhysmN.json  |  34 ++---
 ...eature_Vanishing_Act_iyIg1VLwO8C6jvFZ.json |   8 +-
 ...ature_Wings_of_Light_KkQH0tYhagIqe2MT.json |  34 ++---
 styles/less/global/elements.less              |   4 +
 templates/sheets/activeEffect/changes.hbs     |   2 +-
 templates/sheets/activeEffect/settings.hbs    |  19 ++-
 280 files changed, 1692 insertions(+), 3605 deletions(-)

diff --git a/daggerheart.mjs b/daggerheart.mjs
index b92be2a2..63127aa4 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -390,7 +390,7 @@ const updateActorsRangeDependentEffects = async token => {
     ).rangeMeasurement;
 
     for (let effect of token.actor?.allApplicableEffects() ?? []) {
-        if (!effect.system.rangeDependence?.enabled) continue;
+        if (!effect.system.rangeDependence) continue;
         const { target, range, type } = effect.system.rangeDependence;
 
         // If there are no targets, assume false. Otherwise, start with the effect enabled.
diff --git a/lang/en.json b/lang/en.json
index b9a81b29..627a2015 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -167,9 +167,7 @@
         },
         "ACTIVEEFFECT": {
             "Config": {
-                "rangeDependence": {
-                    "title": "Range Dependence"
-                },
+                "rangeDependence": { "title": "Range Dependence" },
                 "stacking": { "title": "Stacking" },
                 "targetDispositions": "Affected Dispositions"
             },
diff --git a/module/applications/sheets-configs/activeEffectConfig.mjs b/module/applications/sheets-configs/activeEffectConfig.mjs
index 2d9eafc3..2967c5f1 100644
--- a/module/applications/sheets-configs/activeEffectConfig.mjs
+++ b/module/applications/sheets-configs/activeEffectConfig.mjs
@@ -155,6 +155,10 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac
             .querySelector('.stacking-change-checkbox')
             ?.addEventListener('change', this.stackingChangeToggle.bind(this));
 
+        htmlElement
+            .querySelector('.range-dependence-change-checkbox')
+            ?.addEventListener('change', this.rangeDependenceChangeToggle.bind(this));
+
         htmlElement
             .querySelector('.armor-change-checkbox')
             ?.addEventListener('change', this.armorChangeToggle.bind(this));
@@ -224,6 +228,20 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac
         return this.submit({ updateData: { system: systemData } });
     }
 
+    rangeDependenceChangeToggle(event) {
+        const rangeFields = this.document.system.schema.fields.rangeDependence.fields;
+        const systemData = {
+            rangeDependence: event.target.checked
+                ? _replace({ 
+                    type: rangeFields.type.initial, 
+                    target: rangeFields.target.initial,
+                    range: rangeFields.range.initial 
+                })
+                : null
+        };
+        return this.submit({ updateData: { system: systemData } });
+    }
+
     armorChangeToggle(event) {
         if (event.target.checked) {
             this.addArmorChange();
diff --git a/module/config/itemConfig.mjs b/module/config/itemConfig.mjs
index 43054ec5..9ebfd1e2 100644
--- a/module/config/itemConfig.mjs
+++ b/module/config/itemConfig.mjs
@@ -791,14 +791,14 @@ export const weaponFeatures = {
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.doubleDuty.effects.doubleDuty.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.doubleDuty.effects.doubleDuty.description',
                 img: 'icons/skills/melee/sword-shield-stylized-white.webp',
-                changes: [
-                    {
-                        key: 'system.bonuses.damage.primaryWeapon.bonus',
-                        mode: 2,
-                        value: '1'
-                    }
-                ],
                 system: {
+                    changes: [
+                        {
+                            key: 'system.bonuses.damage.primaryWeapon.bonus',
+                            mode: 2,
+                            value: '1'
+                        }
+                    ],
                     rangeDependence: {
                         enabled: true,
                         range: 'melee',
@@ -1103,14 +1103,14 @@ export const weaponFeatures = {
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.paired.effects.paired.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.paired.effects.paired.description',
                 img: 'icons/skills/melee/weapons-crossed-swords-yellow-teal.webp',
-                changes: [
-                    {
-                        key: 'system.bonuses.damage.primaryWeapon.bonus',
-                        mode: 2,
-                        value: 'ITEM.@system.tier + 1'
-                    }
-                ],
                 system: {
+                    changes: [
+                        {
+                            key: 'system.bonuses.damage.primaryWeapon.bonus',
+                            mode: 2,
+                            value: 'ITEM.@system.tier + 1'
+                        }
+                    ],
                     rangeDependence: {
                         enabled: true,
                         range: 'melee',
diff --git a/module/data/activeEffect/baseEffect.mjs b/module/data/activeEffect/baseEffect.mjs
index 9b17164d..547bdcf7 100644
--- a/module/data/activeEffect/baseEffect.mjs
+++ b/module/data/activeEffect/baseEffect.mjs
@@ -57,11 +57,6 @@ export default class BaseEffect extends foundry.data.ActiveEffectTypeDataModel {
                 description: new fields.HTMLField({ label: 'DAGGERHEART.GENERAL.description' })
             }),
             rangeDependence: new fields.SchemaField({
-                enabled: new fields.BooleanField({
-                    required: true,
-                    initial: false,
-                    label: 'DAGGERHEART.GENERAL.enabled'
-                }),
                 type: new fields.StringField({
                     required: true,
                     choices: CONFIG.DH.GENERAL.rangeInclusion,
@@ -80,7 +75,7 @@ export default class BaseEffect extends foundry.data.ActiveEffectTypeDataModel {
                     initial: CONFIG.DH.GENERAL.range.melee.id,
                     label: 'DAGGERHEART.GENERAL.range'
                 })
-            }),
+            }, { nullable: true, initial: null }),
             stacking: new fields.SchemaField(
                 {
                     value: new fields.NumberField({
@@ -146,14 +141,8 @@ export default class BaseEffect extends foundry.data.ActiveEffectTypeDataModel {
             description: '',
             transfer: options.transfer,
             statuses: [],
-            changes: [],
             system: {
-                rangeDependence: {
-                    enabled: false,
-                    type: CONFIG.DH.GENERAL.rangeInclusion.withinRange.id,
-                    target: CONFIG.DH.GENERAL.otherTargetTypes.hostile.id,
-                    range: CONFIG.DH.GENERAL.range.melee.id
-                }
+                changes: []
             }
         };
     }
@@ -185,4 +174,12 @@ export default class BaseEffect extends foundry.data.ActiveEffectTypeDataModel {
         if (this.parent.actor && options.scrollingTextData)
             this.parent.actor.queueScrollText(options.scrollingTextData);
     }
+
+    static migrateData(source) {
+        if (source.rangeDependence?.enabled === false) {
+            source.rangeDependence = null;
+        }
+
+        return super.migrateData(source);
+    }
 }
diff --git a/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json b/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
index d3c8c955..4261a261 100644
--- a/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
+++ b/src/packs/adversaries/adversary_Acid_Burrower_89yAh30vaNQOALlz.json
@@ -403,12 +403,6 @@
           "_id": "9PsnogEPsp1OOK64",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "act"
diff --git a/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json b/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json
index ecb93d1b..9fef39f0 100644
--- a/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json
+++ b/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json
@@ -322,32 +322,23 @@
           "_id": "ia0NUIOxE3RHb45P",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.evasion",
+                "mode": 5,
+                "value": "@system.evasion / 2",
+                "priority": 10
+              }
+            ]
           },
-          "changes": [
-            {
-              "key": "system.evasion",
-              "mode": 5,
-              "value": "@system.evasion / 2",
-              "priority": 10
-            }
-          ],
-          "disabled": false,
           "duration": {
-            "startTime": null,
-            "combat": null,
-            "seconds": null,
-            "rounds": null,
-            "turns": null,
-            "startRound": null,
-            "startTurn": null
+            "value": null,
+            "units": "seconds",
+            "expiry": null,
+            "expired": false
           },
-          "description": "<p>When the Flickerfl y makes an attack, the target’s Evasion is halved against the attack.</p>",
+          "disabled": false,
+          "description": "<p>When the Flickerfly makes an attack, the target’s Evasion is halved against the attack.</p>",
           "tint": "#ffffff",
           "statuses": [],
           "sort": 0,
diff --git a/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json b/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
index 5da74eb3..6cb0c95d 100644
--- a/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
+++ b/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
@@ -491,12 +491,6 @@
           "_id": "KGdf2eqcXkdigg0u",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json b/src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json
index 965c5168..46dc3777 100644
--- a/src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json
+++ b/src/packs/adversaries/adversary_Archer_Guard_JRhrrEg5UroURiAD.json
@@ -325,21 +325,15 @@
           "_id": "wGuxOLokMqdxVSOo",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.disadvantageSources",
+                "mode": 2,
+                "value": "Agility Rolls",
+                "priority": null
+              }
+            ]
           },
-          "changes": [
-            {
-              "key": "system.disadvantageSources",
-              "mode": 2,
-              "value": "Agility Rolls",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Archer_Squadron_0ts6CGd93lLqGZI5.json b/src/packs/adversaries/adversary_Archer_Squadron_0ts6CGd93lLqGZI5.json
index 1e45b90a..24b7c6eb 100644
--- a/src/packs/adversaries/adversary_Archer_Squadron_0ts6CGd93lLqGZI5.json
+++ b/src/packs/adversaries/adversary_Archer_Squadron_0ts6CGd93lLqGZI5.json
@@ -472,14 +472,8 @@
       "disabled": true,
       "_id": "bq8hTzQoCXmA3xad",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "duration": {
         "startTime": 0,
         "combat": null
diff --git a/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json b/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json
index c1bce57b..f156174d 100644
--- a/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json
+++ b/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json
@@ -270,12 +270,6 @@
           "_id": "2iBVUGHtGW3I9VIj",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
@@ -341,23 +335,17 @@
           "name": "Out of Nowhere",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.advantageSources",
+                "mode": 2,
+                "value": "On attacks if they are Hidden.",
+                "priority": null
+              }
+            ]
           },
           "_id": "qT5nh7OcQ6aGdiWS",
           "img": "icons/magic/perception/shadow-stealth-eyes-purple.webp",
-          "changes": [
-            {
-              "key": "system.advantageSources",
-              "mode": 2,
-              "value": "On attacks if they are Hidden.",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -452,12 +440,6 @@
           "_id": "yP4ot8VqS56RnxnE",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": []
           },
           "disabled": false,
diff --git a/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json b/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json
index be47829b..5625ff0f 100644
--- a/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json
+++ b/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json
@@ -680,12 +680,6 @@
           "_id": "9NQcCXMhjyBReJRd",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
@@ -927,12 +921,6 @@
           "_id": "S7kJlhnV8Nexzi8l",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json b/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json
index cfc71120..8dd7fb95 100644
--- a/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json
+++ b/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json
@@ -363,12 +363,6 @@
           "_id": "U50Ccm9emMqAxma6",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json b/src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json
index a315f91a..2083208f 100644
--- a/src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json
+++ b/src/packs/adversaries/adversary_Bladed_Guard_B4LZcGuBAHzyVdzy.json
@@ -371,12 +371,6 @@
           "_id": "LmzztuktRkwOCy1a",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json b/src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json
index 8863641d..94862545 100644
--- a/src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json
+++ b/src/packs/adversaries/adversary_Brawny_Zombie_2UeZ0tEe7AzgSJNd.json
@@ -447,12 +447,6 @@
           "_id": "CjMrSdL6kgD8mKRQ",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary"
diff --git a/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json b/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json
index 876519cf..8739fb2e 100644
--- a/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json
+++ b/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json
@@ -232,23 +232,17 @@
           "name": "Levitation",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.rules.conditionImmunities.restrained",
+                "mode": 5,
+                "value": "1",
+                "priority": null
+              }
+            ]
           },
           "_id": "k6iaQVfMZhrpwYQj",
           "img": "icons/magic/air/fog-gas-smoke-blue-gray.webp",
-          "changes": [
-            {
-              "key": "system.rules.conditionImmunities.restrained",
-              "mode": 5,
-              "value": "1",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -301,23 +295,17 @@
           "name": "Wards",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.resistance.magical.resistance",
+                "mode": 5,
+                "value": "1",
+                "priority": null
+              }
+            ]
           },
           "_id": "4rj6PM0AGrrlbxSc",
           "img": "icons/magic/defensive/barrier-shield-dome-blue-purple.webp",
-          "changes": [
-            {
-              "key": "system.resistance.magical.resistance",
-              "mode": 5,
-              "value": "1",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json b/src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json
index 3bd154ef..840f030b 100644
--- a/src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json
+++ b/src/packs/adversaries/adversary_Construct_uOP5oT9QzXPlnf3p.json
@@ -459,21 +459,15 @@
           "_id": "xkDIZk9u2ipDHvOL",
           "img": "icons/creatures/magical/construct-golem-stone-blue.webp",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.bonuses.damage.physical.bonus",
+                "mode": 2,
+                "value": "10",
+                "priority": null
+              }
+            ]
           },
-          "changes": [
-            {
-              "key": "system.bonuses.damage.physical.bonus",
-              "mode": 2,
-              "value": "10",
-              "priority": null
-            }
-          ],
           "disabled": true,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json b/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json
index aba9ea46..14de1b12 100644
--- a/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json
+++ b/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json
@@ -315,12 +315,6 @@
           "_id": "blcRqns0PHqiuPac",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json b/src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json
index 8777ee06..1e4f4140 100644
--- a/src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json
+++ b/src/packs/adversaries/adversary_Courtier_CBBuEXAlLKFMJdjg.json
@@ -331,12 +331,6 @@
           "_id": "YNMhgBZW8ndrCjIp",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "scene"
diff --git a/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json b/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
index 27553d32..e191c11e 100644
--- a/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
+++ b/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
@@ -415,12 +415,6 @@
           "_id": "U9lWz1LgeAiK5L85",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [
               {
                 "key": "system.resistance.magical.resistance",
@@ -546,12 +540,6 @@
           "_id": "lNH6srSPyEprXZ4o",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json b/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json
index e65f3202..0bb00b6b 100644
--- a/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json
+++ b/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json
@@ -379,12 +379,6 @@
           "_id": "LwWxRz7FTMA80VdA",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary"
diff --git a/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json b/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json
index 9ff0a161..a4aca10d 100644
--- a/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json
+++ b/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json
@@ -410,12 +410,6 @@
           "_id": "F3E7fiz01AbF2kr5",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json b/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json
index 1a3538da..e80c91d3 100644
--- a/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json
+++ b/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json
@@ -270,23 +270,17 @@
           "name": "Numbers Must Go Up",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.bonuses.roll.attack.bonus",
+                "mode": 2,
+                "value": "ITEM.@system.resource.value",
+                "priority": 21
+              }
+            ]
           },
           "_id": "iLeiOlUtWvYsgbDQ",
           "img": "icons/magic/control/fear-fright-monster-grin-red-orange.webp",
-          "changes": [
-            {
-              "key": "system.bonuses.roll.attack.bonus",
-              "mode": 2,
-              "value": "ITEM.@system.resource.value",
-              "priority": 21
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json b/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json
index 6468c1aa..6ac0279c 100644
--- a/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json
+++ b/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json
@@ -238,23 +238,17 @@
           "name": "Depths Of Despair",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.rules.attack.damage.hpDamageMultiplier",
+                "mode": 5,
+                "value": "2",
+                "priority": null
+              }
+            ]
           },
           "_id": "nofxm1vGZ2TmceA2",
           "img": "icons/magic/death/skull-horned-worn-fire-blue.webp",
-          "changes": [
-            {
-              "key": "system.rules.attack.damage.hpDamageMultiplier",
-              "mode": 5,
-              "value": "2",
-              "priority": null
-            }
-          ],
           "disabled": true,
           "duration": {
             "startTime": null,
@@ -356,12 +350,6 @@
           "_id": "6WSx03mFbpbPWnOI",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [
               {
                 "key": "system.rules.dualityRoll.defaultHopeDice",
diff --git a/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json b/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
index 0bc6bf2d..a158b2b7 100644
--- a/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
+++ b/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
@@ -319,12 +319,6 @@
           "_id": "gFeHLGgeRoDdd3VG",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [
               {
                 "key": "system.rules.dualityRoll.defaultFearDice",
diff --git a/src/packs/adversaries/adversary_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json b/src/packs/adversaries/adversary_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json
index b534562b..09bca946 100644
--- a/src/packs/adversaries/adversary_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json
+++ b/src/packs/adversaries/adversary_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json
@@ -440,14 +440,8 @@
       "disabled": true,
       "_id": "dPZ7PwvTERjtG92P",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "duration": {
         "startTime": 0,
         "combat": null
diff --git a/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json b/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json
index a1107f7c..bc1ab981 100644
--- a/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json
+++ b/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json
@@ -238,12 +238,6 @@
           "name": "Flying",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [
               {
                 "key": "system.difficulty",
diff --git a/src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json b/src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json
index 939a5307..41ca7129 100644
--- a/src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json
+++ b/src/packs/adversaries/adversary_Dire_Wolf_wNzeuQLfLUMvgHlQ.json
@@ -430,12 +430,6 @@
           "_id": "YNKHEFQ4ucGr4Rmc",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Electric_Eels_TLzY1nDw0Bu9Ud40.json b/src/packs/adversaries/adversary_Electric_Eels_TLzY1nDw0Bu9Ud40.json
index 1909a74a..88a0dddb 100644
--- a/src/packs/adversaries/adversary_Electric_Eels_TLzY1nDw0Bu9Ud40.json
+++ b/src/packs/adversaries/adversary_Electric_Eels_TLzY1nDw0Bu9Ud40.json
@@ -358,14 +358,8 @@
       "disabled": true,
       "_id": "xoal60Ed3Ih7saBJ",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "duration": {
         "startTime": 0,
         "combat": null
diff --git a/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json b/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json
index 70e56980..325530b0 100644
--- a/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json
+++ b/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json
@@ -240,23 +240,17 @@
           "name": "Warped Fortitude",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.resistance.physical.resistance",
+                "mode": 5,
+                "value": "1",
+                "priority": null
+              }
+            ]
           },
           "_id": "3QLH2EEtcUEZolFz",
           "img": "icons/creatures/magical/humanoid-silhouette-glowing-pink.webp",
-          "changes": [
-            {
-              "key": "system.resistance.physical.resistance",
-              "mode": 5,
-              "value": "1",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -309,23 +303,17 @@
           "name": "Overwhelm",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.rules.attack.damage.hpDamageMultiplier",
+                "mode": 5,
+                "value": "2",
+                "priority": null
+              }
+            ]
           },
           "_id": "eGB9G0ljYCcdGbOx",
           "img": "icons/skills/melee/strike-slashes-orange.webp",
-          "changes": [
-            {
-              "key": "system.rules.attack.damage.hpDamageMultiplier",
-              "mode": 5,
-              "value": "2",
-              "priority": null
-            }
-          ],
           "disabled": true,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json b/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json
index 975cf6aa..0f335dcb 100644
--- a/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json
+++ b/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json
@@ -388,12 +388,6 @@
           "_id": "Q99saHj6NOY2PSXf",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
@@ -596,12 +590,6 @@
           "_id": "pWDg0MADoohKu40O",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Fallen_Warlord__Undefeated_Champion_RXkZTwBRi4dJ3JE5.json b/src/packs/adversaries/adversary_Fallen_Warlord__Undefeated_Champion_RXkZTwBRi4dJ3JE5.json
index 6cb1c0ce..fb616c4c 100644
--- a/src/packs/adversaries/adversary_Fallen_Warlord__Undefeated_Champion_RXkZTwBRi4dJ3JE5.json
+++ b/src/packs/adversaries/adversary_Fallen_Warlord__Undefeated_Champion_RXkZTwBRi4dJ3JE5.json
@@ -656,12 +656,6 @@
             "vulnerable"
           ],
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "description": "",
diff --git a/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json b/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
index c6a482dd..9563c287 100644
--- a/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
+++ b/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
@@ -347,12 +347,6 @@
           "_id": "vb1sZCOLwDNLsr3j",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json b/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
index a8a33586..dd10483a 100644
--- a/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
+++ b/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
@@ -265,23 +265,17 @@
           "name": "Flying",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.difficulty",
+                "mode": 2,
+                "value": "3",
+                "priority": null
+              }
+            ]
           },
           "_id": "odAyKY0BSAkcO3Dd",
           "img": "icons/creatures/birds/raptor-hawk-flying.webp",
-          "changes": [
-            {
-              "key": "system.difficulty",
-              "mode": 2,
-              "value": "3",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -425,12 +419,6 @@
           "_id": "m6qqQZxukDPVcGdQ",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "act"
@@ -579,14 +567,8 @@
           "_id": "Sd34xywRqiF5w9sX",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": []
           },
-          "changes": [],
           "disabled": false,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json b/src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json
index a74cb88d..74fd0b04 100644
--- a/src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json
+++ b/src/packs/adversaries/adversary_Giant_Mosquitoes_IIWV4ysJPFPnTP7W.json
@@ -269,21 +269,15 @@
           "_id": "aATxfjeOzUYtKuU6",
           "img": "icons/commodities/biological/wing-insect-green.webp",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.difficulty",
+                "mode": 2,
+                "value": "2",
+                "priority": null
+              }
+            ]
           },
-          "changes": [
-            {
-              "key": "system.difficulty",
-              "mode": 2,
-              "value": "2",
-              "priority": null
-            }
-          ],
           "disabled": true,
           "duration": {
             "startTime": null,
@@ -385,14 +379,8 @@
       "disabled": true,
       "_id": "dQgcYTz5vmV25Y6G",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "duration": {
         "startTime": 0,
         "combat": null
diff --git a/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json b/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json
index 03a0272d..cb815547 100644
--- a/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json
+++ b/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json
@@ -433,12 +433,6 @@
           "_id": "oILkLJlGNZl7KI1R",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "shortRest"
diff --git a/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json b/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json
index f290875d..fd832332 100644
--- a/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json
+++ b/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json
@@ -597,12 +597,6 @@
           "_id": "Mchd23xNQ4nSWw9X",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": []
           },
           "disabled": false,
diff --git a/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json b/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
index 1fcfcce4..1a971a21 100644
--- a/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
+++ b/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
@@ -330,12 +330,6 @@
           "_id": "bYBrgiSwHwYfQyjn",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [
               {
                 "key": "system.rules.conditionImmunities.hidden",
diff --git a/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json b/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
index 72ad8ae2..a3ae5de3 100644
--- a/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
+++ b/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
@@ -340,23 +340,17 @@
           "name": "Immovable Object",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.resistance.physical.reduction",
+                "mode": 2,
+                "value": "7",
+                "priority": null
+              }
+            ]
           },
           "_id": "7V7qMq9in3AArwiM",
           "img": "icons/magic/defensive/shield-barrier-glowing-triangle-green.webp",
-          "changes": [
-            {
-              "key": "system.resistance.physical.reduction",
-              "mode": 2,
-              "value": "7",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -510,12 +504,6 @@
           "_id": "38MUzfbH64EMLVse",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json b/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json
index db73a536..f0f68c11 100644
--- a/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json
+++ b/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json
@@ -323,21 +323,15 @@
           "_id": "WYqjt1tVqPEdVV5l",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.disadvantageSources",
+                "mode": 2,
+                "value": "Your next action",
+                "priority": null
+              }
+            ]
           },
-          "changes": [
-            {
-              "key": "system.disadvantageSources",
-              "mode": 2,
-              "value": "Your next action",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -462,12 +456,6 @@
           "_id": "X8NF2OB23mSpDvlx",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json b/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
index a3a76d7a..9714a3a2 100644
--- a/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
+++ b/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
@@ -460,12 +460,6 @@
           "_id": "yk5kR5OVLCgDWfgY",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json b/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json
index eb7eafc1..34e40c70 100644
--- a/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json
+++ b/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json
@@ -234,23 +234,17 @@
           "name": "Punish the Guilty",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.rules.attack.damage.hpDamageMultiplier",
+                "mode": 5,
+                "value": "2",
+                "priority": null
+              }
+            ]
           },
           "_id": "ID85zoIa5GfhNMti",
           "img": "icons/magic/control/buff-flight-wings-runes-red-yellow.webp",
-          "changes": [
-            {
-              "key": "system.rules.attack.damage.hpDamageMultiplier",
-              "mode": 5,
-              "value": "2",
-              "priority": null
-            }
-          ],
           "disabled": true,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json b/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json
index 3dc96fd5..874330d4 100644
--- a/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json
+++ b/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json
@@ -386,12 +386,6 @@
           "_id": "O8G0oOf9f3qzNOAT",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json b/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
index 183719f2..986f3146 100644
--- a/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
+++ b/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
@@ -429,12 +429,6 @@
           "_id": "EwZ8owroJxFpg81e",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json b/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json
index 9c53487a..4ebd5735 100644
--- a/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json
+++ b/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json
@@ -510,12 +510,6 @@
           "_id": "iBJ3YhEkVsGKEIVk",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [
               {
                 "key": "system.resistance.magical.immunity",
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json b/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json
index c6b2554e..f42433f0 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json
@@ -273,12 +273,6 @@
           "_id": "ihy3kvEGSOEKdNfT",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary"
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json b/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json
index 3ce6a165..262d2954 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json
@@ -329,12 +329,6 @@
           "_id": "d7sB1Qa1kJMnglqu",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [
               {
                 "key": "system.rules.attack.damage.hpDamageTakenMultiplier",
diff --git a/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json b/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json
index 81b95d8b..a8600966 100644
--- a/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json
@@ -375,21 +375,15 @@
           "_id": "w5VTwlHmUjl8XCQ4",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.advantageSources",
+                "mode": 2,
+                "value": "Attacks made while Hidden",
+                "priority": null
+              }
+            ]
           },
-          "changes": [
-            {
-              "key": "system.advantageSources",
-              "mode": 2,
-              "value": "Attacks made while Hidden",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json b/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json
index 24683a37..c9fbb78a 100644
--- a/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json
+++ b/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json
@@ -346,21 +346,15 @@
           "_id": "pZUEkMkCus4U7h8W",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.evasion",
+                "mode": 5,
+                "value": "@system.evasion / 2",
+                "priority": 10
+              }
+            ]
           },
-          "changes": [
-            {
-              "key": "system.evasion",
-              "mode": 5,
-              "value": "@system.evasion / 2",
-              "priority": 10
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json b/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json
index 01435922..da767edc 100644
--- a/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json
+++ b/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json
@@ -250,23 +250,17 @@
           "name": "Chevalier",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.difficulty",
+                "mode": 2,
+                "value": "2",
+                "priority": null
+              }
+            ]
           },
           "_id": "w8wLcSsTiTU3mS7e",
           "img": "icons/environment/people/cavalry-heavy.webp",
-          "changes": [
-            {
-              "key": "system.difficulty",
-              "mode": 2,
-              "value": "2",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -319,23 +313,17 @@
           "name": "Heavily Armored",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.resistance.physical.reduction",
+                "mode": 2,
+                "value": "3",
+                "priority": null
+              }
+            ]
           },
           "_id": "xZjvrNRRjskY3n3j",
           "img": "icons/equipment/chest/breastplate-cuirass-steel-grey.webp",
-          "changes": [
-            {
-              "key": "system.resistance.physical.reduction",
-              "mode": 2,
-              "value": "3",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json b/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
index 4bcdc15d..f03b6408 100644
--- a/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
+++ b/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
@@ -378,12 +378,6 @@
           "_id": "Xes6ZIE01CCN67KF",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json b/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
index 77d48be3..1d9b30b2 100644
--- a/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
+++ b/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
@@ -402,12 +402,6 @@
           "_id": "zMut1PRphlwE0xOa",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json b/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json
index 9ddfb4f3..b22bbe51 100644
--- a/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json
+++ b/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json
@@ -235,21 +235,15 @@
           "_id": "vwc93gtzFoFZj4XT",
           "img": "icons/magic/defensive/shield-barrier-flaming-diamond-blue.webp",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.resistance.magical.resistance",
+                "mode": 2,
+                "value": "1",
+                "priority": null
+              }
+            ]
           },
-          "changes": [
-            {
-              "key": "system.resistance.magical.resistance",
-              "mode": 2,
-              "value": "1",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -383,12 +377,6 @@
           "_id": "KIyV2eXDmmymXY5y",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "shortRest"
diff --git a/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json b/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json
index 33677263..8bc19d39 100644
--- a/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json
+++ b/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json
@@ -447,12 +447,6 @@
           "_id": "YznseQP43jNrk07h",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "scene"
diff --git a/src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json b/src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json
index c5feed37..edc0ea82 100644
--- a/src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json
+++ b/src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json
@@ -394,12 +394,6 @@
           "_id": "3PY5KIG6d3dr3dty",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "any",
-              "range": "self"
-            },
             "changes": [
               {
                 "key": "system.resistance.physical.resistance",
diff --git a/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json b/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json
index 3e5bacf3..bb5b99fe 100644
--- a/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json
+++ b/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json
@@ -313,21 +313,15 @@
           "_id": "rpkjVdlJYI5dB99B",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.disadvantageSources",
+                "mode": 2,
+                "value": "On your next action roll.",
+                "priority": null
+              }
+            ]
           },
-          "changes": [
-            {
-              "key": "system.disadvantageSources",
-              "mode": 2,
-              "value": "On your next action roll.",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -445,12 +439,6 @@
           "_id": "edEZER9ImWicMwRb",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "scene"
diff --git a/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json b/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json
index 06a18345..5753337e 100644
--- a/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json
+++ b/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json
@@ -446,12 +446,6 @@
           "_id": "Q5eeh0B6qaXFS1Ck",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "shortRest",
diff --git a/src/packs/adversaries/adversary_Pirate_Raiders_5YgEajn0wa4i85kC.json b/src/packs/adversaries/adversary_Pirate_Raiders_5YgEajn0wa4i85kC.json
index 94137c2f..ccd07cf1 100644
--- a/src/packs/adversaries/adversary_Pirate_Raiders_5YgEajn0wa4i85kC.json
+++ b/src/packs/adversaries/adversary_Pirate_Raiders_5YgEajn0wa4i85kC.json
@@ -337,14 +337,8 @@
       "disabled": true,
       "_id": "OU05YZwFQffawtna",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "duration": {
         "startTime": 0,
         "combat": null
diff --git a/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json b/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
index f74da475..3b54337a 100644
--- a/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
+++ b/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
@@ -404,12 +404,6 @@
           "_id": "9UBLk9M87VIUziAQ",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json b/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json
index 39f6a5b9..43af1f43 100644
--- a/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json
+++ b/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json
@@ -411,12 +411,6 @@
           "_id": "xrm5786ckKbMYHjn",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json b/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json
index f0dde9f0..e9cfde91 100644
--- a/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json
+++ b/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json
@@ -235,23 +235,17 @@
           "name": "Opportunist",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.rules.attack.damage.hpDamageMultiplier",
+                "mode": 5,
+                "value": "2",
+                "priority": null
+              }
+            ]
           },
           "_id": "O03vYbyNLO3YPZGo",
           "img": "icons/skills/targeting/crosshair-triple-strike-orange.webp",
-          "changes": [
-            {
-              "key": "system.rules.attack.damage.hpDamageMultiplier",
-              "mode": 5,
-              "value": "2",
-              "priority": null
-            }
-          ],
           "disabled": true,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json b/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json
index 726b06e1..288089a5 100644
--- a/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json
+++ b/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json
@@ -237,21 +237,15 @@
           "_id": "zTepuF1Z5OObQdSi",
           "img": "icons/magic/death/bones-crossed-orange.webp",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.resistance.physical.resistance",
+                "mode": 5,
+                "value": "1",
+                "priority": null
+              }
+            ]
           },
-          "changes": [
-            {
-              "key": "system.resistance.physical.resistance",
-              "mode": 5,
-              "value": "1",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json b/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json
index 5b9cbb65..6acbcf61 100644
--- a/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json
+++ b/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json
@@ -270,23 +270,17 @@
           "name": "Ghost",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.resistance.physical.resistance",
+                "mode": 5,
+                "value": "1",
+                "priority": null
+              }
+            ]
           },
           "_id": "xNkkl7nwKFkiB9Rv",
           "img": "icons/magic/death/undead-ghost-scream-teal.webp",
-          "changes": [
-            {
-              "key": "system.resistance.physical.resistance",
-              "mode": 5,
-              "value": "1",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json b/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json
index 0572e018..73d06ee6 100644
--- a/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json
+++ b/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json
@@ -270,23 +270,17 @@
           "name": "Ghost",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.resistance.physical.resistance",
+                "mode": 5,
+                "value": "1",
+                "priority": null
+              }
+            ]
           },
           "_id": "kZhvwDvfcYQ10reO",
           "img": "icons/magic/death/undead-ghost-scream-teal.webp",
-          "changes": [
-            {
-              "key": "system.resistance.physical.resistance",
-              "mode": 5,
-              "value": "1",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json b/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json
index 85893254..dcb4e57e 100644
--- a/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json
+++ b/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json
@@ -270,23 +270,17 @@
           "name": "Ghost",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.resistance.physical.resistance",
+                "mode": 5,
+                "value": "1",
+                "priority": null
+              }
+            ]
           },
           "_id": "QDXyAMk33kJGe6hU",
           "img": "icons/magic/death/undead-ghost-scream-teal.webp",
-          "changes": [
-            {
-              "key": "system.resistance.physical.resistance",
-              "mode": 5,
-              "value": "1",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Stonewraith_3aAS2Qm3R6cgaYfE.json b/src/packs/adversaries/adversary_Stonewraith_3aAS2Qm3R6cgaYfE.json
index 52869085..45093ea7 100644
--- a/src/packs/adversaries/adversary_Stonewraith_3aAS2Qm3R6cgaYfE.json
+++ b/src/packs/adversaries/adversary_Stonewraith_3aAS2Qm3R6cgaYfE.json
@@ -352,12 +352,6 @@
           "_id": "6UgMuuJ8ZygbCsDh",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary"
diff --git a/src/packs/adversaries/adversary_Swarm_of_Rats_qNgs3AbLyJrY19nt.json b/src/packs/adversaries/adversary_Swarm_of_Rats_qNgs3AbLyJrY19nt.json
index 28d5dabe..49b75790 100644
--- a/src/packs/adversaries/adversary_Swarm_of_Rats_qNgs3AbLyJrY19nt.json
+++ b/src/packs/adversaries/adversary_Swarm_of_Rats_qNgs3AbLyJrY19nt.json
@@ -278,14 +278,8 @@
       "disabled": true,
       "_id": "FOV6AzngiR0PZyuN",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "duration": {
         "startTime": 0,
         "combat": null
diff --git a/src/packs/adversaries/adversary_Sylvan_Soldier_VtFBt9XBE0WrGGxP.json b/src/packs/adversaries/adversary_Sylvan_Soldier_VtFBt9XBE0WrGGxP.json
index f3ce03c3..dfb6fd42 100644
--- a/src/packs/adversaries/adversary_Sylvan_Soldier_VtFBt9XBE0WrGGxP.json
+++ b/src/packs/adversaries/adversary_Sylvan_Soldier_VtFBt9XBE0WrGGxP.json
@@ -489,14 +489,8 @@
           "_id": "xyXPmPIOtqXYF1TJ",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": []
           },
-          "changes": [],
           "disabled": false,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Tangle_Bramble_Swarm_PKSXFuaIHUCoH63A.json b/src/packs/adversaries/adversary_Tangle_Bramble_Swarm_PKSXFuaIHUCoH63A.json
index f8f93cf2..6ad802aa 100644
--- a/src/packs/adversaries/adversary_Tangle_Bramble_Swarm_PKSXFuaIHUCoH63A.json
+++ b/src/packs/adversaries/adversary_Tangle_Bramble_Swarm_PKSXFuaIHUCoH63A.json
@@ -421,14 +421,8 @@
           "_id": "PdkhaTw2j15KJwBf",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": []
           },
-          "changes": [],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -473,14 +467,8 @@
       "disabled": true,
       "_id": "ki4vrzrFcEYtGeJu",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "duration": {
         "startTime": 0,
         "combat": null
diff --git a/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json b/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json
index 97c493a8..23a6048a 100644
--- a/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json
+++ b/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json
@@ -323,12 +323,6 @@
           "_id": "6TZlstmWJPbeoL7i",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json b/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json
index ba3f5c33..4d70cf28 100644
--- a/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json
+++ b/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json
@@ -297,21 +297,15 @@
           "_id": "Fo5bLYlmYGtQFAGg",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.disadvantageSources",
+                "mode": 2,
+                "value": "On attack rolls while you're within Very Close range of the Sentinel",
+                "priority": null
+              }
+            ]
           },
-          "changes": [
-            {
-              "key": "system.disadvantageSources",
-              "mode": 2,
-              "value": "On attack rolls while you're within Very Close range of the Sentinel",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json b/src/packs/adversaries/adversary_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json
index 018d5b58..9ecd43fc 100644
--- a/src/packs/adversaries/adversary_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json
+++ b/src/packs/adversaries/adversary_Vault_Guardian_Turret_c5hGdvY5UnSjlHws.json
@@ -302,21 +302,15 @@
           "_id": "yQ85C0JHRG1pwu8a",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.evasion",
+                "mode": 5,
+                "value": "@system.evasion / 2",
+                "priority": 10
+              }
+            ]
           },
-          "changes": [
-            {
-              "key": "system.evasion",
-              "mode": 5,
-              "value": "@system.evasion / 2",
-              "priority": 10
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
diff --git a/src/packs/adversaries/adversary_Volcanic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json b/src/packs/adversaries/adversary_Volcanic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json
index e360f0c8..9052287b 100644
--- a/src/packs/adversaries/adversary_Volcanic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json
+++ b/src/packs/adversaries/adversary_Volcanic_Dragon__Ashen_Tyrant_pMuXGCSOQaxpi5tb.json
@@ -376,23 +376,17 @@
           "name": "Injured Wings",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.difficulty",
+                "mode": 2,
+                "value": "1",
+                "priority": null
+              }
+            ]
           },
           "_id": "zCi90lgFAaA7yrJG",
           "img": "icons/commodities/biological/wing-green.webp",
-          "changes": [
-            {
-              "key": "system.difficulty",
-              "mode": 2,
-              "value": "1",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -873,12 +867,6 @@
           "_id": "YUjdwrEZ4zn7WR9X",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Volcanic_Dragon__Molten_Scourge_eArAPuB38CNR0ZIM.json b/src/packs/adversaries/adversary_Volcanic_Dragon__Molten_Scourge_eArAPuB38CNR0ZIM.json
index d4babd71..cce2c07e 100644
--- a/src/packs/adversaries/adversary_Volcanic_Dragon__Molten_Scourge_eArAPuB38CNR0ZIM.json
+++ b/src/packs/adversaries/adversary_Volcanic_Dragon__Molten_Scourge_eArAPuB38CNR0ZIM.json
@@ -734,12 +734,6 @@
           "_id": "xmzA6NC9zrulhzQs",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json b/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json
index 82daed6a..2959c66f 100644
--- a/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json
+++ b/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json
@@ -321,23 +321,17 @@
           "name": "Flying",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.difficulty",
+                "mode": 2,
+                "value": "3",
+                "priority": null
+              }
+            ]
           },
           "_id": "8o8yG73ZfrZ3hb5i",
           "img": "icons/commodities/biological/wing-green.webp",
-          "changes": [
-            {
-              "key": "system.difficulty",
-              "mode": 2,
-              "value": "3",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -390,23 +384,17 @@
           "name": "Obsidian Scales",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.resistance.physical.resistance",
+                "mode": 5,
+                "value": "1",
+                "priority": null
+              }
+            ]
           },
           "_id": "Jr9SlkRnkroulYhy",
           "img": "icons/commodities/leather/scale-chitin-grey.webp",
-          "changes": [
-            {
-              "key": "system.resistance.physical.resistance",
-              "mode": 5,
-              "value": "1",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -551,12 +539,6 @@
           "_id": "qtIaAZDW8QsjILgb",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": []
           },
           "disabled": false,
diff --git a/src/packs/adversaries/adversary_Weaponmaster_ZNbQ2jg35LG4t9eH.json b/src/packs/adversaries/adversary_Weaponmaster_ZNbQ2jg35LG4t9eH.json
index 8eaf56f9..f06a2c72 100644
--- a/src/packs/adversaries/adversary_Weaponmaster_ZNbQ2jg35LG4t9eH.json
+++ b/src/packs/adversaries/adversary_Weaponmaster_ZNbQ2jg35LG4t9eH.json
@@ -319,12 +319,6 @@
           "_id": "j2jYmYbtWXvq32yX",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json b/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json
index 9d7f66d0..30db7ff7 100644
--- a/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json
+++ b/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json
@@ -362,12 +362,6 @@
           "_id": "k8LzBWRZo6VPqvpH",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/adversaries/adversary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json b/src/packs/adversaries/adversary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json
index 6c55ba15..f5324abd 100644
--- a/src/packs/adversaries/adversary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json
+++ b/src/packs/adversaries/adversary_Young_Ice_Dragon_UGPiPLJsPvMTSKEF.json
@@ -500,12 +500,6 @@
           "_id": "g9bUvmw3jet6T99e",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": []
           },
           "disabled": false,
@@ -634,12 +628,6 @@
           "_id": "40cFHuNdEvbUZ9rs",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
@@ -768,12 +756,6 @@
           "_id": "1JlRxa07i8T1a9x6",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [
               {
                 "key": "system.disadvantageSources",
diff --git a/src/packs/adversaries/adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json b/src/packs/adversaries/adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json
index 2c3495ff..322b23af 100644
--- a/src/packs/adversaries/adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json
+++ b/src/packs/adversaries/adversary_Zombie_Legion_YhJrP7rTBiRdX5Fp.json
@@ -259,23 +259,17 @@
           "name": "Unyielding",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.resistance.physical.resistance",
+                "mode": 5,
+                "value": "1",
+                "priority": null
+              }
+            ]
           },
           "_id": "D1lCoe9WVr6vYuD9",
           "img": "icons/magic/defensive/shield-barrier-blue.webp",
-          "changes": [
-            {
-              "key": "system.resistance.physical.resistance",
-              "mode": 5,
-              "value": "1",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -434,14 +428,8 @@
       "disabled": true,
       "_id": "9D6SteWlhbfMPhvt",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "duration": {
         "startTime": 0,
         "combat": null
diff --git a/src/packs/adversaries/adversary_Zombie_Pack_Nf0v43rtflV56V2T.json b/src/packs/adversaries/adversary_Zombie_Pack_Nf0v43rtflV56V2T.json
index f418758a..0b6d0177 100644
--- a/src/packs/adversaries/adversary_Zombie_Pack_Nf0v43rtflV56V2T.json
+++ b/src/packs/adversaries/adversary_Zombie_Pack_Nf0v43rtflV56V2T.json
@@ -309,14 +309,8 @@
       "disabled": true,
       "_id": "aWWZTlNS9zYoUay7",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "duration": {
         "startTime": 0,
         "combat": null
diff --git a/src/packs/ancestries/feature_Celestial_Trance_TfolXWFG2W2hx6sK.json b/src/packs/ancestries/feature_Celestial_Trance_TfolXWFG2W2hx6sK.json
index 7cbe132e..b1022f1f 100644
--- a/src/packs/ancestries/feature_Celestial_Trance_TfolXWFG2W2hx6sK.json
+++ b/src/packs/ancestries/feature_Celestial_Trance_TfolXWFG2W2hx6sK.json
@@ -24,27 +24,21 @@
       "_id": "LqQvZJJLNMnFkt1D",
       "img": "icons/magic/perception/orb-crystal-ball-scrying-blue.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.rest.shortRest.shortMoves",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.rest.longRest.longMoves",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.rest.shortRest.shortMoves",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.rest.longRest.longMoves",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/ancestries/feature_Dread_Visage_i92lYjDhVB0LyPid.json b/src/packs/ancestries/feature_Dread_Visage_i92lYjDhVB0LyPid.json
index bbe35d19..0b38aebc 100644
--- a/src/packs/ancestries/feature_Dread_Visage_i92lYjDhVB0LyPid.json
+++ b/src/packs/ancestries/feature_Dread_Visage_i92lYjDhVB0LyPid.json
@@ -24,21 +24,15 @@
       "_id": "2Gd6iHQX521aAZqC",
       "img": "icons/magic/control/fear-fright-monster-red.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Dread Visage: Rolls to intimidate hostile creatures",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Dread Visage: Rolls to intimidate hostile creatures",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/ancestries/feature_Efficient_2xlqKOkDxWHbuj4t.json b/src/packs/ancestries/feature_Efficient_2xlqKOkDxWHbuj4t.json
index 81f19a2f..fad97bdf 100644
--- a/src/packs/ancestries/feature_Efficient_2xlqKOkDxWHbuj4t.json
+++ b/src/packs/ancestries/feature_Efficient_2xlqKOkDxWHbuj4t.json
@@ -24,27 +24,21 @@
       "_id": "EEryWN2nE33ppGHi",
       "img": "icons/magic/time/clock-stopwatch-white-blue.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.rest.shortRest.longMoves",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.rest.shortRest.shortMoves",
+            "mode": 2,
+            "value": "-1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.rest.shortRest.longMoves",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.rest.shortRest.shortMoves",
-          "mode": 2,
-          "value": "-1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/ancestries/feature_Endurance_tXWEMdLXafUSZTbK.json b/src/packs/ancestries/feature_Endurance_tXWEMdLXafUSZTbK.json
index 3e64fece..9d4710ab 100644
--- a/src/packs/ancestries/feature_Endurance_tXWEMdLXafUSZTbK.json
+++ b/src/packs/ancestries/feature_Endurance_tXWEMdLXafUSZTbK.json
@@ -24,21 +24,15 @@
       "_id": "db8W2Q0Qty84XV0x",
       "img": "icons/magic/control/buff-strength-muscle-damage.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.resources.hitPoints.max",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.resources.hitPoints.max",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/ancestries/feature_High_Stamina_HMXNJZ7ynzajR2KT.json b/src/packs/ancestries/feature_High_Stamina_HMXNJZ7ynzajR2KT.json
index 769bec96..b93562e1 100644
--- a/src/packs/ancestries/feature_High_Stamina_HMXNJZ7ynzajR2KT.json
+++ b/src/packs/ancestries/feature_High_Stamina_HMXNJZ7ynzajR2KT.json
@@ -24,21 +24,15 @@
       "_id": "Xl3TsKUJcl6vi1ly",
       "img": "icons/magic/control/buff-flight-wings-runes-purple-orange.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.resources.stress.max",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.resources.stress.max",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/ancestries/feature_Natural_Climber_soQvPL0MrTLLcc31.json b/src/packs/ancestries/feature_Natural_Climber_soQvPL0MrTLLcc31.json
index fd02b72f..8b33dc70 100644
--- a/src/packs/ancestries/feature_Natural_Climber_soQvPL0MrTLLcc31.json
+++ b/src/packs/ancestries/feature_Natural_Climber_soQvPL0MrTLLcc31.json
@@ -24,21 +24,15 @@
       "_id": "HQeQH9gUfrjlWWcg",
       "img": "icons/magic/nature/root-vine-barrier-wall-brown.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Agility Rolls that involve balancing and climbing",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Agility Rolls that involve balancing and climbing",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/ancestries/feature_Nimble_3lNqft3LmOlEIEkw.json b/src/packs/ancestries/feature_Nimble_3lNqft3LmOlEIEkw.json
index d56ab3ac..07d894e3 100644
--- a/src/packs/ancestries/feature_Nimble_3lNqft3LmOlEIEkw.json
+++ b/src/packs/ancestries/feature_Nimble_3lNqft3LmOlEIEkw.json
@@ -24,21 +24,15 @@
       "_id": "zaxVYqKzUYDJ3SDq",
       "img": "icons/skills/movement/arrows-up-trio-red.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.evasion",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.evasion",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/ancestries/feature_Retract_UFR67BUOhNGLFyg9.json b/src/packs/ancestries/feature_Retract_UFR67BUOhNGLFyg9.json
index eb9696b2..89cf8b9e 100644
--- a/src/packs/ancestries/feature_Retract_UFR67BUOhNGLFyg9.json
+++ b/src/packs/ancestries/feature_Retract_UFR67BUOhNGLFyg9.json
@@ -63,12 +63,6 @@
       "_id": "3V4FPoyjJUnFP9WS",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.resistance.physical.resistance",
diff --git a/src/packs/ancestries/feature_Retracting_Claws_Zj69cAeb3NjIa8Hn.json b/src/packs/ancestries/feature_Retracting_Claws_Zj69cAeb3NjIa8Hn.json
index b9b000f4..4f8a7158 100644
--- a/src/packs/ancestries/feature_Retracting_Claws_Zj69cAeb3NjIa8Hn.json
+++ b/src/packs/ancestries/feature_Retracting_Claws_Zj69cAeb3NjIa8Hn.json
@@ -78,12 +78,6 @@
       "_id": "pO76svFkmWmZ6LjC",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
diff --git a/src/packs/ancestries/feature_Scales_u8ZhV962rNmUlzkp.json b/src/packs/ancestries/feature_Scales_u8ZhV962rNmUlzkp.json
index fbf63533..6bf571ab 100644
--- a/src/packs/ancestries/feature_Scales_u8ZhV962rNmUlzkp.json
+++ b/src/packs/ancestries/feature_Scales_u8ZhV962rNmUlzkp.json
@@ -24,21 +24,15 @@
       "_id": "b6Pkwwk7pgBeeUTe",
       "img": "icons/commodities/leather/scales-brown.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.rules.damageReduction.stressDamageReduction.severe.cost",
+            "mode": 5,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.rules.damageReduction.stressDamageReduction.severe.cost",
-          "mode": 5,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/ancestries/feature_Shell_A6a87OWA3tx16g9V.json b/src/packs/ancestries/feature_Shell_A6a87OWA3tx16g9V.json
index f07fff69..4dbfbc34 100644
--- a/src/packs/ancestries/feature_Shell_A6a87OWA3tx16g9V.json
+++ b/src/packs/ancestries/feature_Shell_A6a87OWA3tx16g9V.json
@@ -24,27 +24,21 @@
       "_id": "41uiZKXzSSomf9YD",
       "img": "icons/creatures/reptiles/turtle-shell-glowing-green.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.damageThresholds.major",
+            "mode": 2,
+            "value": "@prof",
+            "priority": 21
+          },
+          {
+            "key": "system.damageThresholds.severe",
+            "mode": 2,
+            "value": "@prof",
+            "priority": 21
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.damageThresholds.major",
-          "mode": 2,
-          "value": "@prof",
-          "priority": 21
-        },
-        {
-          "key": "system.damageThresholds.severe",
-          "mode": 2,
-          "value": "@prof",
-          "priority": 21
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/ancestries/feature_Thick_Skin_S0Ww7pYOSREt8qKg.json b/src/packs/ancestries/feature_Thick_Skin_S0Ww7pYOSREt8qKg.json
index 7bc10752..d9fc92de 100644
--- a/src/packs/ancestries/feature_Thick_Skin_S0Ww7pYOSREt8qKg.json
+++ b/src/packs/ancestries/feature_Thick_Skin_S0Ww7pYOSREt8qKg.json
@@ -24,21 +24,15 @@
       "_id": "4Lc40mNnRInTKMC5",
       "img": "icons/magic/defensive/shield-barrier-glowing-triangle-orange.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.rules.damageReduction.stressDamageReduction.minor.cost",
+            "mode": 5,
+            "value": "2",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.rules.damageReduction.stressDamageReduction.minor.cost",
-          "mode": 5,
-          "value": "2",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/ancestries/feature_Tusks_YhxD1ujZpftPu19w.json b/src/packs/ancestries/feature_Tusks_YhxD1ujZpftPu19w.json
index 6038f2c6..3581bb7f 100644
--- a/src/packs/ancestries/feature_Tusks_YhxD1ujZpftPu19w.json
+++ b/src/packs/ancestries/feature_Tusks_YhxD1ujZpftPu19w.json
@@ -87,27 +87,21 @@
       "_id": "klEyAxQa5YHXVnrl",
       "img": "icons/creatures/abilities/fang-tooth-blood-red.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.physical.dice",
+            "mode": 2,
+            "value": "1d6",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.magical.dice",
+            "mode": 2,
+            "value": "1d6",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.physical.dice",
-          "mode": 2,
-          "value": "1d6",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.magical.dice",
-          "mode": 2,
-          "value": "1d6",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/ancestries/feature_Wings_WquAjoOcso8lwySW.json b/src/packs/ancestries/feature_Wings_WquAjoOcso8lwySW.json
index 9941432e..0db94fb2 100644
--- a/src/packs/ancestries/feature_Wings_WquAjoOcso8lwySW.json
+++ b/src/packs/ancestries/feature_Wings_WquAjoOcso8lwySW.json
@@ -54,21 +54,15 @@
       "_id": "zD3xVdwkEQi2ivOn",
       "img": "icons/creatures/abilities/wing-batlike-white-blue.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.evasion",
+            "mode": 2,
+            "value": "2",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.evasion",
-          "mode": 2,
-          "value": "2",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/beastforms/feature_Rampage_8upqfcZvi7b5hRLE.json b/src/packs/beastforms/feature_Rampage_8upqfcZvi7b5hRLE.json
index ecc46058..03c3b2c7 100644
--- a/src/packs/beastforms/feature_Rampage_8upqfcZvi7b5hRLE.json
+++ b/src/packs/beastforms/feature_Rampage_8upqfcZvi7b5hRLE.json
@@ -59,21 +59,15 @@
       "_id": "A7l4JEBC1FFQajsN",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.proficiency",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.proficiency",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/classes/feature_Combat_Training_eoSmuAJmgHUyULtp.json b/src/packs/classes/feature_Combat_Training_eoSmuAJmgHUyULtp.json
index d28f360c..8b4ad82e 100644
--- a/src/packs/classes/feature_Combat_Training_eoSmuAJmgHUyULtp.json
+++ b/src/packs/classes/feature_Combat_Training_eoSmuAJmgHUyULtp.json
@@ -21,29 +21,23 @@
       "name": "Combat Training",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.physical.bonus",
+            "mode": 2,
+            "value": "@system.levelData.level.current",
+            "priority": null
+          },
+          {
+            "key": "system.rules.burden.ignore",
+            "mode": 5,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
       "_id": "Y7sTM0tw0VpgU6pC",
       "img": "icons/skills/melee/spear-tips-quintuple-orange.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.damage.physical.bonus",
-          "mode": 2,
-          "value": "@system.levelData.level.current",
-          "priority": null
-        },
-        {
-          "key": "system.rules.burden.ignore",
-          "mode": 5,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/classes/feature_Make_a_Scene_N9E5skDDK2VgvohR.json b/src/packs/classes/feature_Make_a_Scene_N9E5skDDK2VgvohR.json
index 5f28c048..3ae763da 100644
--- a/src/packs/classes/feature_Make_a_Scene_N9E5skDDK2VgvohR.json
+++ b/src/packs/classes/feature_Make_a_Scene_N9E5skDDK2VgvohR.json
@@ -59,12 +59,6 @@
       "_id": "8G9zDv1gac6dEHmS",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.difficulty",
diff --git a/src/packs/classes/feature_No_Mercy_njj2C3tMDeCHHOoh.json b/src/packs/classes/feature_No_Mercy_njj2C3tMDeCHHOoh.json
index 5b770e5d..184085bf 100644
--- a/src/packs/classes/feature_No_Mercy_njj2C3tMDeCHHOoh.json
+++ b/src/packs/classes/feature_No_Mercy_njj2C3tMDeCHHOoh.json
@@ -62,12 +62,6 @@
       "_id": "XK4cCcz9sRGDJr0q",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.bonuses.roll.attack.bonus",
diff --git a/src/packs/classes/feature_Rally_PydiMnNCKpd44SGS.json b/src/packs/classes/feature_Rally_PydiMnNCKpd44SGS.json
index e2a0b5bb..e4f84a9f 100644
--- a/src/packs/classes/feature_Rally_PydiMnNCKpd44SGS.json
+++ b/src/packs/classes/feature_Rally_PydiMnNCKpd44SGS.json
@@ -52,21 +52,15 @@
       "_id": "FrSJH9vzDHkFGYQL",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.rally",
+            "mode": 2,
+            "value": "6 + min((floor(@system.levelData.level.current / 5)*2), 2)",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.rally",
-          "mode": 2,
-          "value": "6 + min((floor(@system.levelData.level.current / 5)*2), 2)",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/classes/feature_Ranger_s_Focus_ncLx2P8BOUtrAD38.json b/src/packs/classes/feature_Ranger_s_Focus_ncLx2P8BOUtrAD38.json
index b744c4c5..b82954a5 100644
--- a/src/packs/classes/feature_Ranger_s_Focus_ncLx2P8BOUtrAD38.json
+++ b/src/packs/classes/feature_Ranger_s_Focus_ncLx2P8BOUtrAD38.json
@@ -60,14 +60,8 @@
       "_id": "SXi2dQWqpwY9fap4",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/classes/feature_Rogue_s_Dodge_hVaaPIjxoextIgSL.json b/src/packs/classes/feature_Rogue_s_Dodge_hVaaPIjxoextIgSL.json
index b886b079..4a7e0cac 100644
--- a/src/packs/classes/feature_Rogue_s_Dodge_hVaaPIjxoextIgSL.json
+++ b/src/packs/classes/feature_Rogue_s_Dodge_hVaaPIjxoextIgSL.json
@@ -60,12 +60,6 @@
       "_id": "hhVjBro2osGDTT5g",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "any",
-          "range": "self"
-        },
         "changes": [
           {
             "key": "system.evasion",
diff --git a/src/packs/classes/feature_Sneak_Attack_5QqpEwmwkPfZHpMW.json b/src/packs/classes/feature_Sneak_Attack_5QqpEwmwkPfZHpMW.json
index 505a96cb..4b5ce9bd 100644
--- a/src/packs/classes/feature_Sneak_Attack_5QqpEwmwkPfZHpMW.json
+++ b/src/packs/classes/feature_Sneak_Attack_5QqpEwmwkPfZHpMW.json
@@ -25,27 +25,21 @@
       "_id": "380jFzw756qSy5ae",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.physical.dice",
+            "mode": 2,
+            "value": "@tierd6",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.magical.dice",
+            "mode": 2,
+            "value": "@tierd6",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.physical.dice",
-          "mode": 2,
-          "value": "@tierd6",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.magical.dice",
-          "mode": 2,
-          "value": "@tierd6",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/classes/feature_Unstoppable_PnD2UCgzIlwX6cY3.json b/src/packs/classes/feature_Unstoppable_PnD2UCgzIlwX6cY3.json
index 9c9ecf61..56362824 100644
--- a/src/packs/classes/feature_Unstoppable_PnD2UCgzIlwX6cY3.json
+++ b/src/packs/classes/feature_Unstoppable_PnD2UCgzIlwX6cY3.json
@@ -62,45 +62,39 @@
       "_id": "xzQtFSuDS48kUdAZ",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.physical.bonus",
+            "mode": 2,
+            "value": "ORIGIN.@item.resource.value",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.magical.bonus",
+            "mode": 2,
+            "value": "ORIGIN.@item.resource.value",
+            "priority": null
+          },
+          {
+            "key": "system.rules.damageReduction.reduceSeverity.physical",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          },
+          {
+            "key": "system.rules.conditionImmunities.vulnerable",
+            "mode": 5,
+            "value": "1",
+            "priority": null
+          },
+          {
+            "key": "system.rules.conditionImmunities.restrained",
+            "mode": 5,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.physical.bonus",
-          "mode": 2,
-          "value": "ORIGIN.@item.resource.value",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.magical.bonus",
-          "mode": 2,
-          "value": "ORIGIN.@item.resource.value",
-          "priority": null
-        },
-        {
-          "key": "system.rules.damageReduction.reduceSeverity.physical",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        },
-        {
-          "key": "system.rules.conditionImmunities.vulnerable",
-          "mode": 5,
-          "value": "1",
-          "priority": null
-        },
-        {
-          "key": "system.rules.conditionImmunities.restrained",
-          "mode": 5,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/communities/feature_Lightfoot_TQ1AIQjndC4mYmmU.json b/src/packs/communities/feature_Lightfoot_TQ1AIQjndC4mYmmU.json
index a18b4689..91c771fc 100644
--- a/src/packs/communities/feature_Lightfoot_TQ1AIQjndC4mYmmU.json
+++ b/src/packs/communities/feature_Lightfoot_TQ1AIQjndC4mYmmU.json
@@ -24,21 +24,15 @@
       "_id": "4my9X5XC3uwDSx7B",
       "img": "icons/magic/control/debuff-energy-snare-blue.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Move without being heard.",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Move without being heard.",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/communities/feature_Low_Light_Living_aMla3xQuCHEwORGD.json b/src/packs/communities/feature_Low_Light_Living_aMla3xQuCHEwORGD.json
index c95d9132..b02ef4d6 100644
--- a/src/packs/communities/feature_Low_Light_Living_aMla3xQuCHEwORGD.json
+++ b/src/packs/communities/feature_Low_Light_Living_aMla3xQuCHEwORGD.json
@@ -24,12 +24,6 @@
       "_id": "pCp32u7UwqxCI4WW",
       "img": "icons/environment/settlement/temple-night.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.advantageSources",
diff --git a/src/packs/communities/feature_Privilege_C7NR6qRatawZusmg.json b/src/packs/communities/feature_Privilege_C7NR6qRatawZusmg.json
index 171f4d50..caae7322 100644
--- a/src/packs/communities/feature_Privilege_C7NR6qRatawZusmg.json
+++ b/src/packs/communities/feature_Privilege_C7NR6qRatawZusmg.json
@@ -24,33 +24,27 @@
       "_id": "xgtjykfgvg142urA",
       "img": "icons/commodities/currency/coins-plain-stack-gold.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Consort with nobles",
+            "priority": null
+          },
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Negotiate prices",
+            "priority": null
+          },
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Leverage your reputation to get what you want",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Consort with nobles",
-          "priority": null
-        },
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Negotiate prices",
-          "priority": null
-        },
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Leverage your reputation to get what you want",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/communities/feature_Scoundrel_ZmEuBdL0JrvuA8le.json b/src/packs/communities/feature_Scoundrel_ZmEuBdL0JrvuA8le.json
index d91a7638..55605a00 100644
--- a/src/packs/communities/feature_Scoundrel_ZmEuBdL0JrvuA8le.json
+++ b/src/packs/communities/feature_Scoundrel_ZmEuBdL0JrvuA8le.json
@@ -24,33 +24,27 @@
       "_id": "snkYmZ22Q8HHLY9M",
       "img": "icons/equipment/head/hood-cloth-teal-gold.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Negotiate with criminals",
+            "priority": null
+          },
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Detect lies",
+            "priority": null
+          },
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Find a safe place to hide",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Negotiate with criminals",
-          "priority": null
-        },
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Detect lies",
-          "priority": null
-        },
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Find a safe place to hide",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/communities/feature_Steady_DYmmr5CknLtHnwuj.json b/src/packs/communities/feature_Steady_DYmmr5CknLtHnwuj.json
index 497854ac..ee9c683c 100644
--- a/src/packs/communities/feature_Steady_DYmmr5CknLtHnwuj.json
+++ b/src/packs/communities/feature_Steady_DYmmr5CknLtHnwuj.json
@@ -24,33 +24,27 @@
       "_id": "QDf9LD8Mhd0Cw0CB",
       "img": "icons/equipment/feet/boots-collared-simple-leather.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Traverse dangerous cliffs and ledges",
+            "priority": null
+          },
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Navigate harsh environment",
+            "priority": null
+          },
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Use your survival knowledge",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Traverse dangerous cliffs and ledges",
-          "priority": null
-        },
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Navigate harsh environment",
-          "priority": null
-        },
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Use your survival knowledge",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/communities/feature_Well_Read_JBZJmywisJg5X3tH.json b/src/packs/communities/feature_Well_Read_JBZJmywisJg5X3tH.json
index dd40b33b..3ce8fd16 100644
--- a/src/packs/communities/feature_Well_Read_JBZJmywisJg5X3tH.json
+++ b/src/packs/communities/feature_Well_Read_JBZJmywisJg5X3tH.json
@@ -24,21 +24,15 @@
       "_id": "RwhxYOAAKKlYZiz0",
       "img": "icons/sundries/books/book-open-brown.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "History, culture, or politics of a prominent person or place",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "History, culture, or politics of a prominent person or place",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Arcana_Touched_5PvMQKCjrgSxzstn.json b/src/packs/domains/domainCard_Arcana_Touched_5PvMQKCjrgSxzstn.json
index 556d5074..70e2d23c 100644
--- a/src/packs/domains/domainCard_Arcana_Touched_5PvMQKCjrgSxzstn.json
+++ b/src/packs/domains/domainCard_Arcana_Touched_5PvMQKCjrgSxzstn.json
@@ -65,23 +65,17 @@
       "name": "Arcana-Touched",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.spellcast.bonus",
+            "mode": 2,
+            "value": "+1",
+            "priority": null
+          }
+        ]
       },
       "_id": "vTW98Xha0HP8ITrs",
       "img": "systems/daggerheart/assets/icons/domains/domain-card/arcana.png",
-      "changes": [
-        {
-          "key": "system.bonuses.roll.spellcast.bonus",
-          "mode": 2,
-          "value": "+1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Battle_Cry_Ef1JsUG50LIoKx2F.json b/src/packs/domains/domainCard_Battle_Cry_Ef1JsUG50LIoKx2F.json
index 1fde286d..000437b7 100644
--- a/src/packs/domains/domainCard_Battle_Cry_Ef1JsUG50LIoKx2F.json
+++ b/src/packs/domains/domainCard_Battle_Cry_Ef1JsUG50LIoKx2F.json
@@ -127,12 +127,6 @@
       "_id": "s7ma4TNgAvt0ZgEW",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.advantageSources",
diff --git a/src/packs/domains/domainCard_Blade_Touched_Gb5bqpFSBiuBxUix.json b/src/packs/domains/domainCard_Blade_Touched_Gb5bqpFSBiuBxUix.json
index ebb95570..8cc9834e 100644
--- a/src/packs/domains/domainCard_Blade_Touched_Gb5bqpFSBiuBxUix.json
+++ b/src/packs/domains/domainCard_Blade_Touched_Gb5bqpFSBiuBxUix.json
@@ -24,29 +24,23 @@
       "name": "Blade-Touched",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.attack.bonus",
+            "mode": 2,
+            "value": "2",
+            "priority": null
+          },
+          {
+            "key": "system.damageThresholds.severe",
+            "mode": 2,
+            "value": "4",
+            "priority": null
+          }
+        ]
       },
       "_id": "fBpLkCWGsB8MbymR",
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.roll.attack.bonus",
-          "mode": 2,
-          "value": "2",
-          "priority": null
-        },
-        {
-          "key": "system.damageThresholds.severe",
-          "mode": 2,
-          "value": "4",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Body_Basher_aQz8jKkCd8M9aKMA.json b/src/packs/domains/domainCard_Body_Basher_aQz8jKkCd8M9aKMA.json
index f0d4c988..7c5a7ef1 100644
--- a/src/packs/domains/domainCard_Body_Basher_aQz8jKkCd8M9aKMA.json
+++ b/src/packs/domains/domainCard_Body_Basher_aQz8jKkCd8M9aKMA.json
@@ -31,22 +31,22 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        }
-      },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "@system.traits.strength.value",
-          "priority": 21
         },
-        {
-          "key": "system.bonuses.damage.secondaryWeapon.bonus",
-          "mode": 2,
-          "value": "@system.traits.strength.value",
-          "priority": 21
-        }
-      ],
+        "changes": [
+          {
+            "key": "system.bonuses.damage.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "@system.traits.strength.value",
+            "priority": 21
+          },
+          {
+            "key": "system.bonuses.damage.secondaryWeapon.bonus",
+            "mode": 2,
+            "value": "@system.traits.strength.value",
+            "priority": 21
+          }
+        ]
+      },
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Bold_Presence_tdsL00yTSLNgZWs6.json b/src/packs/domains/domainCard_Bold_Presence_tdsL00yTSLNgZWs6.json
index aaf070fc..95b73ff5 100644
--- a/src/packs/domains/domainCard_Bold_Presence_tdsL00yTSLNgZWs6.json
+++ b/src/packs/domains/domainCard_Bold_Presence_tdsL00yTSLNgZWs6.json
@@ -85,21 +85,15 @@
       "_id": "2XEYhuAcRGTtqvED",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.traits.presence.value",
+            "mode": 2,
+            "value": "@system.traits.strength.value",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.traits.presence.value",
-          "mode": 2,
-          "value": "@system.traits.strength.value",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Bolt_Beacon_BNevJyGk7hmN7XOY.json b/src/packs/domains/domainCard_Bolt_Beacon_BNevJyGk7hmN7XOY.json
index df7d36a4..ce01f6b0 100644
--- a/src/packs/domains/domainCard_Bolt_Beacon_BNevJyGk7hmN7XOY.json
+++ b/src/packs/domains/domainCard_Bolt_Beacon_BNevJyGk7hmN7XOY.json
@@ -114,12 +114,6 @@
       "_id": "veZpnhnF8NRRhKG4",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
diff --git a/src/packs/domains/domainCard_Bone_Touched_ON5bvnoQBy0SYc9Y.json b/src/packs/domains/domainCard_Bone_Touched_ON5bvnoQBy0SYc9Y.json
index 8880bb07..35f8a4d0 100644
--- a/src/packs/domains/domainCard_Bone_Touched_ON5bvnoQBy0SYc9Y.json
+++ b/src/packs/domains/domainCard_Bone_Touched_ON5bvnoQBy0SYc9Y.json
@@ -57,23 +57,17 @@
       "name": "Bone Touched",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.traits.agility.value",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
       "_id": "P6hYkkI64FqIcMoP",
       "img": "icons/magic/death/bones-crossed-orange.webp",
-      "changes": [
-        {
-          "key": "system.traits.agility.value",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json b/src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json
index fa247c89..e218e771 100644
--- a/src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json
+++ b/src/packs/domains/domainCard_Book_of_Ava_YtZzYBtR0yLPPA93.json
@@ -255,12 +255,6 @@
       "_id": "ptYT10JZ2WJHvFMd",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "type": "armor",
diff --git a/src/packs/domains/domainCard_Book_of_Illiat_df4iRqQzRntrF6Qw.json b/src/packs/domains/domainCard_Book_of_Illiat_df4iRqQzRntrF6Qw.json
index b34fa000..e7b4dd8b 100644
--- a/src/packs/domains/domainCard_Book_of_Illiat_df4iRqQzRntrF6Qw.json
+++ b/src/packs/domains/domainCard_Book_of_Illiat_df4iRqQzRntrF6Qw.json
@@ -172,12 +172,6 @@
       "_id": "zAEaETYSOE2fmcyB",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "shortRest"
@@ -218,12 +212,6 @@
       "_id": "gfZTHSgwYSDKsePW",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary",
diff --git a/src/packs/domains/domainCard_Book_of_Norai_WtwSWXTRZa7QVvmo.json b/src/packs/domains/domainCard_Book_of_Norai_WtwSWXTRZa7QVvmo.json
index 78028bab..31d869be 100644
--- a/src/packs/domains/domainCard_Book_of_Norai_WtwSWXTRZa7QVvmo.json
+++ b/src/packs/domains/domainCard_Book_of_Norai_WtwSWXTRZa7QVvmo.json
@@ -243,12 +243,6 @@
       "_id": "iPnT02apql16Zhjf",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
diff --git a/src/packs/domains/domainCard_Book_of_Ronin_SZMNR3uGNinJcN4N.json b/src/packs/domains/domainCard_Book_of_Ronin_SZMNR3uGNinJcN4N.json
index 88bb759d..ad01a99a 100644
--- a/src/packs/domains/domainCard_Book_of_Ronin_SZMNR3uGNinJcN4N.json
+++ b/src/packs/domains/domainCard_Book_of_Ronin_SZMNR3uGNinJcN4N.json
@@ -131,14 +131,8 @@
       "_id": "ntQfpTcXyEL76vCK",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -167,14 +161,8 @@
       "_id": "y44r3c91m06WKSiq",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Book_of_Sitil_eq8VNqYMRHhF9xw9.json b/src/packs/domains/domainCard_Book_of_Sitil_eq8VNqYMRHhF9xw9.json
index 16b7a63b..d3fe6b1a 100644
--- a/src/packs/domains/domainCard_Book_of_Sitil_eq8VNqYMRHhF9xw9.json
+++ b/src/packs/domains/domainCard_Book_of_Sitil_eq8VNqYMRHhF9xw9.json
@@ -136,14 +136,8 @@
       "_id": "klUaU5KeQCu7KCBI",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -172,14 +166,8 @@
       "_id": "wnrHSvvB6pydTVcC",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Book_of_Vyola_VOIgm2j2Ijszwc5m.json b/src/packs/domains/domainCard_Book_of_Vyola_VOIgm2j2Ijszwc5m.json
index 522a8f7c..e36936f5 100644
--- a/src/packs/domains/domainCard_Book_of_Vyola_VOIgm2j2Ijszwc5m.json
+++ b/src/packs/domains/domainCard_Book_of_Vyola_VOIgm2j2Ijszwc5m.json
@@ -109,14 +109,8 @@
       "_id": "6PPapwuwgKy23oHg",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Book_of_Yarrow_J1ovx2FpNDvPq1o6.json b/src/packs/domains/domainCard_Book_of_Yarrow_J1ovx2FpNDvPq1o6.json
index 45fbc77f..4bcdc349 100644
--- a/src/packs/domains/domainCard_Book_of_Yarrow_J1ovx2FpNDvPq1o6.json
+++ b/src/packs/domains/domainCard_Book_of_Yarrow_J1ovx2FpNDvPq1o6.json
@@ -118,12 +118,6 @@
       "_id": "HWJYhSegVLeAa3dE",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.resistance.magical.immunity",
diff --git a/src/packs/domains/domainCard_Brace_QXs4vssSqNGQu5b8.json b/src/packs/domains/domainCard_Brace_QXs4vssSqNGQu5b8.json
index bc2e59e5..23b15eba 100644
--- a/src/packs/domains/domainCard_Brace_QXs4vssSqNGQu5b8.json
+++ b/src/packs/domains/domainCard_Brace_QXs4vssSqNGQu5b8.json
@@ -23,23 +23,17 @@
       "name": "Brace",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.rules.damageReduction.maxArmorMarked.stressExtra",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
       "_id": "xSjqLOHfi5lImDHS",
       "img": "icons/magic/defensive/shield-barrier-blue.webp",
-      "changes": [
-        {
-          "key": "system.rules.damageReduction.maxArmorMarked.stressExtra",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Breaking_Blow_8UANBgSdhMZ0sqfO.json b/src/packs/domains/domainCard_Breaking_Blow_8UANBgSdhMZ0sqfO.json
index 24b3d661..1e11b8a9 100644
--- a/src/packs/domains/domainCard_Breaking_Blow_8UANBgSdhMZ0sqfO.json
+++ b/src/packs/domains/domainCard_Breaking_Blow_8UANBgSdhMZ0sqfO.json
@@ -65,14 +65,8 @@
       "_id": "ETIeXRAib3DFBHpX",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Chokehold_R5GYUalYXLLFRlNl.json b/src/packs/domains/domainCard_Chokehold_R5GYUalYXLLFRlNl.json
index 73424902..b9d576e3 100644
--- a/src/packs/domains/domainCard_Chokehold_R5GYUalYXLLFRlNl.json
+++ b/src/packs/domains/domainCard_Chokehold_R5GYUalYXLLFRlNl.json
@@ -96,14 +96,8 @@
       "_id": "yzGem7IfViJdAv1H",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Cinder_Grasp_5EP2Lgf7ojfrc0Is.json b/src/packs/domains/domainCard_Cinder_Grasp_5EP2Lgf7ojfrc0Is.json
index e3df986e..384e4834 100644
--- a/src/packs/domains/domainCard_Cinder_Grasp_5EP2Lgf7ojfrc0Is.json
+++ b/src/packs/domains/domainCard_Cinder_Grasp_5EP2Lgf7ojfrc0Is.json
@@ -162,12 +162,6 @@
       "_id": "HNKkaWi507whJuYN",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
diff --git a/src/packs/domains/domainCard_Cloaking_Blast_Zhw7PtK8nMPlsOqD.json b/src/packs/domains/domainCard_Cloaking_Blast_Zhw7PtK8nMPlsOqD.json
index a2a06889..143e7e17 100644
--- a/src/packs/domains/domainCard_Cloaking_Blast_Zhw7PtK8nMPlsOqD.json
+++ b/src/packs/domains/domainCard_Cloaking_Blast_Zhw7PtK8nMPlsOqD.json
@@ -65,12 +65,6 @@
       "_id": "twCBqXytmRkMz0kV",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary",
diff --git a/src/packs/domains/domainCard_Codex_Touched_7Pu83ABdMukTxu3e.json b/src/packs/domains/domainCard_Codex_Touched_7Pu83ABdMukTxu3e.json
index 6443ed6a..f07e89be 100644
--- a/src/packs/domains/domainCard_Codex_Touched_7Pu83ABdMukTxu3e.json
+++ b/src/packs/domains/domainCard_Codex_Touched_7Pu83ABdMukTxu3e.json
@@ -86,21 +86,15 @@
       "_id": "oWs00mBY3onxGjF9",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.spellcast.bonus",
+            "mode": 2,
+            "value": "@system.proficiency",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.roll.spellcast.bonus",
-          "mode": 2,
-          "value": "@system.proficiency",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Conjure_Swarm_rZPH0BY8Sznc9sFG.json b/src/packs/domains/domainCard_Conjure_Swarm_rZPH0BY8Sznc9sFG.json
index d9e8da6d..7b0b7fb8 100644
--- a/src/packs/domains/domainCard_Conjure_Swarm_rZPH0BY8Sznc9sFG.json
+++ b/src/packs/domains/domainCard_Conjure_Swarm_rZPH0BY8Sznc9sFG.json
@@ -208,12 +208,6 @@
       "_id": "dImnF8ZT2rVybiIP",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.rules.damageReduction.reduceSeverity.magical",
diff --git a/src/packs/domains/domainCard_Conjured_Steeds_Jkp6cMDiHHaBZQRS.json b/src/packs/domains/domainCard_Conjured_Steeds_Jkp6cMDiHHaBZQRS.json
index 31ad8612..62f42054 100644
--- a/src/packs/domains/domainCard_Conjured_Steeds_Jkp6cMDiHHaBZQRS.json
+++ b/src/packs/domains/domainCard_Conjured_Steeds_Jkp6cMDiHHaBZQRS.json
@@ -63,33 +63,27 @@
       "_id": "cNSlGBGPKKBNnlH8",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.attack.bonus",
+            "mode": 2,
+            "value": "-2",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.magical.dice",
+            "mode": 2,
+            "value": "+2",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.physical.bonus",
+            "mode": 2,
+            "value": "+2",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.roll.attack.bonus",
-          "mode": 2,
-          "value": "-2",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.magical.dice",
-          "mode": 2,
-          "value": "+2",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.physical.bonus",
-          "mode": 2,
-          "value": "+2",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Corrosive_Projectile_qJaSNTuDfbPVr8Lb.json b/src/packs/domains/domainCard_Corrosive_Projectile_qJaSNTuDfbPVr8Lb.json
index 6a039bbf..203e4d06 100644
--- a/src/packs/domains/domainCard_Corrosive_Projectile_qJaSNTuDfbPVr8Lb.json
+++ b/src/packs/domains/domainCard_Corrosive_Projectile_qJaSNTuDfbPVr8Lb.json
@@ -134,12 +134,6 @@
       "_id": "zB95bjSSdVlApQnR",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.difficulty",
diff --git a/src/packs/domains/domainCard_Cruel_Precision_bap1eCWryPNowbyo.json b/src/packs/domains/domainCard_Cruel_Precision_bap1eCWryPNowbyo.json
index 9e5c414e..c71dfa04 100644
--- a/src/packs/domains/domainCard_Cruel_Precision_bap1eCWryPNowbyo.json
+++ b/src/packs/domains/domainCard_Cruel_Precision_bap1eCWryPNowbyo.json
@@ -23,29 +23,23 @@
       "name": "Cruel Precision (Agi)",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "@system.traits.agility.value",
+            "priority": 21
+          },
+          {
+            "key": "system.bonuses.damage.secondaryWeapon.bonus",
+            "mode": 2,
+            "value": "@system.traits.agility.value",
+            "priority": 21
+          }
+        ]
       },
       "_id": "t5D10AL2W9LMGsX4",
       "img": "icons/skills/melee/strike-dagger-arcane-pink.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.damage.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "@system.traits.agility.value",
-          "priority": 21
-        },
-        {
-          "key": "system.bonuses.damage.secondaryWeapon.bonus",
-          "mode": 2,
-          "value": "@system.traits.agility.value",
-          "priority": 21
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
@@ -72,29 +66,23 @@
       "name": "Cruel Precision (Fin)",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "@system.traits.finesse.value",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.secondaryWeapon.bonus",
+            "mode": 2,
+            "value": "@system.traits.finesse.value",
+            "priority": null
+          }
+        ]
       },
       "_id": "Ha7c4XgmN5zGMSHG",
       "img": "icons/skills/melee/strike-dagger-arcane-pink.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.damage.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "@system.traits.finesse.value",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.secondaryWeapon.bonus",
-          "mode": 2,
-          "value": "@system.traits.finesse.value",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Deadly_Focus_xxZOXC4tiZQ6kg1e.json b/src/packs/domains/domainCard_Deadly_Focus_xxZOXC4tiZQ6kg1e.json
index c559dfd9..938f2daf 100644
--- a/src/packs/domains/domainCard_Deadly_Focus_xxZOXC4tiZQ6kg1e.json
+++ b/src/packs/domains/domainCard_Deadly_Focus_xxZOXC4tiZQ6kg1e.json
@@ -57,21 +57,15 @@
       "_id": "TFWiAUDCfGaax5MU",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.proficiency",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.proficiency",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Death_Grip_x0FVGE1YbfXalJiw.json b/src/packs/domains/domainCard_Death_Grip_x0FVGE1YbfXalJiw.json
index d33b6bab..a2aa67fd 100644
--- a/src/packs/domains/domainCard_Death_Grip_x0FVGE1YbfXalJiw.json
+++ b/src/packs/domains/domainCard_Death_Grip_x0FVGE1YbfXalJiw.json
@@ -244,12 +244,6 @@
       "_id": "wMXCIQxqLS9IbsEK",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": []
       },
       "disabled": false,
@@ -282,12 +276,6 @@
       "_id": "bZ0xgZ6TT2099OYp",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": []
       },
       "disabled": false,
@@ -320,12 +308,6 @@
       "_id": "Oe95zWWY41nH8y5l",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": []
       },
       "disabled": false,
diff --git a/src/packs/domains/domainCard_Deft_Deceiver_38znCh6kHTkaPwYi.json b/src/packs/domains/domainCard_Deft_Deceiver_38znCh6kHTkaPwYi.json
index dd9c82a2..dac804e2 100644
--- a/src/packs/domains/domainCard_Deft_Deceiver_38znCh6kHTkaPwYi.json
+++ b/src/packs/domains/domainCard_Deft_Deceiver_38znCh6kHTkaPwYi.json
@@ -63,21 +63,15 @@
       "_id": "qtHDKXJ1pH8Cu7by",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Deceive or trick someone into believing a lie you told them",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Deceive or trick someone into believing a lie you told them",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Deft_Maneuvers_dc4rAXlv95srZUct.json b/src/packs/domains/domainCard_Deft_Maneuvers_dc4rAXlv95srZUct.json
index 2b63b534..6cb59b2c 100644
--- a/src/packs/domains/domainCard_Deft_Maneuvers_dc4rAXlv95srZUct.json
+++ b/src/packs/domains/domainCard_Deft_Maneuvers_dc4rAXlv95srZUct.json
@@ -65,21 +65,15 @@
       "_id": "gEDGcbsgWY2D2nOo",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.attack.bonus",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.roll.attack.bonus",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Earthquake_C0qLOwSSvZ6PG3Ws.json b/src/packs/domains/domainCard_Earthquake_C0qLOwSSvZ6PG3Ws.json
index 0a35c95f..801278a6 100644
--- a/src/packs/domains/domainCard_Earthquake_C0qLOwSSvZ6PG3Ws.json
+++ b/src/packs/domains/domainCard_Earthquake_C0qLOwSSvZ6PG3Ws.json
@@ -118,12 +118,6 @@
       "_id": "Z31XqmGUKWYcZdMY",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
diff --git a/src/packs/domains/domainCard_Eclipse_62Sj67PdPFzwWVe3.json b/src/packs/domains/domainCard_Eclipse_62Sj67PdPFzwWVe3.json
index e2afaf66..8db164a7 100644
--- a/src/packs/domains/domainCard_Eclipse_62Sj67PdPFzwWVe3.json
+++ b/src/packs/domains/domainCard_Eclipse_62Sj67PdPFzwWVe3.json
@@ -142,12 +142,6 @@
       "_id": "ARMcw2FtKfaYr902",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.disadvantageSources",
diff --git a/src/packs/domains/domainCard_Enrapture_a8lFiKX1o8T924ze.json b/src/packs/domains/domainCard_Enrapture_a8lFiKX1o8T924ze.json
index 284682fa..5ea36d31 100644
--- a/src/packs/domains/domainCard_Enrapture_a8lFiKX1o8T924ze.json
+++ b/src/packs/domains/domainCard_Enrapture_a8lFiKX1o8T924ze.json
@@ -139,12 +139,6 @@
       "_id": "EYG5dLImk6GkmfRd",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
diff --git a/src/packs/domains/domainCard_Flight_54GUjNuBEy7xdzMz.json b/src/packs/domains/domainCard_Flight_54GUjNuBEy7xdzMz.json
index 4d1355ee..91b4b172 100644
--- a/src/packs/domains/domainCard_Flight_54GUjNuBEy7xdzMz.json
+++ b/src/packs/domains/domainCard_Flight_54GUjNuBEy7xdzMz.json
@@ -119,14 +119,8 @@
       "_id": "gd8crfrvMGWXLWGP",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Floating_Eye_wOQLu7nLMQ7v6Ogw.json b/src/packs/domains/domainCard_Floating_Eye_wOQLu7nLMQ7v6Ogw.json
index 97e94563..c82adcdb 100644
--- a/src/packs/domains/domainCard_Floating_Eye_wOQLu7nLMQ7v6Ogw.json
+++ b/src/packs/domains/domainCard_Floating_Eye_wOQLu7nLMQ7v6Ogw.json
@@ -57,14 +57,8 @@
       "_id": "ahKlKAc9TuGgx9Zm",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Forager_06UapZuaA5S6fAKl.json b/src/packs/domains/domainCard_Forager_06UapZuaA5S6fAKl.json
index e8919d6b..cfa183d1 100644
--- a/src/packs/domains/domainCard_Forager_06UapZuaA5S6fAKl.json
+++ b/src/packs/domains/domainCard_Forager_06UapZuaA5S6fAKl.json
@@ -257,21 +257,15 @@
       "_id": "cTf5gEem5Gt4fLS4",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.spellcast.bonus",
+            "mode": 2,
+            "value": "2",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.roll.spellcast.bonus",
-          "mode": 2,
-          "value": "2",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Force_of_Nature_LzVpMkD5I4QeaIHf.json b/src/packs/domains/domainCard_Force_of_Nature_LzVpMkD5I4QeaIHf.json
index 331d19b5..9db4016c 100644
--- a/src/packs/domains/domainCard_Force_of_Nature_LzVpMkD5I4QeaIHf.json
+++ b/src/packs/domains/domainCard_Force_of_Nature_LzVpMkD5I4QeaIHf.json
@@ -92,33 +92,27 @@
       "_id": "ptBC882plZW39Ld9",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.physical.bonus",
+            "mode": 2,
+            "value": "10",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.magical.bonus",
+            "mode": 2,
+            "value": "10",
+            "priority": null
+          },
+          {
+            "key": "system.rules.conditionImmunities.restrained",
+            "mode": 5,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.physical.bonus",
-          "mode": 2,
-          "value": "10",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.magical.bonus",
-          "mode": 2,
-          "value": "10",
-          "priority": null
-        },
-        {
-          "key": "system.rules.conditionImmunities.restrained",
-          "mode": 5,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Forceful_Push_z8FFPhDh2SdFkFfS.json b/src/packs/domains/domainCard_Forceful_Push_z8FFPhDh2SdFkFfS.json
index 3d17ab5d..8fc09c1c 100644
--- a/src/packs/domains/domainCard_Forceful_Push_z8FFPhDh2SdFkFfS.json
+++ b/src/packs/domains/domainCard_Forceful_Push_z8FFPhDh2SdFkFfS.json
@@ -64,12 +64,6 @@
       "_id": "95oX6QYPySdyyh2v",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
diff --git a/src/packs/domains/domainCard_Forest_Sprites_JrkUMTzaFmQNBHVm.json b/src/packs/domains/domainCard_Forest_Sprites_JrkUMTzaFmQNBHVm.json
index 4fa469a6..f345262a 100644
--- a/src/packs/domains/domainCard_Forest_Sprites_JrkUMTzaFmQNBHVm.json
+++ b/src/packs/domains/domainCard_Forest_Sprites_JrkUMTzaFmQNBHVm.json
@@ -88,21 +88,15 @@
       "_id": "SuiUFAPyB37Qr6sO",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.attack.bonus",
+            "mode": 2,
+            "value": "+3",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.roll.attack.bonus",
-          "mode": 2,
-          "value": "+3",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Fortified_Armor_oVa49lI107eZILZr.json b/src/packs/domains/domainCard_Fortified_Armor_oVa49lI107eZILZr.json
index e755bf8d..7162c664 100644
--- a/src/packs/domains/domainCard_Fortified_Armor_oVa49lI107eZILZr.json
+++ b/src/packs/domains/domainCard_Fortified_Armor_oVa49lI107eZILZr.json
@@ -23,29 +23,23 @@
       "name": "Fortified Armor",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.damageThresholds.major",
+            "mode": 2,
+            "value": "2",
+            "priority": null
+          },
+          {
+            "key": "system.damageThresholds.severe",
+            "mode": 2,
+            "value": "2",
+            "priority": null
+          }
+        ]
       },
       "_id": "jx8KWAdyoPV2hV0s",
       "img": "icons/equipment/chest/breastplate-helmet-metal.webp",
-      "changes": [
-        {
-          "key": "system.damageThresholds.major",
-          "mode": 2,
-          "value": "2",
-          "priority": null
-        },
-        {
-          "key": "system.damageThresholds.severe",
-          "mode": 2,
-          "value": "2",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Frenzy_MMl7abdGRLl7TJLO.json b/src/packs/domains/domainCard_Frenzy_MMl7abdGRLl7TJLO.json
index 6666bc28..022cc65f 100644
--- a/src/packs/domains/domainCard_Frenzy_MMl7abdGRLl7TJLO.json
+++ b/src/packs/domains/domainCard_Frenzy_MMl7abdGRLl7TJLO.json
@@ -57,12 +57,6 @@
       "_id": "1POoAgObPOWDpUco",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.bonuses.damage.physical.bonus",
diff --git a/src/packs/domains/domainCard_Full_Surge_SgvjJfMyubZowPxS.json b/src/packs/domains/domainCard_Full_Surge_SgvjJfMyubZowPxS.json
index fb0bd16d..37087001 100644
--- a/src/packs/domains/domainCard_Full_Surge_SgvjJfMyubZowPxS.json
+++ b/src/packs/domains/domainCard_Full_Surge_SgvjJfMyubZowPxS.json
@@ -63,12 +63,6 @@
       "_id": "H5q5iYImr69TfZcp",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.traits.strength.value",
diff --git a/src/packs/domains/domainCard_Get_Back_Up_BFWN2cObMdlk9uVz.json b/src/packs/domains/domainCard_Get_Back_Up_BFWN2cObMdlk9uVz.json
index 571a3fb4..f4cc2cbf 100644
--- a/src/packs/domains/domainCard_Get_Back_Up_BFWN2cObMdlk9uVz.json
+++ b/src/packs/domains/domainCard_Get_Back_Up_BFWN2cObMdlk9uVz.json
@@ -24,23 +24,17 @@
       "name": "Get Back Up",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.rules.damageReduction.stressDamageReduction.severe.cost",
+            "mode": 5,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
       "_id": "aV3KUHtXXR86PRMh",
       "img": "icons/magic/control/silhouette-aura-energy.webp",
-      "changes": [
-        {
-          "key": "system.rules.damageReduction.stressDamageReduction.severe.cost",
-          "mode": 5,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Gifted_Tracker_VZ2b4zfRzV73XTuT.json b/src/packs/domains/domainCard_Gifted_Tracker_VZ2b4zfRzV73XTuT.json
index 61d90f0c..7998b6c4 100644
--- a/src/packs/domains/domainCard_Gifted_Tracker_VZ2b4zfRzV73XTuT.json
+++ b/src/packs/domains/domainCard_Gifted_Tracker_VZ2b4zfRzV73XTuT.json
@@ -63,21 +63,15 @@
       "_id": "47Oh2weCdmuvKHM9",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.evasion",
+            "mode": 2,
+            "value": "+1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.evasion",
-          "mode": 2,
-          "value": "+1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Glyph_of_Nightfall_B5HXqYRJiL3xMNKT.json b/src/packs/domains/domainCard_Glyph_of_Nightfall_B5HXqYRJiL3xMNKT.json
index 35100187..a4aa4d9f 100644
--- a/src/packs/domains/domainCard_Glyph_of_Nightfall_B5HXqYRJiL3xMNKT.json
+++ b/src/packs/domains/domainCard_Glyph_of_Nightfall_B5HXqYRJiL3xMNKT.json
@@ -100,12 +100,6 @@
         "duration": {
           "description": "",
           "type": "temporary"
-        },
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
         }
       },
       "disabled": false,
diff --git a/src/packs/domains/domainCard_Goad_Them_On_HufF5KzuNfEb9RTi.json b/src/packs/domains/domainCard_Goad_Them_On_HufF5KzuNfEb9RTi.json
index db28b8b5..11610aac 100644
--- a/src/packs/domains/domainCard_Goad_Them_On_HufF5KzuNfEb9RTi.json
+++ b/src/packs/domains/domainCard_Goad_Them_On_HufF5KzuNfEb9RTi.json
@@ -106,21 +106,15 @@
       "_id": "Jccsuc48gmA6QAni",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.disadvantageSources",
+            "mode": 2,
+            "value": "Attacking the goading creature",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.disadvantageSources",
-          "mode": 2,
-          "value": "Attacking the goading creature",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Grace_Touched_KAuNb51AwhD8KEXk.json b/src/packs/domains/domainCard_Grace_Touched_KAuNb51AwhD8KEXk.json
index 2e48f07b..a788e205 100644
--- a/src/packs/domains/domainCard_Grace_Touched_KAuNb51AwhD8KEXk.json
+++ b/src/packs/domains/domainCard_Grace_Touched_KAuNb51AwhD8KEXk.json
@@ -107,16 +107,10 @@
       "name": "Grace-Touched",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
       "_id": "KK5m2slpFuXDxFaL",
       "img": "systems/daggerheart/assets/icons/domains/domain-card/grace.png",
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Healing_Hands_WTlhnQMajc1r8i50.json b/src/packs/domains/domainCard_Healing_Hands_WTlhnQMajc1r8i50.json
index c771562c..a3657ef6 100644
--- a/src/packs/domains/domainCard_Healing_Hands_WTlhnQMajc1r8i50.json
+++ b/src/packs/domains/domainCard_Healing_Hands_WTlhnQMajc1r8i50.json
@@ -385,14 +385,8 @@
       "_id": "sd5liP4ZcVeTMAoW",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Hold_the_Line_kdFoLo3KXwn4LqTG.json b/src/packs/domains/domainCard_Hold_the_Line_kdFoLo3KXwn4LqTG.json
index 263220e4..a6edb862 100644
--- a/src/packs/domains/domainCard_Hold_the_Line_kdFoLo3KXwn4LqTG.json
+++ b/src/packs/domains/domainCard_Hold_the_Line_kdFoLo3KXwn4LqTG.json
@@ -91,14 +91,8 @@
       "_id": "y82y3nUStyL8DIJL",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -127,12 +121,6 @@
       "_id": "WTYg0b8nE1XbnMiA",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
diff --git a/src/packs/domains/domainCard_Hush_gwmYasmfgXZ7tFS6.json b/src/packs/domains/domainCard_Hush_gwmYasmfgXZ7tFS6.json
index 28c41c7e..9793c70f 100644
--- a/src/packs/domains/domainCard_Hush_gwmYasmfgXZ7tFS6.json
+++ b/src/packs/domains/domainCard_Hush_gwmYasmfgXZ7tFS6.json
@@ -88,12 +88,6 @@
       "_id": "pZ5YpjKidaj48IYF",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary",
diff --git a/src/packs/domains/domainCard_Hypnotic_Shimmer_2ZeuCGVatQdPOVC6.json b/src/packs/domains/domainCard_Hypnotic_Shimmer_2ZeuCGVatQdPOVC6.json
index 08f0d3ee..f4f95d83 100644
--- a/src/packs/domains/domainCard_Hypnotic_Shimmer_2ZeuCGVatQdPOVC6.json
+++ b/src/packs/domains/domainCard_Hypnotic_Shimmer_2ZeuCGVatQdPOVC6.json
@@ -116,12 +116,6 @@
       "_id": "xAG75UWUz3aDZH3m",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
diff --git a/src/packs/domains/domainCard_Inevitable_XTT8c8uJ4D7fvtbL.json b/src/packs/domains/domainCard_Inevitable_XTT8c8uJ4D7fvtbL.json
index fc083136..790acf08 100644
--- a/src/packs/domains/domainCard_Inevitable_XTT8c8uJ4D7fvtbL.json
+++ b/src/packs/domains/domainCard_Inevitable_XTT8c8uJ4D7fvtbL.json
@@ -23,23 +23,17 @@
       "name": "Inevitable",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "If you failed your previous action roll",
+            "priority": null
+          }
+        ]
       },
       "_id": "wX4BFGaM0bdzHPn2",
       "img": "icons/magic/light/explosion-beam-impact-silhouette.webp",
-      "changes": [
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "If you failed your previous action roll",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Invisibility_KHkzA4Zrw8EWN1CH.json b/src/packs/domains/domainCard_Invisibility_KHkzA4Zrw8EWN1CH.json
index 5f67ff74..9ed72705 100644
--- a/src/packs/domains/domainCard_Invisibility_KHkzA4Zrw8EWN1CH.json
+++ b/src/packs/domains/domainCard_Invisibility_KHkzA4Zrw8EWN1CH.json
@@ -94,14 +94,8 @@
       "_id": "bRJy0MoIPQEQOMzZ",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Lead_by_Example_YWCRplmtwpCjpq5i.json b/src/packs/domains/domainCard_Lead_by_Example_YWCRplmtwpCjpq5i.json
index a29b021f..e2836d8c 100644
--- a/src/packs/domains/domainCard_Lead_by_Example_YWCRplmtwpCjpq5i.json
+++ b/src/packs/domains/domainCard_Lead_by_Example_YWCRplmtwpCjpq5i.json
@@ -63,14 +63,8 @@
       "_id": "BbBs2XYXMsLwkHKh",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Life_Ward_OszbCj0jTqq2ADx9.json b/src/packs/domains/domainCard_Life_Ward_OszbCj0jTqq2ADx9.json
index de841ffe..ec2dc590 100644
--- a/src/packs/domains/domainCard_Life_Ward_OszbCj0jTqq2ADx9.json
+++ b/src/packs/domains/domainCard_Life_Ward_OszbCj0jTqq2ADx9.json
@@ -65,12 +65,6 @@
       "_id": "E7Ou4OMEy3TeK1Gf",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "longRest"
diff --git a/src/packs/domains/domainCard_Mass_Disguise_dT95m0Jam8sWbeuC.json b/src/packs/domains/domainCard_Mass_Disguise_dT95m0Jam8sWbeuC.json
index b9fbaed9..8c0122f4 100644
--- a/src/packs/domains/domainCard_Mass_Disguise_dT95m0Jam8sWbeuC.json
+++ b/src/packs/domains/domainCard_Mass_Disguise_dT95m0Jam8sWbeuC.json
@@ -93,21 +93,15 @@
       "_id": "HgF4n0idPcdz8Bi7",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Presence Rolls to avoid scrutiny.",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Presence Rolls to avoid scrutiny.",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Mass_Enrapture_ubpixIgZrJXKyM3b.json b/src/packs/domains/domainCard_Mass_Enrapture_ubpixIgZrJXKyM3b.json
index 8ada8d80..48da2c58 100644
--- a/src/packs/domains/domainCard_Mass_Enrapture_ubpixIgZrJXKyM3b.json
+++ b/src/packs/domains/domainCard_Mass_Enrapture_ubpixIgZrJXKyM3b.json
@@ -148,12 +148,6 @@
       "_id": "QNbnelRylVB0yCm0",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
diff --git a/src/packs/domains/domainCard_Midnight_Touched_uSyGKVxOJcnp28po.json b/src/packs/domains/domainCard_Midnight_Touched_uSyGKVxOJcnp28po.json
index b859aafb..e3b845c2 100644
--- a/src/packs/domains/domainCard_Midnight_Touched_uSyGKVxOJcnp28po.json
+++ b/src/packs/domains/domainCard_Midnight_Touched_uSyGKVxOJcnp28po.json
@@ -122,16 +122,10 @@
       "name": "Midnight-Touched",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
       "_id": "sNBuI2xIZAI4RgZy",
       "img": "systems/daggerheart/assets/icons/domains/domain-card/midnight.png",
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Natural_Familiar_Tag303LoRNC5zGgl.json b/src/packs/domains/domainCard_Natural_Familiar_Tag303LoRNC5zGgl.json
index c14116d4..f561e0be 100644
--- a/src/packs/domains/domainCard_Natural_Familiar_Tag303LoRNC5zGgl.json
+++ b/src/packs/domains/domainCard_Natural_Familiar_Tag303LoRNC5zGgl.json
@@ -139,27 +139,21 @@
       "_id": "0BumAWKw2aK4A5al",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.magical.dice",
+            "mode": 2,
+            "value": "d6",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.physical.dice",
+            "mode": 2,
+            "value": "d6",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.magical.dice",
-          "mode": 2,
-          "value": "d6",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.physical.dice",
-          "mode": 2,
-          "value": "d6",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Nature_s_Tongue_atWLorlCOxcrq8WB.json b/src/packs/domains/domainCard_Nature_s_Tongue_atWLorlCOxcrq8WB.json
index b6c9464a..81c0734e 100644
--- a/src/packs/domains/domainCard_Nature_s_Tongue_atWLorlCOxcrq8WB.json
+++ b/src/packs/domains/domainCard_Nature_s_Tongue_atWLorlCOxcrq8WB.json
@@ -109,21 +109,15 @@
       "_id": "0JYDk5CQ66bHGQO0",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.spellcast.bonus",
+            "mode": 2,
+            "value": "+2",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.roll.spellcast.bonus",
-          "mode": 2,
-          "value": "+2",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Never_Upstaged_McdncxmO9K1YNP7Y.json b/src/packs/domains/domainCard_Never_Upstaged_McdncxmO9K1YNP7Y.json
index aaa2c60e..4662a882 100644
--- a/src/packs/domains/domainCard_Never_Upstaged_McdncxmO9K1YNP7Y.json
+++ b/src/packs/domains/domainCard_Never_Upstaged_McdncxmO9K1YNP7Y.json
@@ -211,27 +211,21 @@
       "_id": "C6e1T2oEx6PFoRUP",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.physical.bonus",
+            "mode": 2,
+            "value": "+5",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.magical.bonus",
+            "mode": 2,
+            "value": "+5",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.physical.bonus",
-          "mode": 2,
-          "value": "+5",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.magical.bonus",
-          "mode": 2,
-          "value": "+5",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -260,27 +254,21 @@
       "_id": "bMMxsBungVYB1rI8",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.magical.bonus",
+            "mode": 2,
+            "value": "+10",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.physical.bonus",
+            "mode": 2,
+            "value": "+10",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.magical.bonus",
-          "mode": 2,
-          "value": "+10",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.physical.bonus",
-          "mode": 2,
-          "value": "+10",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -309,27 +297,21 @@
       "_id": "tsQRbrurzi8iqs0o",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.magical.bonus",
+            "mode": 2,
+            "value": "+15",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.physical.bonus",
+            "mode": 2,
+            "value": "+15",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.magical.bonus",
-          "mode": 2,
-          "value": "+15",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.physical.bonus",
-          "mode": 2,
-          "value": "+15",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -358,27 +340,21 @@
       "_id": "3eTaSgHlmNDcymnW",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.magical.bonus",
+            "mode": 2,
+            "value": "+20",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.physical.bonus",
+            "mode": 2,
+            "value": "+20",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.magical.bonus",
-          "mode": 2,
-          "value": "+20",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.physical.bonus",
-          "mode": 2,
-          "value": "+20",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Night_Terror_zcldCuqOg3dphUVI.json b/src/packs/domains/domainCard_Night_Terror_zcldCuqOg3dphUVI.json
index 8eefeec4..57b8f862 100644
--- a/src/packs/domains/domainCard_Night_Terror_zcldCuqOg3dphUVI.json
+++ b/src/packs/domains/domainCard_Night_Terror_zcldCuqOg3dphUVI.json
@@ -150,12 +150,6 @@
       "_id": "32j3ZeNMMCk1QLlM",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
diff --git a/src/packs/domains/domainCard_On_the_Brink_zbxPl81kbWEegKQN.json b/src/packs/domains/domainCard_On_the_Brink_zbxPl81kbWEegKQN.json
index e5f90fe4..c4c89d17 100644
--- a/src/packs/domains/domainCard_On_the_Brink_zbxPl81kbWEegKQN.json
+++ b/src/packs/domains/domainCard_On_the_Brink_zbxPl81kbWEegKQN.json
@@ -23,23 +23,17 @@
       "name": "On The Brink",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.rules.damageReduction.thresholdImmunities.minor",
+            "mode": 5,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
       "_id": "UJTsJlnhi5Zi0XQ2",
       "img": "systems/daggerheart/assets/icons/domains/domain-card/bone.png",
-      "changes": [
-        {
-          "key": "system.rules.damageReduction.thresholdImmunities.minor",
-          "mode": 5,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Overwhelming_Aura_iEBLySZD9z8CLdz7.json b/src/packs/domains/domainCard_Overwhelming_Aura_iEBLySZD9z8CLdz7.json
index 9aa2f5b4..e73171a5 100644
--- a/src/packs/domains/domainCard_Overwhelming_Aura_iEBLySZD9z8CLdz7.json
+++ b/src/packs/domains/domainCard_Overwhelming_Aura_iEBLySZD9z8CLdz7.json
@@ -89,12 +89,6 @@
       "_id": "ba9GO4NtQHYkaRR9",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.traits.presence.value",
diff --git a/src/packs/domains/domainCard_Pick_and_Pull_HdgZUfWd7Hyj7nBW.json b/src/packs/domains/domainCard_Pick_and_Pull_HdgZUfWd7Hyj7nBW.json
index 35ac6ce4..250bc539 100644
--- a/src/packs/domains/domainCard_Pick_and_Pull_HdgZUfWd7Hyj7nBW.json
+++ b/src/packs/domains/domainCard_Pick_and_Pull_HdgZUfWd7Hyj7nBW.json
@@ -23,35 +23,29 @@
       "name": "Pick and Pull",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Pick nonmagical locks",
+            "priority": null
+          },
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Disarm nonmagical traps",
+            "priority": null
+          },
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Steal items from a target (either through stealth or by force)",
+            "priority": null
+          }
+        ]
       },
       "_id": "6IkjF8qNR0NVvvv8",
       "img": "icons/tools/hand/lockpicks-steel-grey.webp",
-      "changes": [
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Pick nonmagical locks",
-          "priority": null
-        },
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Disarm nonmagical traps",
-          "priority": null
-        },
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Steal items from a target (either through stealth or by force)",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Rage_Up_GRL0cvs96vrTDckZ.json b/src/packs/domains/domainCard_Rage_Up_GRL0cvs96vrTDckZ.json
index c3493aea..13d0f540 100644
--- a/src/packs/domains/domainCard_Rage_Up_GRL0cvs96vrTDckZ.json
+++ b/src/packs/domains/domainCard_Rage_Up_GRL0cvs96vrTDckZ.json
@@ -65,12 +65,6 @@
       "_id": "bq1MhcmoP6Wo5CXF",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.bonuses.damage.magical.bonus",
@@ -129,12 +123,6 @@
       "_id": "t6SIjQxB6UBUJ98f",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.bonuses.damage.magical.bonus",
diff --git a/src/packs/domains/domainCard_Recovery_gsiQFT6q3WOgqerJ.json b/src/packs/domains/domainCard_Recovery_gsiQFT6q3WOgqerJ.json
index 4cfd0b19..83e3a22c 100644
--- a/src/packs/domains/domainCard_Recovery_gsiQFT6q3WOgqerJ.json
+++ b/src/packs/domains/domainCard_Recovery_gsiQFT6q3WOgqerJ.json
@@ -57,27 +57,21 @@
       "_id": "smTjINqIldErFD3q",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.rest.shortRest.longMoves",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.rest.shortRest.shortMoves",
+            "mode": 2,
+            "value": "-1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.rest.shortRest.longMoves",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.rest.shortRest.shortMoves",
-          "mode": 2,
-          "value": "-1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -102,29 +96,23 @@
       "name": "Recovery",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.rest.shortRest.longMoves",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.rest.shortRest.shortMoves",
+            "mode": 2,
+            "value": "-1",
+            "priority": null
+          }
+        ]
       },
       "_id": "7GsHTQCtNB8PEVgr",
       "img": "icons/magic/life/cross-beam-green.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.rest.shortRest.longMoves",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.rest.shortRest.shortMoves",
-          "mode": 2,
-          "value": "-1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Rejuvenation_Barrier_HtWx5IIemCoorMj2.json b/src/packs/domains/domainCard_Rejuvenation_Barrier_HtWx5IIemCoorMj2.json
index 6d8757f7..bfd8fb09 100644
--- a/src/packs/domains/domainCard_Rejuvenation_Barrier_HtWx5IIemCoorMj2.json
+++ b/src/packs/domains/domainCard_Rejuvenation_Barrier_HtWx5IIemCoorMj2.json
@@ -110,12 +110,6 @@
       "_id": "obul9k0P4CjFuxJD",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.resistance.physical.resistance",
diff --git a/src/packs/domains/domainCard_Rise_Up_oDIZoC4l19Nli0Fj.json b/src/packs/domains/domainCard_Rise_Up_oDIZoC4l19Nli0Fj.json
index 5d46562d..74f6293f 100644
--- a/src/packs/domains/domainCard_Rise_Up_oDIZoC4l19Nli0Fj.json
+++ b/src/packs/domains/domainCard_Rise_Up_oDIZoC4l19Nli0Fj.json
@@ -92,23 +92,17 @@
       "name": "Rise Up",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.damageThresholds.severe",
+            "mode": 2,
+            "value": "@system.proficiency",
+            "priority": 21
+          }
+        ]
       },
       "_id": "ulQpnnRFwW4BwMlE",
       "img": "icons/magic/defensive/shield-barrier-flaming-pentagon-teal-purple.webp",
-      "changes": [
-        {
-          "key": "system.damageThresholds.severe",
-          "mode": 2,
-          "value": "@system.proficiency",
-          "priority": 21
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Safe_Haven_lmBLMPuR8qLbuzNf.json b/src/packs/domains/domainCard_Safe_Haven_lmBLMPuR8qLbuzNf.json
index 0d98c1f9..de4872a2 100644
--- a/src/packs/domains/domainCard_Safe_Haven_lmBLMPuR8qLbuzNf.json
+++ b/src/packs/domains/domainCard_Safe_Haven_lmBLMPuR8qLbuzNf.json
@@ -63,27 +63,21 @@
       "_id": "UaqohKZnokIPLeYf",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.rest.shortRest.shortMoves",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.rest.longRest.longMoves",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.rest.shortRest.shortMoves",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.rest.longRest.longMoves",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Sage_Touched_VOSFaQHZbmhMyXwi.json b/src/packs/domains/domainCard_Sage_Touched_VOSFaQHZbmhMyXwi.json
index 432ff638..082f8620 100644
--- a/src/packs/domains/domainCard_Sage_Touched_VOSFaQHZbmhMyXwi.json
+++ b/src/packs/domains/domainCard_Sage_Touched_VOSFaQHZbmhMyXwi.json
@@ -105,23 +105,17 @@
       "name": "Increase Spellcasting",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.spellcast.bonus",
+            "mode": 2,
+            "value": "+2",
+            "priority": null
+          }
+        ]
       },
       "_id": "7zMpgedPII5GIYUl",
       "img": "systems/daggerheart/assets/icons/domains/domain-card/sage.png",
-      "changes": [
-        {
-          "key": "system.bonuses.roll.spellcast.bonus",
-          "mode": 2,
-          "value": "+2",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -152,21 +146,15 @@
       "_id": "Mmax64mlLPYxJPB7",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.traits.agility.value",
+            "mode": 1,
+            "value": "2",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.traits.agility.value",
-          "mode": 1,
-          "value": "2",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
@@ -195,21 +183,15 @@
       "_id": "p03IjcyigL4b2WD1",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.traits.instinct.value",
+            "mode": 1,
+            "value": "2",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.traits.instinct.value",
-          "mode": 1,
-          "value": "2",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Shadowbind_kguhWlidhxe2GbT0.json b/src/packs/domains/domainCard_Shadowbind_kguhWlidhxe2GbT0.json
index a90ec0f7..1023b92c 100644
--- a/src/packs/domains/domainCard_Shadowbind_kguhWlidhxe2GbT0.json
+++ b/src/packs/domains/domainCard_Shadowbind_kguhWlidhxe2GbT0.json
@@ -89,12 +89,6 @@
       "_id": "RFB4V0V4bDJ6vCL2",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
diff --git a/src/packs/domains/domainCard_Shadowhunter_A0XzD6MmBXYdk7Ps.json b/src/packs/domains/domainCard_Shadowhunter_A0XzD6MmBXYdk7Ps.json
index a3d98039..9c9a31c7 100644
--- a/src/packs/domains/domainCard_Shadowhunter_A0XzD6MmBXYdk7Ps.json
+++ b/src/packs/domains/domainCard_Shadowhunter_A0XzD6MmBXYdk7Ps.json
@@ -24,16 +24,10 @@
       "name": "Shadowhunter Evasion",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
       "_id": "A6gMv7TbMu3nV3NT",
       "img": "icons/skills/movement/feet-winged-boots-glowing-yellow.webp",
-      "changes": [],
       "disabled": true,
       "duration": {
         "startTime": null,
@@ -60,23 +54,17 @@
       "name": "Shadowhunter Advantage Hint",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Attack rolls while shrouded in low light or darkness.",
+            "priority": null
+          }
+        ]
       },
       "_id": "a1hDCNYDvF4dWt58",
       "img": "icons/skills/targeting/crosshair-bars-yellow.webp",
-      "changes": [
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Attack rolls while shrouded in low light or darkness.",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Shield_Aura_rfIv6lln40Fh6EIl.json b/src/packs/domains/domainCard_Shield_Aura_rfIv6lln40Fh6EIl.json
index 64544f76..6a2b565c 100644
--- a/src/packs/domains/domainCard_Shield_Aura_rfIv6lln40Fh6EIl.json
+++ b/src/packs/domains/domainCard_Shield_Aura_rfIv6lln40Fh6EIl.json
@@ -65,21 +65,15 @@
       "_id": "OQreUqdAfIt3V6uq",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.rules.damageReduction.increasePerArmorMark",
+            "mode": 2,
+            "value": "+1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.rules.damageReduction.increasePerArmorMark",
-          "mode": 2,
-          "value": "+1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Shrug_It_Off_JwfhtgmmuRxg4zhI.json b/src/packs/domains/domainCard_Shrug_It_Off_JwfhtgmmuRxg4zhI.json
index 3e757308..b6461215 100644
--- a/src/packs/domains/domainCard_Shrug_It_Off_JwfhtgmmuRxg4zhI.json
+++ b/src/packs/domains/domainCard_Shrug_It_Off_JwfhtgmmuRxg4zhI.json
@@ -79,23 +79,17 @@
       "name": "Shrug It Off",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.rules.damageReduction.stressDamageReduction.any.cost",
+            "mode": 5,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
       "_id": "5DTQDVU8Jy5Nnp5V",
       "img": "icons/magic/defensive/shield-barrier-deflect-teal.webp",
-      "changes": [
-        {
-          "key": "system.rules.damageReduction.stressDamageReduction.any.cost",
-          "mode": 5,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Sigil_of_Retribution_RiuN0lMlfoTAhLJz.json b/src/packs/domains/domainCard_Sigil_of_Retribution_RiuN0lMlfoTAhLJz.json
index a368edad..d0933e2f 100644
--- a/src/packs/domains/domainCard_Sigil_of_Retribution_RiuN0lMlfoTAhLJz.json
+++ b/src/packs/domains/domainCard_Sigil_of_Retribution_RiuN0lMlfoTAhLJz.json
@@ -63,14 +63,8 @@
       "_id": "pJntjutNO7bYX6td",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Smite_U1uWJE94HZVudujz.json b/src/packs/domains/domainCard_Smite_U1uWJE94HZVudujz.json
index 23786540..8a6d2281 100644
--- a/src/packs/domains/domainCard_Smite_U1uWJE94HZVudujz.json
+++ b/src/packs/domains/domainCard_Smite_U1uWJE94HZVudujz.json
@@ -65,14 +65,8 @@
       "_id": "mqZSae8J9d7o3lon",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Specter_of_the_Dark_iQhgqmLwhcSTYnvr.json b/src/packs/domains/domainCard_Specter_of_the_Dark_iQhgqmLwhcSTYnvr.json
index 18af0877..0ee15cb9 100644
--- a/src/packs/domains/domainCard_Specter_of_the_Dark_iQhgqmLwhcSTYnvr.json
+++ b/src/packs/domains/domainCard_Specter_of_the_Dark_iQhgqmLwhcSTYnvr.json
@@ -63,21 +63,15 @@
       "_id": "d9bZJl0yZnvOe2f3",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.resistance.physical.immunity",
+            "mode": 5,
+            "value": "true",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.resistance.physical.immunity",
-          "mode": 5,
-          "value": "true",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Splendor_Touched_JT5dM3gVL6chDBYU.json b/src/packs/domains/domainCard_Splendor_Touched_JT5dM3gVL6chDBYU.json
index 6b530289..a7609b62 100644
--- a/src/packs/domains/domainCard_Splendor_Touched_JT5dM3gVL6chDBYU.json
+++ b/src/packs/domains/domainCard_Splendor_Touched_JT5dM3gVL6chDBYU.json
@@ -24,23 +24,17 @@
       "name": "Splendor-Touched",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.damageThresholds.severe",
+            "mode": 2,
+            "value": "+3",
+            "priority": null
+          }
+        ]
       },
       "_id": "u13fiOMD8B36PkiZ",
       "img": "systems/daggerheart/assets/icons/domains/domain-card/splendor.png",
-      "changes": [
-        {
-          "key": "system.damageThresholds.severe",
-          "mode": 2,
-          "value": "+3",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Stunning_Sunlight_lRHo6ZkK1zybeEoG.json b/src/packs/domains/domainCard_Stunning_Sunlight_lRHo6ZkK1zybeEoG.json
index e2d68a10..3ffb8821 100644
--- a/src/packs/domains/domainCard_Stunning_Sunlight_lRHo6ZkK1zybeEoG.json
+++ b/src/packs/domains/domainCard_Stunning_Sunlight_lRHo6ZkK1zybeEoG.json
@@ -179,12 +179,6 @@
       "_id": "kSLuGSI6FLhOJaGp",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
diff --git a/src/packs/domains/domainCard_Tell_No_Lies_HTv9QEPS466WsstP.json b/src/packs/domains/domainCard_Tell_No_Lies_HTv9QEPS466WsstP.json
index 1efb1374..e17842dd 100644
--- a/src/packs/domains/domainCard_Tell_No_Lies_HTv9QEPS466WsstP.json
+++ b/src/packs/domains/domainCard_Tell_No_Lies_HTv9QEPS466WsstP.json
@@ -97,16 +97,10 @@
       "name": "Can't Lie",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
       "_id": "5L6fC80VfbPfGmcA",
       "img": "icons/magic/control/voodoo-doll-pain-damage-red.webp",
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Tempest_X7YaZgFieBlqaPdZ.json b/src/packs/domains/domainCard_Tempest_X7YaZgFieBlqaPdZ.json
index e027ca8f..9bf8f2c0 100644
--- a/src/packs/domains/domainCard_Tempest_X7YaZgFieBlqaPdZ.json
+++ b/src/packs/domains/domainCard_Tempest_X7YaZgFieBlqaPdZ.json
@@ -290,12 +290,6 @@
       "_id": "oqPY3I9oO9J6l5Aj",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
@@ -338,12 +332,6 @@
       "_id": "tB7AyDy0pbE9q5hM",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": []
       },
       "disabled": false,
@@ -374,12 +362,6 @@
       "_id": "S4Vpgf3FMmq8MGrb",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": []
       },
       "disabled": false,
diff --git a/src/packs/domains/domainCard_Thorn_Skin_oUipGK84E2KjoKqh.json b/src/packs/domains/domainCard_Thorn_Skin_oUipGK84E2KjoKqh.json
index 2f97dd84..1f1da4dc 100644
--- a/src/packs/domains/domainCard_Thorn_Skin_oUipGK84E2KjoKqh.json
+++ b/src/packs/domains/domainCard_Thorn_Skin_oUipGK84E2KjoKqh.json
@@ -97,14 +97,8 @@
       "_id": "KPA1okccsR7AQH0x",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Thought_Delver_B4choj481tqajWb9.json b/src/packs/domains/domainCard_Thought_Delver_B4choj481tqajWb9.json
index 7c8d6235..a69670d5 100644
--- a/src/packs/domains/domainCard_Thought_Delver_B4choj481tqajWb9.json
+++ b/src/packs/domains/domainCard_Thought_Delver_B4choj481tqajWb9.json
@@ -109,14 +109,8 @@
       "_id": "obbNjDhwN60YhH1s",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Through_Your_Eyes_7b0mzV5QMPjVPT4o.json b/src/packs/domains/domainCard_Through_Your_Eyes_7b0mzV5QMPjVPT4o.json
index 529950b5..85f435be 100644
--- a/src/packs/domains/domainCard_Through_Your_Eyes_7b0mzV5QMPjVPT4o.json
+++ b/src/packs/domains/domainCard_Through_Your_Eyes_7b0mzV5QMPjVPT4o.json
@@ -56,12 +56,6 @@
       "_id": "TCOHV7tWpunCZDxn",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "shortRest"
diff --git a/src/packs/domains/domainCard_Transcendent_Union_kVkoCLBXLAIifqpz.json b/src/packs/domains/domainCard_Transcendent_Union_kVkoCLBXLAIifqpz.json
index 4460a5db..14bdc45f 100644
--- a/src/packs/domains/domainCard_Transcendent_Union_kVkoCLBXLAIifqpz.json
+++ b/src/packs/domains/domainCard_Transcendent_Union_kVkoCLBXLAIifqpz.json
@@ -65,12 +65,6 @@
       "_id": "kMcvp2QKmBP4uinB",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "shortRest"
diff --git a/src/packs/domains/domainCard_Twilight_Toll_SDjjV61TC1NceV1m.json b/src/packs/domains/domainCard_Twilight_Toll_SDjjV61TC1NceV1m.json
index cc7f45c7..b21f907e 100644
--- a/src/packs/domains/domainCard_Twilight_Toll_SDjjV61TC1NceV1m.json
+++ b/src/packs/domains/domainCard_Twilight_Toll_SDjjV61TC1NceV1m.json
@@ -96,14 +96,8 @@
       "_id": "65UMKq0epBx5DbMC",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Uncanny_Disguise_TV56wSysbU5xAlOa.json b/src/packs/domains/domainCard_Uncanny_Disguise_TV56wSysbU5xAlOa.json
index 62953005..6088f1dc 100644
--- a/src/packs/domains/domainCard_Uncanny_Disguise_TV56wSysbU5xAlOa.json
+++ b/src/packs/domains/domainCard_Uncanny_Disguise_TV56wSysbU5xAlOa.json
@@ -97,21 +97,15 @@
       "_id": "ZMDyDwI5RHe427O4",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Presence Rolls to avoid scrutiny",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Presence Rolls to avoid scrutiny",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Unleash_Chaos_o62i0QdbUDIiAhSq.json b/src/packs/domains/domainCard_Unleash_Chaos_o62i0QdbUDIiAhSq.json
index 69049d01..20b8f00e 100644
--- a/src/packs/domains/domainCard_Unleash_Chaos_o62i0QdbUDIiAhSq.json
+++ b/src/packs/domains/domainCard_Unleash_Chaos_o62i0QdbUDIiAhSq.json
@@ -151,14 +151,8 @@
       "_id": "F2yHIwHeZmLlrkkS",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Untouchable_9QElncQUDSakuSdR.json b/src/packs/domains/domainCard_Untouchable_9QElncQUDSakuSdR.json
index 11a1a841..a5326403 100644
--- a/src/packs/domains/domainCard_Untouchable_9QElncQUDSakuSdR.json
+++ b/src/packs/domains/domainCard_Untouchable_9QElncQUDSakuSdR.json
@@ -23,23 +23,17 @@
       "name": "Untouchable",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.evasion",
+            "mode": 2,
+            "value": "ceil(@system.traits.agility.value / 2)",
+            "priority": 21
+          }
+        ]
       },
       "_id": "H8hazlQe4Wj4JFO6",
       "img": "icons/skills/movement/feet-winged-boots-glowing-yellow.webp",
-      "changes": [
-        {
-          "key": "system.evasion",
-          "mode": 2,
-          "value": "ceil(@system.traits.agility.value / 2)",
-          "priority": 21
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Vanishing_Dodge_GBMIElIpk4cvk1Bd.json b/src/packs/domains/domainCard_Vanishing_Dodge_GBMIElIpk4cvk1Bd.json
index f95c8814..14f7f970 100644
--- a/src/packs/domains/domainCard_Vanishing_Dodge_GBMIElIpk4cvk1Bd.json
+++ b/src/packs/domains/domainCard_Vanishing_Dodge_GBMIElIpk4cvk1Bd.json
@@ -63,14 +63,8 @@
       "_id": "kxal5WfDr3hTHYpb",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Veil_of_Night_gV4L5ZZmfPrEbIDh.json b/src/packs/domains/domainCard_Veil_of_Night_gV4L5ZZmfPrEbIDh.json
index cff0c185..8eba6388 100644
--- a/src/packs/domains/domainCard_Veil_of_Night_gV4L5ZZmfPrEbIDh.json
+++ b/src/packs/domains/domainCard_Veil_of_Night_gV4L5ZZmfPrEbIDh.json
@@ -89,12 +89,6 @@
       "_id": "eSfBBZ7IP8qirLu7",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.advantageSources",
diff --git a/src/packs/domains/domainCard_Vicious_Entangle_qvpvTnkAoRn9vYO4.json b/src/packs/domains/domainCard_Vicious_Entangle_qvpvTnkAoRn9vYO4.json
index 3b7358bc..cce6cef4 100644
--- a/src/packs/domains/domainCard_Vicious_Entangle_qvpvTnkAoRn9vYO4.json
+++ b/src/packs/domains/domainCard_Vicious_Entangle_qvpvTnkAoRn9vYO4.json
@@ -141,12 +141,6 @@
       "_id": "Xh0wrgRUuYpwChBU",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
@@ -189,12 +183,6 @@
       "_id": "2xzOqTaPJQzGqFJv",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
diff --git a/src/packs/domains/domainCard_Vitality_sWUlSPOJEaXyQLCj.json b/src/packs/domains/domainCard_Vitality_sWUlSPOJEaXyQLCj.json
index ec47c9f9..2d42ef9f 100644
--- a/src/packs/domains/domainCard_Vitality_sWUlSPOJEaXyQLCj.json
+++ b/src/packs/domains/domainCard_Vitality_sWUlSPOJEaXyQLCj.json
@@ -66,21 +66,15 @@
       "_id": "1jtgIyFvDpTb0asZ",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.resources.hitPoints.max",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.resources.hitPoints.max",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
@@ -109,21 +103,15 @@
       "_id": "vj9rm1tLqqsSFOXF",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.resources.stress.max",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.resources.stress.max",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
@@ -152,27 +140,21 @@
       "_id": "BcqCG9yF6l1LRYqm",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.damageThresholds.major",
+            "mode": 2,
+            "value": "2",
+            "priority": null
+          },
+          {
+            "key": "system.damageThresholds.severe",
+            "mode": 2,
+            "value": "2",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.damageThresholds.major",
-          "mode": 2,
-          "value": "2",
-          "priority": null
-        },
-        {
-          "key": "system.damageThresholds.severe",
-          "mode": 2,
-          "value": "2",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Voice_of_Reason_t3RRGH6mMYYJJCcF.json b/src/packs/domains/domainCard_Voice_of_Reason_t3RRGH6mMYYJJCcF.json
index 748adec3..5b6c21ca 100644
--- a/src/packs/domains/domainCard_Voice_of_Reason_t3RRGH6mMYYJJCcF.json
+++ b/src/packs/domains/domainCard_Voice_of_Reason_t3RRGH6mMYYJJCcF.json
@@ -23,29 +23,23 @@
       "name": "Advantage",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "De-escalate violent situations.",
+            "priority": null
+          },
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Convince someone to follow your lead.",
+            "priority": null
+          }
+        ]
       },
       "_id": "qWDojebJXMPIP629",
       "img": "icons/skills/social/diplomacy-handshake.webp",
-      "changes": [
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "De-escalate violent situations.",
-          "priority": null
-        },
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Convince someone to follow your lead.",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -72,23 +66,17 @@
       "name": "Emboldened (activate manually)",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.proficiency",
+            "mode": 2,
+            "value": "+1",
+            "priority": null
+          }
+        ]
       },
       "_id": "i5dnpOxTtWV1J46k",
       "img": "icons/skills/melee/unarmed-punch-fist-yellow-red.webp",
-      "changes": [
-        {
-          "key": "system.proficiency",
-          "mode": 2,
-          "value": "+1",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Wall_Walk_1ROT08E1UVBwHLAS.json b/src/packs/domains/domainCard_Wall_Walk_1ROT08E1UVBwHLAS.json
index 066600b1..2a229101 100644
--- a/src/packs/domains/domainCard_Wall_Walk_1ROT08E1UVBwHLAS.json
+++ b/src/packs/domains/domainCard_Wall_Walk_1ROT08E1UVBwHLAS.json
@@ -65,14 +65,8 @@
       "_id": "s1q4O65vtoEDvvUF",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/domains/domainCard_Words_of_Discord_ZjAdi1FSNCDDHI3X.json b/src/packs/domains/domainCard_Words_of_Discord_ZjAdi1FSNCDDHI3X.json
index d743f5e1..eb14eead 100644
--- a/src/packs/domains/domainCard_Words_of_Discord_ZjAdi1FSNCDDHI3X.json
+++ b/src/packs/domains/domainCard_Words_of_Discord_ZjAdi1FSNCDDHI3X.json
@@ -106,14 +106,8 @@
       "_id": "DGp7TSriFWotAvP6",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json b/src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json
index 25340e77..23c1d966 100644
--- a/src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json
+++ b/src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json
@@ -271,12 +271,6 @@
           "_id": "LSeftEwgBbXXkLw3",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json b/src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json
index 86d3eff4..95266957 100644
--- a/src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json
+++ b/src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json
@@ -264,12 +264,6 @@
           "_id": "gCkqvBUljsOsYacB",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/environments/environment_Cult_Ritual_QAXXiOKBDmCTauHD.json b/src/packs/environments/environment_Cult_Ritual_QAXXiOKBDmCTauHD.json
index 1295db59..f3845f23 100644
--- a/src/packs/environments/environment_Cult_Ritual_QAXXiOKBDmCTauHD.json
+++ b/src/packs/environments/environment_Cult_Ritual_QAXXiOKBDmCTauHD.json
@@ -183,21 +183,15 @@
           "_id": "8yNIw8Y7rfMdOqWC",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.rules.dualityRoll.defaultHopeDice",
+                "mode": 5,
+                "value": "d10",
+                "priority": null
+              }
+            ]
           },
-          "changes": [
-            {
-              "key": "system.rules.dualityRoll.defaultHopeDice",
-              "mode": 5,
-              "value": "d10",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -285,14 +279,8 @@
           "_id": "dYQBQq1xIysM0qLo",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": []
           },
-          "changes": [],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -321,27 +309,21 @@
           "_id": "Hxw5lXE77bGzuaOu",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.bonuses.damage.physical.dice",
+                "mode": 2,
+                "value": "1d10",
+                "priority": null
+              },
+              {
+                "key": "system.bonuses.damage.magical.dice",
+                "mode": 2,
+                "value": "1d10",
+                "priority": null
+              }
+            ]
           },
-          "changes": [
-            {
-              "key": "system.bonuses.damage.physical.dice",
-              "mode": 2,
-              "value": "1d10",
-              "priority": null
-            },
-            {
-              "key": "system.bonuses.damage.magical.dice",
-              "mode": 2,
-              "value": "1d10",
-              "priority": null
-            }
-          ],
           "disabled": true,
           "duration": {
             "startTime": null,
diff --git a/src/packs/environments/environment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json b/src/packs/environments/environment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json
index 637cdd41..e7ca7832 100644
--- a/src/packs/environments/environment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json
+++ b/src/packs/environments/environment_Divine_Usurpation_4DLYez7VbMCFDAuZ.json
@@ -397,14 +397,8 @@
           "_id": "znFFS76Nopwb8Yi7",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": []
           },
-          "changes": [],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -428,39 +422,33 @@
           "_id": "i3KYskkA9D4GHbXi",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.difficulty",
+                "mode": 2,
+                "value": "0",
+                "priority": null
+              },
+              {
+                "key": "system.bonuses.damage.physical.bonus",
+                "mode": 2,
+                "value": "0",
+                "priority": null
+              },
+              {
+                "key": "system.bonuses.damage.magical.bonus",
+                "mode": 2,
+                "value": "0",
+                "priority": null
+              },
+              {
+                "key": "system.bonuses.roll.attack.bonus",
+                "mode": 2,
+                "value": "0",
+                "priority": null
+              }
+            ]
           },
-          "changes": [
-            {
-              "key": "system.difficulty",
-              "mode": 2,
-              "value": "0",
-              "priority": null
-            },
-            {
-              "key": "system.bonuses.damage.physical.bonus",
-              "mode": 2,
-              "value": "0",
-              "priority": null
-            },
-            {
-              "key": "system.bonuses.damage.magical.bonus",
-              "mode": 2,
-              "value": "0",
-              "priority": null
-            },
-            {
-              "key": "system.bonuses.roll.attack.bonus",
-              "mode": 2,
-              "value": "0",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
diff --git a/src/packs/environments/environment_Haunted_City_OzYbizKraK92FDiI.json b/src/packs/environments/environment_Haunted_City_OzYbizKraK92FDiI.json
index 1bd07a57..f2da690b 100644
--- a/src/packs/environments/environment_Haunted_City_OzYbizKraK92FDiI.json
+++ b/src/packs/environments/environment_Haunted_City_OzYbizKraK92FDiI.json
@@ -203,21 +203,15 @@
           "_id": "S9gl4jqdrziC1F0h",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            }
+            "changes": [
+              {
+                "key": "system.resistance.physical.resistance",
+                "mode": 5,
+                "value": "1",
+                "priority": null
+              }
+            ]
           },
-          "changes": [
-            {
-              "key": "system.resistance.physical.resistance",
-              "mode": 5,
-              "value": "1",
-              "priority": null
-            }
-          ],
           "disabled": false,
           "duration": {
             "startTime": null,
diff --git a/src/packs/environments/environment_Raging_River_t4cdqTfzcqP3H1vJ.json b/src/packs/environments/environment_Raging_River_t4cdqTfzcqP3H1vJ.json
index 6c87c446..21e1bbe5 100644
--- a/src/packs/environments/environment_Raging_River_t4cdqTfzcqP3H1vJ.json
+++ b/src/packs/environments/environment_Raging_River_t4cdqTfzcqP3H1vJ.json
@@ -310,12 +310,6 @@
           "_id": "T0ouSQyR8cVpAn79",
           "type": "base",
           "system": {
-            "rangeDependence": {
-              "enabled": false,
-              "type": "withinRange",
-              "target": "hostile",
-              "range": "melee"
-            },
             "changes": [],
             "duration": {
               "type": "temporary",
diff --git a/src/packs/items/consumables/consumable_Death_Tea_xDnJeF1grkmKck8Q.json b/src/packs/items/consumables/consumable_Death_Tea_xDnJeF1grkmKck8Q.json
index 5fbae976..c3140964 100644
--- a/src/packs/items/consumables/consumable_Death_Tea_xDnJeF1grkmKck8Q.json
+++ b/src/packs/items/consumables/consumable_Death_Tea_xDnJeF1grkmKck8Q.json
@@ -60,14 +60,8 @@
       "_id": "IqlpqsgurXsUEQhs",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/items/consumables/consumable_Featherbone_DpxEMpwfasEBpORU.json b/src/packs/items/consumables/consumable_Featherbone_DpxEMpwfasEBpORU.json
index 9b5bd0df..60801419 100644
--- a/src/packs/items/consumables/consumable_Featherbone_DpxEMpwfasEBpORU.json
+++ b/src/packs/items/consumables/consumable_Featherbone_DpxEMpwfasEBpORU.json
@@ -60,14 +60,8 @@
       "_id": "VfJIJBW96e45xQHY",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/items/consumables/consumable_Gill_Salve_Nvbb9mze6o5D0AEg.json b/src/packs/items/consumables/consumable_Gill_Salve_Nvbb9mze6o5D0AEg.json
index 890c61e4..2e0ac7b6 100644
--- a/src/packs/items/consumables/consumable_Gill_Salve_Nvbb9mze6o5D0AEg.json
+++ b/src/packs/items/consumables/consumable_Gill_Salve_Nvbb9mze6o5D0AEg.json
@@ -60,14 +60,8 @@
       "_id": "5rL9CY5GO9SJcEZq",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/items/consumables/consumable_Grindletooth_Venom_8WkhvSzeOmLdnoLJ.json b/src/packs/items/consumables/consumable_Grindletooth_Venom_8WkhvSzeOmLdnoLJ.json
index 70291404..1472c00a 100644
--- a/src/packs/items/consumables/consumable_Grindletooth_Venom_8WkhvSzeOmLdnoLJ.json
+++ b/src/packs/items/consumables/consumable_Grindletooth_Venom_8WkhvSzeOmLdnoLJ.json
@@ -60,21 +60,15 @@
       "_id": "yx4ZkXeuXgw2KvV4",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.physical.dice",
+            "mode": 2,
+            "value": "1d6",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.physical.dice",
-          "mode": 2,
-          "value": "1d6",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/items/consumables/consumable_Homet_s_Secret_Potion_VSwa1LpQ9PjZKsWF.json b/src/packs/items/consumables/consumable_Homet_s_Secret_Potion_VSwa1LpQ9PjZKsWF.json
index 00eb03f1..9b88b267 100644
--- a/src/packs/items/consumables/consumable_Homet_s_Secret_Potion_VSwa1LpQ9PjZKsWF.json
+++ b/src/packs/items/consumables/consumable_Homet_s_Secret_Potion_VSwa1LpQ9PjZKsWF.json
@@ -60,14 +60,8 @@
       "_id": "QyzXAnvho7lVQQtP",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/items/consumables/consumable_Improved_Grindletooth_Venom_BqBWXXe9T07AMV4u.json b/src/packs/items/consumables/consumable_Improved_Grindletooth_Venom_BqBWXXe9T07AMV4u.json
index 560644b3..ed8ca562 100644
--- a/src/packs/items/consumables/consumable_Improved_Grindletooth_Venom_BqBWXXe9T07AMV4u.json
+++ b/src/packs/items/consumables/consumable_Improved_Grindletooth_Venom_BqBWXXe9T07AMV4u.json
@@ -60,21 +60,15 @@
       "_id": "P7tbNjq58bQ9R1Cc",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.physical.dice",
+            "mode": 2,
+            "value": "1d8",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.physical.dice",
-          "mode": 2,
-          "value": "1d8",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/items/consumables/consumable_Morphing_Clay_f1NHVSIHJJCIOaBl.json b/src/packs/items/consumables/consumable_Morphing_Clay_f1NHVSIHJJCIOaBl.json
index 90dd4fdc..b7f44fea 100644
--- a/src/packs/items/consumables/consumable_Morphing_Clay_f1NHVSIHJJCIOaBl.json
+++ b/src/packs/items/consumables/consumable_Morphing_Clay_f1NHVSIHJJCIOaBl.json
@@ -60,12 +60,6 @@
       "_id": "rMno0zO5Cbwlu4zn",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "shortRest"
diff --git a/src/packs/items/consumables/consumable_Mythic_Dust_Zsh2AvZr8EkGtLyw.json b/src/packs/items/consumables/consumable_Mythic_Dust_Zsh2AvZr8EkGtLyw.json
index 342bf60b..62d9e6bf 100644
--- a/src/packs/items/consumables/consumable_Mythic_Dust_Zsh2AvZr8EkGtLyw.json
+++ b/src/packs/items/consumables/consumable_Mythic_Dust_Zsh2AvZr8EkGtLyw.json
@@ -60,21 +60,15 @@
       "_id": "L68lFhuWdS3ppDxR",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.magical.dice",
+            "mode": 2,
+            "value": "1d12",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.magical.dice",
-          "mode": 2,
-          "value": "1d12",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/items/consumables/consumable_Ogre_Musk_qr1bosjFcUfuwq4B.json b/src/packs/items/consumables/consumable_Ogre_Musk_qr1bosjFcUfuwq4B.json
index 59e51e80..6e384417 100644
--- a/src/packs/items/consumables/consumable_Ogre_Musk_qr1bosjFcUfuwq4B.json
+++ b/src/packs/items/consumables/consumable_Ogre_Musk_qr1bosjFcUfuwq4B.json
@@ -60,12 +60,6 @@
       "_id": "n73d0J4oMCBIPWHN",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "shortRest"
diff --git a/src/packs/items/consumables/consumable_Redthorn_Saliva_s2Exl2XFuoOhtIov.json b/src/packs/items/consumables/consumable_Redthorn_Saliva_s2Exl2XFuoOhtIov.json
index 69edf2df..0a2b6469 100644
--- a/src/packs/items/consumables/consumable_Redthorn_Saliva_s2Exl2XFuoOhtIov.json
+++ b/src/packs/items/consumables/consumable_Redthorn_Saliva_s2Exl2XFuoOhtIov.json
@@ -60,21 +60,15 @@
       "_id": "tWf00ezdpxQQLuZ1",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.physical.dice",
+            "mode": 2,
+            "value": "1d12",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.physical.dice",
-          "mode": 2,
-          "value": "1d12",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/items/consumables/consumable_Vial_of_Moondrip_VqEX5YwK5oL3r1t6.json b/src/packs/items/consumables/consumable_Vial_of_Moondrip_VqEX5YwK5oL3r1t6.json
index 3fc572fd..b81a2604 100644
--- a/src/packs/items/consumables/consumable_Vial_of_Moondrip_VqEX5YwK5oL3r1t6.json
+++ b/src/packs/items/consumables/consumable_Vial_of_Moondrip_VqEX5YwK5oL3r1t6.json
@@ -60,12 +60,6 @@
       "_id": "548KAUPcSbQLsivh",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "shortRest"
diff --git a/src/packs/items/consumables/consumable_Wingsprout_n10vozlmosVR6lo4.json b/src/packs/items/consumables/consumable_Wingsprout_n10vozlmosVR6lo4.json
index 1bdd4bc0..e0ea5ea5 100644
--- a/src/packs/items/consumables/consumable_Wingsprout_n10vozlmosVR6lo4.json
+++ b/src/packs/items/consumables/consumable_Wingsprout_n10vozlmosVR6lo4.json
@@ -60,14 +60,8 @@
       "_id": "80F8gAn7ejhhNL7R",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/items/loot/loot_Bag_of_Ficklesand_v758j4FwNVAurhYK.json b/src/packs/items/loot/loot_Bag_of_Ficklesand_v758j4FwNVAurhYK.json
index 2cb80d86..44565535 100644
--- a/src/packs/items/loot/loot_Bag_of_Ficklesand_v758j4FwNVAurhYK.json
+++ b/src/packs/items/loot/loot_Bag_of_Ficklesand_v758j4FwNVAurhYK.json
@@ -74,14 +74,8 @@
       "_id": "Ouq3xWzj5rf6olVs",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/items/loot/loot_Charging_Quiver_gsUDP90d4SRtLEUn.json b/src/packs/items/loot/loot_Charging_Quiver_gsUDP90d4SRtLEUn.json
index ee7d7a10..8f9a5904 100644
--- a/src/packs/items/loot/loot_Charging_Quiver_gsUDP90d4SRtLEUn.json
+++ b/src/packs/items/loot/loot_Charging_Quiver_gsUDP90d4SRtLEUn.json
@@ -20,27 +20,21 @@
       "_id": "0zebbOsyjkm9IqE6",
       "img": "icons/weapons/ammunition/arrow-broadhead-glowing-orange.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.physical.bonus",
+            "mode": 2,
+            "value": "@system.tier",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.magical.bonus",
+            "mode": 2,
+            "value": "@system.tier",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.physical.bonus",
-          "mode": 2,
-          "value": "@system.tier",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.magical.bonus",
-          "mode": 2,
-          "value": "@system.tier",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/items/loot/loot_Glamour_Stone_Pj17cvdJ1XG1jv6I.json b/src/packs/items/loot/loot_Glamour_Stone_Pj17cvdJ1XG1jv6I.json
index 424d7a04..0521ccd8 100644
--- a/src/packs/items/loot/loot_Glamour_Stone_Pj17cvdJ1XG1jv6I.json
+++ b/src/packs/items/loot/loot_Glamour_Stone_Pj17cvdJ1XG1jv6I.json
@@ -57,14 +57,8 @@
       "_id": "K5SB6tfuDkdVaQYe",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/items/loot/loot_Piercing_Arrows_I63LTFD6GXHgyGpR.json b/src/packs/items/loot/loot_Piercing_Arrows_I63LTFD6GXHgyGpR.json
index b87bd1b0..1dcf503c 100644
--- a/src/packs/items/loot/loot_Piercing_Arrows_I63LTFD6GXHgyGpR.json
+++ b/src/packs/items/loot/loot_Piercing_Arrows_I63LTFD6GXHgyGpR.json
@@ -43,27 +43,21 @@
       "_id": "lRfqfbwlfxzPbE6U",
       "img": "icons/weapons/ammunition/arrow-broadhead-glowing-orange.webp",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.physical.bonus",
+            "mode": 2,
+            "value": "@system.proficiency",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.magical.bonus",
+            "mode": 2,
+            "value": "@system.proficiency",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.physical.bonus",
-          "mode": 2,
-          "value": "@system.proficiency",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.magical.bonus",
-          "mode": 2,
-          "value": "@system.proficiency",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/items/loot/loot_Ring_of_Resistance_aUqRifqR5JXXa1dN.json b/src/packs/items/loot/loot_Ring_of_Resistance_aUqRifqR5JXXa1dN.json
index 3668b6b7..47f38431 100644
--- a/src/packs/items/loot/loot_Ring_of_Resistance_aUqRifqR5JXXa1dN.json
+++ b/src/packs/items/loot/loot_Ring_of_Resistance_aUqRifqR5JXXa1dN.json
@@ -50,27 +50,21 @@
       "_id": "Sj7uGf560T7u4rlX",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.resistance.magical.resistance",
+            "mode": 5,
+            "value": "1",
+            "priority": null
+          },
+          {
+            "key": "system.resistance.physical.resistance",
+            "mode": 5,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.resistance.magical.resistance",
-          "mode": 5,
-          "value": "1",
-          "priority": null
-        },
-        {
-          "key": "system.resistance.physical.resistance",
-          "mode": 5,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/items/loot/loot_Ring_of_Silence_K1ysGnTpNyxPu5Au.json b/src/packs/items/loot/loot_Ring_of_Silence_K1ysGnTpNyxPu5Au.json
index 3521098d..b44419e6 100644
--- a/src/packs/items/loot/loot_Ring_of_Silence_K1ysGnTpNyxPu5Au.json
+++ b/src/packs/items/loot/loot_Ring_of_Silence_K1ysGnTpNyxPu5Au.json
@@ -57,14 +57,8 @@
       "_id": "9JSLRu7amQ4iuIO7",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/items/weapons/weapon_Aantari_Bow_ijodu5yNBoMxpkHV.json b/src/packs/items/weapons/weapon_Aantari_Bow_ijodu5yNBoMxpkHV.json
index 7b51d436..975b2489 100644
--- a/src/packs/items/weapons/weapon_Aantari_Bow_ijodu5yNBoMxpkHV.json
+++ b/src/packs/items/weapons/weapon_Aantari_Bow_ijodu5yNBoMxpkHV.json
@@ -113,22 +113,16 @@
       "name": "Reliable",
       "description": "+1 to attack rolls",
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.roll.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "1"
-        }
-      ],
       "_id": "nRNnU57i7RMJoklC",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "1"
+          }
+        ]
       },
       "disabled": false,
       "duration": {
diff --git a/src/packs/items/weapons/weapon_Advanced_Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json b/src/packs/items/weapons/weapon_Advanced_Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json
index a727bcd5..8910a1a4 100644
--- a/src/packs/items/weapons/weapon_Advanced_Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json
+++ b/src/packs/items/weapons/weapon_Advanced_Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json
@@ -112,22 +112,16 @@
       "name": "Reliable",
       "description": "+1 to attack rolls",
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.roll.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "1"
-        }
-      ],
       "_id": "VnV5X9MBMabhz47b",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "1"
+          }
+        ]
       },
       "disabled": false,
       "duration": {
diff --git a/src/packs/items/weapons/weapon_Advanced_Broadsword_WtQAGz0TUgz8Xg70.json b/src/packs/items/weapons/weapon_Advanced_Broadsword_WtQAGz0TUgz8Xg70.json
index 4581c52f..23c78cc8 100644
--- a/src/packs/items/weapons/weapon_Advanced_Broadsword_WtQAGz0TUgz8Xg70.json
+++ b/src/packs/items/weapons/weapon_Advanced_Broadsword_WtQAGz0TUgz8Xg70.json
@@ -113,22 +113,16 @@
       "name": "Reliable",
       "description": "+1 to attack rolls",
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.roll.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "1"
-        }
-      ],
       "_id": "wu2AmDvgeWI3hmRQ",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "1"
+          }
+        ]
       },
       "disabled": false,
       "duration": {
diff --git a/src/packs/items/weapons/weapon_Advanced_Shortsword_p3nz5CaGUoyuGVg0.json b/src/packs/items/weapons/weapon_Advanced_Shortsword_p3nz5CaGUoyuGVg0.json
index dd48db21..64337b2b 100644
--- a/src/packs/items/weapons/weapon_Advanced_Shortsword_p3nz5CaGUoyuGVg0.json
+++ b/src/packs/items/weapons/weapon_Advanced_Shortsword_p3nz5CaGUoyuGVg0.json
@@ -113,20 +113,20 @@
       "name": "Paired",
       "description": "Add this Secondary Weapon's tier + 1 to your primary weapon against targets within Melee range",
       "img": "icons/skills/melee/weapons-crossed-swords-yellow-teal.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.damage.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "ITEM.@system.tier + 1"
-        }
-      ],
       "system": {
         "rangeDependence": {
           "enabled": true,
           "range": "melee",
           "target": "hostile",
           "type": "withinRange"
-        }
+        },
+        "changes": [
+          {
+            "key": "system.bonuses.damage.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "ITEM.@system.tier + 1"
+          }
+        ]
       },
       "_id": "zQMaG3JcUWJR9k2L",
       "type": "base",
diff --git a/src/packs/items/weapons/weapon_Advanced_Small_Dagger_0thN0BpN05KT8Avx.json b/src/packs/items/weapons/weapon_Advanced_Small_Dagger_0thN0BpN05KT8Avx.json
index a63789f3..55bcc11f 100644
--- a/src/packs/items/weapons/weapon_Advanced_Small_Dagger_0thN0BpN05KT8Avx.json
+++ b/src/packs/items/weapons/weapon_Advanced_Small_Dagger_0thN0BpN05KT8Avx.json
@@ -113,20 +113,20 @@
       "name": "Paired",
       "description": "Add this Secondary Weapon's tier + 1 to your primary weapon against targets within Melee range",
       "img": "icons/skills/melee/weapons-crossed-swords-yellow-teal.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.damage.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "ITEM.@system.tier + 1"
-        }
-      ],
       "system": {
         "rangeDependence": {
           "enabled": true,
-          "range": "melee",
+          "type": "withinRange",
           "target": "hostile",
-          "type": "withinRange"
-        }
+          "range": "melee"
+        },
+        "changes": [
+          {
+            "key": "system.bonuses.damage.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "ITEM.@system.tier + 1"
+          }
+        ]
       },
       "_id": "6tJmTBsumbPmEwkY",
       "type": "base",
diff --git a/src/packs/items/weapons/weapon_Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json b/src/packs/items/weapons/weapon_Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json
index 6959fb30..4ee53b92 100644
--- a/src/packs/items/weapons/weapon_Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json
+++ b/src/packs/items/weapons/weapon_Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json
@@ -113,22 +113,16 @@
       "name": "Reliable",
       "description": "+1 to attack rolls",
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.roll.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "1"
-        }
-      ],
       "_id": "dXHsy9qr5FWZqsVq",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "1"
+          }
+        ]
       },
       "disabled": false,
       "duration": {
diff --git a/src/packs/items/weapons/weapon_Broadsword_1cwWNt4sqlgA8gCT.json b/src/packs/items/weapons/weapon_Broadsword_1cwWNt4sqlgA8gCT.json
index 87c6f7e8..3e7662da 100644
--- a/src/packs/items/weapons/weapon_Broadsword_1cwWNt4sqlgA8gCT.json
+++ b/src/packs/items/weapons/weapon_Broadsword_1cwWNt4sqlgA8gCT.json
@@ -113,22 +113,16 @@
       "name": "Reliable",
       "description": "+1 to attack rolls",
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.roll.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "1"
-        }
-      ],
       "_id": "mqcpj2cFAprf2AmY",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "1"
+          }
+        ]
       },
       "disabled": false,
       "duration": {
diff --git a/src/packs/items/weapons/weapon_Improved_Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json b/src/packs/items/weapons/weapon_Improved_Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json
index 33f96030..71f03625 100644
--- a/src/packs/items/weapons/weapon_Improved_Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json
+++ b/src/packs/items/weapons/weapon_Improved_Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json
@@ -112,22 +112,16 @@
       "name": "Reliable",
       "description": "+1 to attack rolls",
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.roll.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "1"
-        }
-      ],
       "_id": "1f6fFhOLwZrmA6e5",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "1"
+          }
+        ]
       },
       "disabled": false,
       "duration": {
diff --git a/src/packs/items/weapons/weapon_Improved_Broadsword_OcKeLJxvmdT81VBc.json b/src/packs/items/weapons/weapon_Improved_Broadsword_OcKeLJxvmdT81VBc.json
index 6d6f1921..c0b2d460 100644
--- a/src/packs/items/weapons/weapon_Improved_Broadsword_OcKeLJxvmdT81VBc.json
+++ b/src/packs/items/weapons/weapon_Improved_Broadsword_OcKeLJxvmdT81VBc.json
@@ -113,22 +113,16 @@
       "name": "Reliable",
       "description": "+1 to attack rolls",
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.roll.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "1"
-        }
-      ],
       "_id": "228lcQpohdJ3Bbga",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "1"
+          }
+        ]
       },
       "disabled": false,
       "duration": {
diff --git a/src/packs/items/weapons/weapon_Improved_Shortsword_rSyBNRwemBVuTo3H.json b/src/packs/items/weapons/weapon_Improved_Shortsword_rSyBNRwemBVuTo3H.json
index 96ecd37f..070e2374 100644
--- a/src/packs/items/weapons/weapon_Improved_Shortsword_rSyBNRwemBVuTo3H.json
+++ b/src/packs/items/weapons/weapon_Improved_Shortsword_rSyBNRwemBVuTo3H.json
@@ -113,20 +113,20 @@
       "name": "Paired",
       "description": "Add this Secondary Weapon's tier + 1 to your primary weapon against targets within Melee range",
       "img": "icons/skills/melee/weapons-crossed-swords-yellow-teal.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.damage.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "ITEM.@system.tier + 1"
-        }
-      ],
       "system": {
         "rangeDependence": {
           "enabled": true,
           "range": "melee",
           "target": "hostile",
           "type": "withinRange"
-        }
+        },
+        "changes": [
+          {
+            "key": "system.bonuses.damage.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "ITEM.@system.tier + 1"
+          }
+        ]
       },
       "_id": "UW2fqbhBqvnK1coG",
       "type": "base",
diff --git a/src/packs/items/weapons/weapon_Improved_Small_Dagger_nMuF8ZDZ2aXZVTg6.json b/src/packs/items/weapons/weapon_Improved_Small_Dagger_nMuF8ZDZ2aXZVTg6.json
index 1553d75d..5b0282f1 100644
--- a/src/packs/items/weapons/weapon_Improved_Small_Dagger_nMuF8ZDZ2aXZVTg6.json
+++ b/src/packs/items/weapons/weapon_Improved_Small_Dagger_nMuF8ZDZ2aXZVTg6.json
@@ -113,20 +113,20 @@
       "name": "Paired",
       "description": "Add this Secondary Weapon's tier + 1 to your primary weapon against targets within Melee range",
       "img": "icons/skills/melee/weapons-crossed-swords-yellow-teal.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.damage.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "ITEM.@system.tier + 1"
-        }
-      ],
       "system": {
         "rangeDependence": {
           "enabled": true,
-          "range": "melee",
+          "type": "withinRange",
           "target": "hostile",
-          "type": "withinRange"
-        }
+          "range": "melee"
+        },
+        "changes": [
+          {
+            "key": "system.bonuses.damage.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "ITEM.@system.tier + 1"
+          }
+        ]
       },
       "_id": "PMXG4l85UkXRf41E",
       "type": "base",
diff --git a/src/packs/items/weapons/weapon_Keeper_s_Staff_q382JqMkqLaaFLIr.json b/src/packs/items/weapons/weapon_Keeper_s_Staff_q382JqMkqLaaFLIr.json
index 21fe863b..f511af8b 100644
--- a/src/packs/items/weapons/weapon_Keeper_s_Staff_q382JqMkqLaaFLIr.json
+++ b/src/packs/items/weapons/weapon_Keeper_s_Staff_q382JqMkqLaaFLIr.json
@@ -113,22 +113,16 @@
       "name": "Reliable",
       "description": "+1 to attack rolls",
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.roll.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "1"
-        }
-      ],
       "_id": "LvxPAfrKuRfgubGV",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "1"
+          }
+        ]
       },
       "disabled": false,
       "duration": {
diff --git a/src/packs/items/weapons/weapon_Legendary_Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json b/src/packs/items/weapons/weapon_Legendary_Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json
index f947acac..6d022c8a 100644
--- a/src/packs/items/weapons/weapon_Legendary_Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json
+++ b/src/packs/items/weapons/weapon_Legendary_Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json
@@ -112,22 +112,16 @@
       "name": "Reliable",
       "description": "+1 to attack rolls",
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.roll.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "1"
-        }
-      ],
       "_id": "TvsoAiqHCwgtYat1",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "1"
+          }
+        ]
       },
       "disabled": false,
       "duration": {
diff --git a/src/packs/items/weapons/weapon_Legendary_Broadsword_y3hfTPfZhMognyaJ.json b/src/packs/items/weapons/weapon_Legendary_Broadsword_y3hfTPfZhMognyaJ.json
index 361d0353..3a09f8e4 100644
--- a/src/packs/items/weapons/weapon_Legendary_Broadsword_y3hfTPfZhMognyaJ.json
+++ b/src/packs/items/weapons/weapon_Legendary_Broadsword_y3hfTPfZhMognyaJ.json
@@ -113,22 +113,16 @@
       "name": "Reliable",
       "description": "+1 to attack rolls",
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.roll.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "1"
-        }
-      ],
       "_id": "ujb6VAqjyXmfnnjy",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "1"
+          }
+        ]
       },
       "disabled": false,
       "duration": {
diff --git a/src/packs/items/weapons/weapon_Legendary_Shortsword_dEumq3BIZBk5xYTk.json b/src/packs/items/weapons/weapon_Legendary_Shortsword_dEumq3BIZBk5xYTk.json
index a2203a1d..cfc648de 100644
--- a/src/packs/items/weapons/weapon_Legendary_Shortsword_dEumq3BIZBk5xYTk.json
+++ b/src/packs/items/weapons/weapon_Legendary_Shortsword_dEumq3BIZBk5xYTk.json
@@ -113,20 +113,20 @@
       "name": "Paired",
       "description": "Add this Secondary Weapon's tier + 1 to your primary weapon against targets within Melee range",
       "img": "icons/skills/melee/weapons-crossed-swords-yellow-teal.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.damage.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "ITEM.@system.tier + 1"
-        }
-      ],
       "system": {
         "rangeDependence": {
           "enabled": true,
           "range": "melee",
           "target": "hostile",
           "type": "withinRange"
-        }
+        },
+        "changes": [
+          {
+            "key": "system.bonuses.damage.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "ITEM.@system.tier + 1"
+          }
+        ]
       },
       "_id": "ebloMf4gItx38xkZ",
       "type": "base",
diff --git a/src/packs/items/weapons/weapon_Legendary_Small_Dagger_Px3Rh3kIvAqyISxJ.json b/src/packs/items/weapons/weapon_Legendary_Small_Dagger_Px3Rh3kIvAqyISxJ.json
index cf63bde2..33859bf4 100644
--- a/src/packs/items/weapons/weapon_Legendary_Small_Dagger_Px3Rh3kIvAqyISxJ.json
+++ b/src/packs/items/weapons/weapon_Legendary_Small_Dagger_Px3Rh3kIvAqyISxJ.json
@@ -113,20 +113,20 @@
       "name": "Paired",
       "description": "Add this Secondary Weapon's tier + 1 to your primary weapon against targets within Melee range",
       "img": "icons/skills/melee/weapons-crossed-swords-yellow-teal.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.damage.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "ITEM.@system.tier + 1"
-        }
-      ],
       "system": {
         "rangeDependence": {
           "enabled": true,
-          "range": "melee",
+          "type": "withinRange",
           "target": "hostile",
-          "type": "withinRange"
-        }
+          "range": "melee"
+        },
+        "changes": [
+          {
+            "key": "system.bonuses.damage.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "ITEM.@system.tier + 1"
+          }
+        ]
       },
       "_id": "WAqE3sZFkTefglDq",
       "type": "base",
diff --git a/src/packs/items/weapons/weapon_Shortsword_cjGZpXCoshEqi1FI.json b/src/packs/items/weapons/weapon_Shortsword_cjGZpXCoshEqi1FI.json
index 0ea874f8..61f91b58 100644
--- a/src/packs/items/weapons/weapon_Shortsword_cjGZpXCoshEqi1FI.json
+++ b/src/packs/items/weapons/weapon_Shortsword_cjGZpXCoshEqi1FI.json
@@ -113,21 +113,21 @@
       "name": "Paired",
       "description": "<p>Add this Secondary Weapon's tier + 1 to your primary weapon against targets within Melee range</p>",
       "img": "icons/skills/melee/weapons-crossed-swords-yellow-teal.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.damage.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "ITEM.@system.tier + 1",
-          "priority": null
-        }
-      ],
       "system": {
         "rangeDependence": {
           "enabled": true,
           "range": "melee",
           "target": "hostile",
           "type": "withinRange"
-        }
+        },
+        "changes": [
+          {
+            "key": "system.bonuses.damage.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "ITEM.@system.tier + 1",
+            "priority": null
+          }
+        ]
       },
       "_id": "djNtNpasgNDRP8Dd",
       "type": "base",
diff --git a/src/packs/items/weapons/weapon_Small_Dagger_wKklDxs5nkzILNp4.json b/src/packs/items/weapons/weapon_Small_Dagger_wKklDxs5nkzILNp4.json
index 058d138e..ddaa312f 100644
--- a/src/packs/items/weapons/weapon_Small_Dagger_wKklDxs5nkzILNp4.json
+++ b/src/packs/items/weapons/weapon_Small_Dagger_wKklDxs5nkzILNp4.json
@@ -113,20 +113,20 @@
       "name": "Paired",
       "description": "Add this Secondary Weapon's tier + 1 to your primary weapon against targets within Melee range",
       "img": "icons/skills/melee/weapons-crossed-swords-yellow-teal.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.damage.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "ITEM.@system.tier + 1"
-        }
-      ],
       "system": {
         "rangeDependence": {
           "enabled": true,
-          "range": "melee",
+          "type": "withinRange",
           "target": "hostile",
-          "type": "withinRange"
-        }
+          "range": "melee"
+        },
+        "changes": [
+          {
+            "key": "system.bonuses.damage.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "ITEM.@system.tier + 1"
+          }
+        ]
       },
       "_id": "HKh73AHxImdgxgTg",
       "type": "base",
diff --git a/src/packs/items/weapons/weapon_Thistlebow_I1nDGpulg29GpWOW.json b/src/packs/items/weapons/weapon_Thistlebow_I1nDGpulg29GpWOW.json
index 18f635eb..3821342f 100644
--- a/src/packs/items/weapons/weapon_Thistlebow_I1nDGpulg29GpWOW.json
+++ b/src/packs/items/weapons/weapon_Thistlebow_I1nDGpulg29GpWOW.json
@@ -113,22 +113,16 @@
       "name": "Reliable",
       "description": "+1 to attack rolls",
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.roll.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "1"
-        }
-      ],
       "_id": "G9mMGxBSexwjWTYV",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "1"
+          }
+        ]
       },
       "disabled": false,
       "duration": {
diff --git a/src/packs/items/weapons/weapon_War_Scythe_z6yEdFYQJ5IzgTX3.json b/src/packs/items/weapons/weapon_War_Scythe_z6yEdFYQJ5IzgTX3.json
index 0c57dd50..df9186ac 100644
--- a/src/packs/items/weapons/weapon_War_Scythe_z6yEdFYQJ5IzgTX3.json
+++ b/src/packs/items/weapons/weapon_War_Scythe_z6yEdFYQJ5IzgTX3.json
@@ -113,22 +113,16 @@
       "name": "Reliable",
       "description": "+1 to attack rolls",
       "img": "icons/skills/melee/strike-sword-slashing-red.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.roll.primaryWeapon.bonus",
-          "mode": 2,
-          "value": "1"
-        }
-      ],
       "_id": "cOYeI9TxHXpDwszu",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.primaryWeapon.bonus",
+            "mode": 2,
+            "value": "1"
+          }
+        ]
       },
       "disabled": false,
       "duration": {
diff --git a/src/packs/subclasses/feature_Act_of_Reprisal_k7vvMJtEcxMWUUrW.json b/src/packs/subclasses/feature_Act_of_Reprisal_k7vvMJtEcxMWUUrW.json
index 5dee0c1c..4c862887 100644
--- a/src/packs/subclasses/feature_Act_of_Reprisal_k7vvMJtEcxMWUUrW.json
+++ b/src/packs/subclasses/feature_Act_of_Reprisal_k7vvMJtEcxMWUUrW.json
@@ -54,12 +54,6 @@
       "_id": "9Uo0yOYGn3vandPp",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [],
         "duration": {
           "type": "temporary",
diff --git a/src/packs/subclasses/feature_Adrenaline_uByM34yQlw38yf1V.json b/src/packs/subclasses/feature_Adrenaline_uByM34yQlw38yf1V.json
index dc25498b..764dd92a 100644
--- a/src/packs/subclasses/feature_Adrenaline_uByM34yQlw38yf1V.json
+++ b/src/packs/subclasses/feature_Adrenaline_uByM34yQlw38yf1V.json
@@ -25,27 +25,21 @@
       "_id": "HMx9uZ54mvMiH95x",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.physical.bonus",
+            "mode": 2,
+            "value": "@system.levelData.level.current",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.magical.bonus",
+            "mode": 2,
+            "value": "@system.levelData.level.current",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.physical.bonus",
-          "mode": 2,
-          "value": "@system.levelData.level.current",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.magical.bonus",
-          "mode": 2,
-          "value": "@system.levelData.level.current",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Advanced_Training_uGcs785h94RMtueH.json b/src/packs/subclasses/feature_Advanced_Training_uGcs785h94RMtueH.json
index 16a5cd79..f15d1efa 100644
--- a/src/packs/subclasses/feature_Advanced_Training_uGcs785h94RMtueH.json
+++ b/src/packs/subclasses/feature_Advanced_Training_uGcs785h94RMtueH.json
@@ -21,23 +21,17 @@
       "name": "Advanced Training",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.companionData.levelupChoices",
+            "mode": 2,
+            "value": "2",
+            "priority": null
+          }
+        ]
       },
       "_id": "bKOuMxhB2Jth3j2T",
       "img": "icons/creatures/mammals/wolf-howl-moon-gray.webp",
-      "changes": [
-        {
-          "key": "system.companionData.levelupChoices",
-          "mode": 2,
-          "value": "2",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Arcane_Charge_yA4MKQ1tbKFiJoDB.json b/src/packs/subclasses/feature_Arcane_Charge_yA4MKQ1tbKFiJoDB.json
index e92b71ad..c884bc6f 100644
--- a/src/packs/subclasses/feature_Arcane_Charge_yA4MKQ1tbKFiJoDB.json
+++ b/src/packs/subclasses/feature_Arcane_Charge_yA4MKQ1tbKFiJoDB.json
@@ -29,23 +29,17 @@
       "name": "Charged",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.magical.bonus",
+            "mode": 2,
+            "value": "+10",
+            "priority": null
+          }
+        ]
       },
       "_id": "z49V45ir45HGHOBB",
       "img": "icons/magic/unholy/strike-hand-glow-pink.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.damage.magical.bonus",
-          "mode": 2,
-          "value": "+10",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Ascendant_fefLgx6kcYWusjBb.json b/src/packs/subclasses/feature_Ascendant_fefLgx6kcYWusjBb.json
index 737930df..845e287d 100644
--- a/src/packs/subclasses/feature_Ascendant_fefLgx6kcYWusjBb.json
+++ b/src/packs/subclasses/feature_Ascendant_fefLgx6kcYWusjBb.json
@@ -21,23 +21,17 @@
       "name": "Ascendant",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.damageThresholds.severe",
+            "mode": 2,
+            "value": "+4",
+            "priority": null
+          }
+        ]
       },
       "_id": "7M8UsvVweRtT3E85",
       "img": "icons/magic/defensive/shield-barrier-deflect-gold.webp",
-      "changes": [
-        {
-          "key": "system.damageThresholds.severe",
-          "mode": 2,
-          "value": "+4",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_At_Ease_xPWFvGvtUjIcqgJq.json b/src/packs/subclasses/feature_At_Ease_xPWFvGvtUjIcqgJq.json
index ce628a2f..abc5fbfc 100644
--- a/src/packs/subclasses/feature_At_Ease_xPWFvGvtUjIcqgJq.json
+++ b/src/packs/subclasses/feature_At_Ease_xPWFvGvtUjIcqgJq.json
@@ -21,23 +21,17 @@
       "name": "At Ease",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.resources.stress.max",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
       "_id": "xbS4Lr3dWpXUCHEi",
       "img": "icons/magic/holy/meditation-chi-focus-blue.webp",
-      "changes": [
-        {
-          "key": "system.resources.stress.max",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Battle_Bonded_hWsKyed1vfILg0I8.json b/src/packs/subclasses/feature_Battle_Bonded_hWsKyed1vfILg0I8.json
index 578be0a3..9f68639f 100644
--- a/src/packs/subclasses/feature_Battle_Bonded_hWsKyed1vfILg0I8.json
+++ b/src/packs/subclasses/feature_Battle_Bonded_hWsKyed1vfILg0I8.json
@@ -21,12 +21,6 @@
       "name": "Battle Bonded",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.evasion",
diff --git a/src/packs/subclasses/feature_Battlemage_Y9eGMewnFZgPvX0M.json b/src/packs/subclasses/feature_Battlemage_Y9eGMewnFZgPvX0M.json
index 9e389095..c9b54d71 100644
--- a/src/packs/subclasses/feature_Battlemage_Y9eGMewnFZgPvX0M.json
+++ b/src/packs/subclasses/feature_Battlemage_Y9eGMewnFZgPvX0M.json
@@ -21,23 +21,17 @@
       "name": "Battlemage",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.resources.hitPoints.max",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
       "_id": "6jjKzvBxAJTHHGoX",
       "img": "icons/equipment/chest/collar-steel.webp",
-      "changes": [
-        {
-          "key": "system.resources.hitPoints.max",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Conjure_Shield_oirsCnN66GOlK3Fa.json b/src/packs/subclasses/feature_Conjure_Shield_oirsCnN66GOlK3Fa.json
index 99b04487..0455de3d 100644
--- a/src/packs/subclasses/feature_Conjure_Shield_oirsCnN66GOlK3Fa.json
+++ b/src/packs/subclasses/feature_Conjure_Shield_oirsCnN66GOlK3Fa.json
@@ -21,23 +21,17 @@
       "name": "Conjure Shield",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.evasion",
+            "mode": 2,
+            "value": "@system.proficiency",
+            "priority": 21
+          }
+        ]
       },
       "_id": "0i7GVOvjH6bK5AUM",
       "img": "icons/magic/defensive/barrier-shield-dome-blue-purple.webp",
-      "changes": [
-        {
-          "key": "system.evasion",
-          "mode": 2,
-          "value": "@system.proficiency",
-          "priority": 21
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Elemental_Aura_2JH9NaOh69yN80Gw.json b/src/packs/subclasses/feature_Elemental_Aura_2JH9NaOh69yN80Gw.json
index e0476a56..cc6ff640 100644
--- a/src/packs/subclasses/feature_Elemental_Aura_2JH9NaOh69yN80Gw.json
+++ b/src/packs/subclasses/feature_Elemental_Aura_2JH9NaOh69yN80Gw.json
@@ -223,12 +223,6 @@
       "_id": "H7W52ps5d3UGmaFr",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": []
       },
       "disabled": false,
@@ -259,12 +253,6 @@
       "_id": "WX5AMEpmUAutB9Hm",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": []
       },
       "disabled": false,
@@ -295,12 +283,6 @@
       "transfer": false,
       "statuses": [],
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.traits.strength.value",
diff --git a/src/packs/subclasses/feature_Elemental_Dominion_EFUJHrkTuyv8uA9l.json b/src/packs/subclasses/feature_Elemental_Dominion_EFUJHrkTuyv8uA9l.json
index 2476046c..5035393f 100644
--- a/src/packs/subclasses/feature_Elemental_Dominion_EFUJHrkTuyv8uA9l.json
+++ b/src/packs/subclasses/feature_Elemental_Dominion_EFUJHrkTuyv8uA9l.json
@@ -141,21 +141,15 @@
       "_id": "FoBFRSXRfGa1zkiX",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "any",
-          "range": "self"
-        }
+        "changes": [
+          {
+            "key": "system.proficiency",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.proficiency",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -184,12 +178,6 @@
       "_id": "bGwFZZT4juuaIRmZ",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "veryFar"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
@@ -232,21 +220,15 @@
       "_id": "edF2zvvlcGf54r2n",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "any",
-          "range": "self"
-        }
+        "changes": [
+          {
+            "key": "system.evasion",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.evasion",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -275,14 +257,8 @@
       "_id": "p5FoUb4JKQFP405d",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Elemental_Incarnation_f37TTgCc0Q3Ih1A1.json b/src/packs/subclasses/feature_Elemental_Incarnation_f37TTgCc0Q3Ih1A1.json
index 45ffde60..e7e282b4 100644
--- a/src/packs/subclasses/feature_Elemental_Incarnation_f37TTgCc0Q3Ih1A1.json
+++ b/src/packs/subclasses/feature_Elemental_Incarnation_f37TTgCc0Q3Ih1A1.json
@@ -243,27 +243,21 @@
       "_id": "7xyUtUbBk5jbNnqY",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "any",
-          "range": "self"
-        }
+        "changes": [
+          {
+            "key": "system.damageThresholds.major",
+            "mode": 2,
+            "value": "@system.proficiency",
+            "priority": 21
+          },
+          {
+            "key": "system.damageThresholds.severe",
+            "mode": 2,
+            "value": "@system.proficiency",
+            "priority": 21
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.damageThresholds.major",
-          "mode": 2,
-          "value": "@system.proficiency",
-          "priority": 21
-        },
-        {
-          "key": "system.damageThresholds.severe",
-          "mode": 2,
-          "value": "@system.proficiency",
-          "priority": 21
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -292,21 +286,15 @@
       "_id": "3ck6CeapLxQVjE2W",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Advantage on Agility Rolls",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Advantage on Agility Rolls",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -335,14 +323,8 @@
       "_id": "Jy6dpEbzkZ2eRDf5",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -371,14 +353,8 @@
       "_id": "ANle8tuOEZIevTWv",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Elementalist_dPcqKN5NeDkjB1HW.json b/src/packs/subclasses/feature_Elementalist_dPcqKN5NeDkjB1HW.json
index 8a6b742a..8ab51263 100644
--- a/src/packs/subclasses/feature_Elementalist_dPcqKN5NeDkjB1HW.json
+++ b/src/packs/subclasses/feature_Elementalist_dPcqKN5NeDkjB1HW.json
@@ -98,21 +98,15 @@
       "_id": "EY87mY6ULfIt3XC8",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "any",
-          "range": "self"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.roll.action.bonus",
+            "mode": 2,
+            "value": "+2",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.roll.action.bonus",
-          "mode": 2,
-          "value": "+2",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
@@ -141,27 +135,21 @@
       "_id": "WwibpgaO6Kkks7aZ",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "any",
-          "range": "self"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.magical.bonus",
+            "mode": 2,
+            "value": "+3",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.physical.bonus",
+            "mode": 2,
+            "value": "+3",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.magical.bonus",
-          "mode": 2,
-          "value": "+3",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.physical.bonus",
-          "mode": 2,
-          "value": "+3",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Elusive_Predator_Cjtc43V3IzAmfIFG.json b/src/packs/subclasses/feature_Elusive_Predator_Cjtc43V3IzAmfIFG.json
index 82cd55a0..865268e9 100644
--- a/src/packs/subclasses/feature_Elusive_Predator_Cjtc43V3IzAmfIFG.json
+++ b/src/packs/subclasses/feature_Elusive_Predator_Cjtc43V3IzAmfIFG.json
@@ -21,12 +21,6 @@
       "name": "Elusive Predator",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.evasion",
diff --git a/src/packs/subclasses/feature_Epic_Poetry_eCoEWkWuZPMZ9C6a.json b/src/packs/subclasses/feature_Epic_Poetry_eCoEWkWuZPMZ9C6a.json
index 0eb3240e..c5814cdc 100644
--- a/src/packs/subclasses/feature_Epic_Poetry_eCoEWkWuZPMZ9C6a.json
+++ b/src/packs/subclasses/feature_Epic_Poetry_eCoEWkWuZPMZ9C6a.json
@@ -20,23 +20,17 @@
       "name": "Rally:d10",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.rally",
+            "mode": 5,
+            "value": "d10",
+            "priority": null
+          }
+        ]
       },
       "_id": "RSmscgGyuHJucF6C",
       "img": "icons/sundries/documents/document-letter-blue.webp",
-      "changes": [
-        {
-          "key": "system.bonuses.rally",
-          "mode": 5,
-          "value": "d10",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Ethereal_Visage_tyGB6wRKjYdIBK1i.json b/src/packs/subclasses/feature_Ethereal_Visage_tyGB6wRKjYdIBK1i.json
index 43039d73..59164f27 100644
--- a/src/packs/subclasses/feature_Ethereal_Visage_tyGB6wRKjYdIBK1i.json
+++ b/src/packs/subclasses/feature_Ethereal_Visage_tyGB6wRKjYdIBK1i.json
@@ -21,23 +21,17 @@
       "name": "Ethereal Visage",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.advantageSources",
+            "mode": 2,
+            "value": "Presence rolls while flying",
+            "priority": null
+          }
+        ]
       },
       "_id": "Ns1DcQ8wo47LhlL3",
       "img": "icons/magic/holy/saint-glass-portrait-halo.webp",
-      "changes": [
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "Presence rolls while flying",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Expert_Training_iCXtOWBKv1FdKdWz.json b/src/packs/subclasses/feature_Expert_Training_iCXtOWBKv1FdKdWz.json
index 06819dc9..e356c3a9 100644
--- a/src/packs/subclasses/feature_Expert_Training_iCXtOWBKv1FdKdWz.json
+++ b/src/packs/subclasses/feature_Expert_Training_iCXtOWBKv1FdKdWz.json
@@ -21,23 +21,17 @@
       "name": "Expert Training",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.companionData.levelupChoices",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
       "_id": "rknTONvaUDZ2Yz1W",
       "img": "icons/creatures/mammals/dog-husky-white-blue.webp",
-      "changes": [
-        {
-          "key": "system.companionData.levelupChoices",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Fleeting_Shadow_EY7Eo6hNGppVL3dR.json b/src/packs/subclasses/feature_Fleeting_Shadow_EY7Eo6hNGppVL3dR.json
index cdebe9b3..2b338bb3 100644
--- a/src/packs/subclasses/feature_Fleeting_Shadow_EY7Eo6hNGppVL3dR.json
+++ b/src/packs/subclasses/feature_Fleeting_Shadow_EY7Eo6hNGppVL3dR.json
@@ -21,23 +21,17 @@
       "name": "Fleeting Shadow",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.evasion",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
       "_id": "hsEwoHkNr2qVwm2H",
       "img": "icons/magic/unholy/projectile-flame-white-purple.webp",
-      "changes": [
-        {
-          "key": "system.evasion",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Gifted_Performer_99U7YWNCxFZHCiT0.json b/src/packs/subclasses/feature_Gifted_Performer_99U7YWNCxFZHCiT0.json
index f65cd041..47a597e7 100644
--- a/src/packs/subclasses/feature_Gifted_Performer_99U7YWNCxFZHCiT0.json
+++ b/src/packs/subclasses/feature_Gifted_Performer_99U7YWNCxFZHCiT0.json
@@ -186,12 +186,6 @@
       "_id": "FK4IdbxluRErfYor",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "close"
-        },
         "changes": [],
         "duration": {
           "type": "temporary"
diff --git a/src/packs/subclasses/feature_Iron_Will_7AVRNyBcd1Nffjtn.json b/src/packs/subclasses/feature_Iron_Will_7AVRNyBcd1Nffjtn.json
index bea62e2b..e45f91e0 100644
--- a/src/packs/subclasses/feature_Iron_Will_7AVRNyBcd1Nffjtn.json
+++ b/src/packs/subclasses/feature_Iron_Will_7AVRNyBcd1Nffjtn.json
@@ -21,23 +21,17 @@
       "name": "Iron Will",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.rules.damageReduction.maxArmorMarked.value",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
       "_id": "htEDIjCEWYtznpRV",
       "img": "icons/equipment/chest/breastplate-helmet-metal.webp",
-      "changes": [
-        {
-          "key": "system.rules.damageReduction.maxArmorMarked.value",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Nemesis_DPKmipNRlSAMs2Cg.json b/src/packs/subclasses/feature_Nemesis_DPKmipNRlSAMs2Cg.json
index 3b2d440c..f3931f8c 100644
--- a/src/packs/subclasses/feature_Nemesis_DPKmipNRlSAMs2Cg.json
+++ b/src/packs/subclasses/feature_Nemesis_DPKmipNRlSAMs2Cg.json
@@ -60,14 +60,8 @@
       "_id": "JoBFHkhLbm4JyuZm",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Ruthless_Predator_Qny2J3R35bvC0Cey.json b/src/packs/subclasses/feature_Ruthless_Predator_Qny2J3R35bvC0Cey.json
index 135447fa..64bde511 100644
--- a/src/packs/subclasses/feature_Ruthless_Predator_Qny2J3R35bvC0Cey.json
+++ b/src/packs/subclasses/feature_Ruthless_Predator_Qny2J3R35bvC0Cey.json
@@ -60,21 +60,15 @@
       "_id": "8BNwCS7ueIQuvn2M",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "any",
-          "range": "self"
-        }
+        "changes": [
+          {
+            "key": "system.proficiency",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.proficiency",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Shadow_Stepper_hAwTXjhyphiE3aeW.json b/src/packs/subclasses/feature_Shadow_Stepper_hAwTXjhyphiE3aeW.json
index 7e6fa730..fcba875a 100644
--- a/src/packs/subclasses/feature_Shadow_Stepper_hAwTXjhyphiE3aeW.json
+++ b/src/packs/subclasses/feature_Shadow_Stepper_hAwTXjhyphiE3aeW.json
@@ -60,14 +60,8 @@
       "_id": "RYri0b9z5kq74U5n",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Transcendence_th6HZwEFnVBjUtqm.json b/src/packs/subclasses/feature_Transcendence_th6HZwEFnVBjUtqm.json
index c03c10b5..6d43ed30 100644
--- a/src/packs/subclasses/feature_Transcendence_th6HZwEFnVBjUtqm.json
+++ b/src/packs/subclasses/feature_Transcendence_th6HZwEFnVBjUtqm.json
@@ -53,12 +53,6 @@
       "name": "Bonus to Threshold",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
         "changes": [
           {
             "key": "system.damageThresholds.severe",
@@ -106,16 +100,10 @@
       "name": "Bonus to Trait",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
       "_id": "cTgSmxkTi89y6sbc",
       "img": "icons/magic/fire/elemental-fire-flying.webp",
-      "changes": [],
       "disabled": true,
       "duration": {
         "startTime": null,
@@ -142,23 +130,17 @@
       "name": "Bonus to Proficiency",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.proficiency",
+            "mode": 2,
+            "value": "+1",
+            "priority": null
+          }
+        ]
       },
       "_id": "oWf3iXf4dawdbmzd",
       "img": "icons/magic/fire/elemental-fire-flying.webp",
-      "changes": [
-        {
-          "key": "system.proficiency",
-          "mode": 2,
-          "value": "+1",
-          "priority": null
-        }
-      ],
       "disabled": true,
       "duration": {
         "startTime": null,
@@ -185,16 +167,10 @@
       "name": "Bonus to Evasion",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
       "_id": "2LCF6lSnWFqNiPs5",
       "img": "icons/magic/fire/elemental-fire-flying.webp",
-      "changes": [],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Undaunted_866b2jjyzXP8nPRQ.json b/src/packs/subclasses/feature_Undaunted_866b2jjyzXP8nPRQ.json
index dc5ae2ec..79c51474 100644
--- a/src/packs/subclasses/feature_Undaunted_866b2jjyzXP8nPRQ.json
+++ b/src/packs/subclasses/feature_Undaunted_866b2jjyzXP8nPRQ.json
@@ -21,29 +21,23 @@
       "name": "Undaunted",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "any",
-          "range": "self"
-        }
+        "changes": [
+          {
+            "key": "system.damageThresholds.severe",
+            "mode": 2,
+            "value": "3",
+            "priority": null
+          },
+          {
+            "key": "system.damageThresholds.major",
+            "mode": 2,
+            "value": "3",
+            "priority": null
+          }
+        ]
       },
       "_id": "zggFRaerHCj1e5F5",
       "img": "icons/skills/melee/shield-block-gray-yellow.webp",
-      "changes": [
-        {
-          "key": "system.damageThresholds.severe",
-          "mode": 2,
-          "value": "3",
-          "priority": null
-        },
-        {
-          "key": "system.damageThresholds.major",
-          "mode": 2,
-          "value": "3",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Unrelenting_4qP7bNyxVHBmr4Rb.json b/src/packs/subclasses/feature_Unrelenting_4qP7bNyxVHBmr4Rb.json
index dea5e345..0b5e89f6 100644
--- a/src/packs/subclasses/feature_Unrelenting_4qP7bNyxVHBmr4Rb.json
+++ b/src/packs/subclasses/feature_Unrelenting_4qP7bNyxVHBmr4Rb.json
@@ -21,29 +21,23 @@
       "name": "Unrelenting",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "any",
-          "range": "self"
-        }
+        "changes": [
+          {
+            "key": "system.damageThresholds.major",
+            "mode": 2,
+            "value": "2",
+            "priority": null
+          },
+          {
+            "key": "system.damageThresholds.severe",
+            "mode": 2,
+            "value": "2",
+            "priority": null
+          }
+        ]
       },
       "_id": "IKb6yutns8EJZ49M",
       "img": "icons/equipment/shield/heater-steel-crystal-red.webp",
-      "changes": [
-        {
-          "key": "system.damageThresholds.major",
-          "mode": 2,
-          "value": "2",
-          "priority": null
-        },
-        {
-          "key": "system.damageThresholds.severe",
-          "mode": 2,
-          "value": "2",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Unwavering_WBiFZaYNoQNhysmN.json b/src/packs/subclasses/feature_Unwavering_WBiFZaYNoQNhysmN.json
index aa898296..bd7172ea 100644
--- a/src/packs/subclasses/feature_Unwavering_WBiFZaYNoQNhysmN.json
+++ b/src/packs/subclasses/feature_Unwavering_WBiFZaYNoQNhysmN.json
@@ -21,29 +21,23 @@
       "name": "Unwavering",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "any",
-          "range": "self"
-        }
+        "changes": [
+          {
+            "key": "system.damageThresholds.major",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          },
+          {
+            "key": "system.damageThresholds.severe",
+            "mode": 2,
+            "value": "1",
+            "priority": null
+          }
+        ]
       },
       "_id": "3wexvo6La4V46aiX",
       "img": "icons/equipment/shield/heater-steel-gold.webp",
-      "changes": [
-        {
-          "key": "system.damageThresholds.major",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        },
-        {
-          "key": "system.damageThresholds.severe",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Vanishing_Act_iyIg1VLwO8C6jvFZ.json b/src/packs/subclasses/feature_Vanishing_Act_iyIg1VLwO8C6jvFZ.json
index 67cfa833..713578e6 100644
--- a/src/packs/subclasses/feature_Vanishing_Act_iyIg1VLwO8C6jvFZ.json
+++ b/src/packs/subclasses/feature_Vanishing_Act_iyIg1VLwO8C6jvFZ.json
@@ -60,14 +60,8 @@
       "_id": "czrwqq44sEr0uJ8O",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": []
       },
-      "changes": [],
       "disabled": true,
       "duration": {
         "startTime": null,
diff --git a/src/packs/subclasses/feature_Wings_of_Light_KkQH0tYhagIqe2MT.json b/src/packs/subclasses/feature_Wings_of_Light_KkQH0tYhagIqe2MT.json
index 5b86e348..51a203fc 100644
--- a/src/packs/subclasses/feature_Wings_of_Light_KkQH0tYhagIqe2MT.json
+++ b/src/packs/subclasses/feature_Wings_of_Light_KkQH0tYhagIqe2MT.json
@@ -94,27 +94,21 @@
       "_id": "PfCwuVbKLxhnrm9X",
       "type": "base",
       "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
+        "changes": [
+          {
+            "key": "system.bonuses.damage.physical.dice",
+            "mode": 2,
+            "value": "+1d8",
+            "priority": null
+          },
+          {
+            "key": "system.bonuses.damage.magical.dice",
+            "mode": 2,
+            "value": "+1d8",
+            "priority": null
+          }
+        ]
       },
-      "changes": [
-        {
-          "key": "system.bonuses.damage.physical.dice",
-          "mode": 2,
-          "value": "+1d8",
-          "priority": null
-        },
-        {
-          "key": "system.bonuses.damage.magical.dice",
-          "mode": 2,
-          "value": "+1d8",
-          "priority": null
-        }
-      ],
       "disabled": false,
       "duration": {
         "startTime": null,
diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less
index 22e34e96..e35f527a 100755
--- a/styles/less/global/elements.less
+++ b/styles/less/global/elements.less
@@ -308,6 +308,10 @@
             min-height: auto;
             row-gap: 0;
 
+            &.active {
+                row-gap: 10px;
+            } 
+
             legend {
                 display: flex;
                 align-items: center;
diff --git a/templates/sheets/activeEffect/changes.hbs b/templates/sheets/activeEffect/changes.hbs
index 37feb845..4d33d8b4 100644
--- a/templates/sheets/activeEffect/changes.hbs
+++ b/templates/sheets/activeEffect/changes.hbs
@@ -14,7 +14,7 @@
         {{/each}}
     </ol>
 
-    <fieldset class="armor-change-container optional">
+    <fieldset class="armor-change-container optional {{#if typeChanges.armor}}active{{/if}}">
         <legend>
             {{localize "DAGGERHEART.GENERAL.armor"}} 
             <input type="checkbox" class="armor-change-checkbox" data-index="{{typedChanges.armor.index}}" {{checked typedChanges.armor}} />
diff --git a/templates/sheets/activeEffect/settings.hbs b/templates/sheets/activeEffect/settings.hbs
index 09b78856..60df488b 100644
--- a/templates/sheets/activeEffect/settings.hbs
+++ b/templates/sheets/activeEffect/settings.hbs
@@ -1,5 +1,5 @@
 <section class="tab{{#if tab.active}} active{{/if}}" data-group="{{tab.group}}" data-tab="{{tab.id}}">
-    <fieldset class="one-column optional">
+    <fieldset class="one-column optional {{#if source.system.stacking}}active{{/if}}">
         <legend>
             {{localize "DAGGERHEART.ACTIVEEFFECT.Config.stacking.title"}} 
             <input type="checkbox" class="stacking-change-checkbox" {{checked source.system.stacking}} />
@@ -13,14 +13,19 @@
         {{/if}}
     </fieldset>
 
-    <fieldset class="one-column">
-        <legend>{{localize "DAGGERHEART.ACTIVEEFFECT.Config.rangeDependence.title"}}</legend>
+    <fieldset class="one-column optional {{#if source.system.rangeDependence}}active{{/if}}">
+        <legend>
+            {{localize "DAGGERHEART.ACTIVEEFFECT.Config.rangeDependence.title"}}
+            <input type="checkbox" class="range-dependence-change-checkbox" {{checked source.system.rangeDependence}} />
+        </legend>
 
-        {{formGroup systemFields.rangeDependence.fields.enabled value=source.system.rangeDependence.enabled localize=true }}
-        {{formGroup systemFields.rangeDependence.fields.type value=source.system.rangeDependence.type localize=true }}
-        {{formGroup systemFields.rangeDependence.fields.target value=source.system.rangeDependence.target localize=true }}
-        {{formGroup systemFields.rangeDependence.fields.range value=source.system.rangeDependence.range localize=true }}
+        {{#if source.system.rangeDependence}}
+            {{formGroup systemFields.rangeDependence.fields.type value=source.system.rangeDependence.type localize=true }}
+            {{formGroup systemFields.rangeDependence.fields.target value=source.system.rangeDependence.target localize=true }}
+            {{formGroup systemFields.rangeDependence.fields.range value=source.system.rangeDependence.range localize=true }}
+        {{/if}}
     </fieldset>
+
     <fieldset class="one-column">
         <legend>{{localize "EFFECT.DURATION.Label"}}</legend>