diff --git a/Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml b/Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml
index 49c989471..037a2cdb0 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml
@@ -170,7 +170,7 @@
 
       <StatusEffect type="OnUse" target="This" Condition="-1.0"/>
 
-      <sound file="alienweapon.ogg" type="OnUse" range="800.0" loop="true"/>
+      <sound file="Content/Items/Artifacts/alienweapon.ogg" type="OnUse" range="800.0" loop="true"/>
       
       <LightComponent LightColor="0.8,0.7,1.0,1.0" Flicker="0.5" range="500">
         <sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5"/>
@@ -211,7 +211,7 @@
 
     <Door canbepicked="false" canbeselected="true" horizontal="true">
       <Sprite texture="Content/Map/ruins.png" sourcerect="0,842,260,54"  depth="0.6" origin="0.0,0.5"/>
-      <sound file="aliendoor.ogg" type="OnUse" range="1000.0"/>
+      <sound file="Content/Items/Artifacts/aliendoor.ogg" type="OnUse" range="1000.0"/>
     </Door>
 
     <ConnectionPanel selectkey="Action" msg="Rewire [Screwdriver]">
@@ -233,7 +233,7 @@
 
     <Door canbepicked="false" canbeselected="true">
       <Sprite texture="Content/Map/ruins.png" sourcerect="842,192,54,259" depth="0.6" origin="0.5,0.0"/>
-      <sound file="aliendoor.ogg" type="OnUse" range="3000.0"/>
+      <sound file="Content/Items/Artifacts/aliendoor.ogg" type="OnUse" range="3000.0"/>
     </Door>
 
     <ConnectionPanel selectkey="Action" msg="Rewire [Screwdriver]">
@@ -288,4 +288,4 @@
       <output name="power_out"/>
     </ConnectionPanel>
   </Item>
-</Items>
\ No newline at end of file
+</Items>
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Button/button.xml b/Barotrauma/BarotraumaShared/Content/Items/Button/button.xml
index 0ab5972d5..8ee76d573 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Button/button.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Button/button.xml
@@ -18,7 +18,7 @@
 
     <Controller direction ="None" canbepicked = "true" msg="Press [E]">
       <RequiredItem name="ID Card" type="Picked" msg="UNAUTHORIZED ACCESS"/>
-      <sound file="beep.ogg" type="OnUse" range="500.0"/>
+      <sound file="Content/Items/Button/beep.ogg" type="OnUse" range="500.0"/>
     </Controller>
 
     <ConnectionPanel selectkey="Action" canbeselected = "true" msg="Rewire [Screwdriver]">
@@ -50,7 +50,7 @@
     <Body width="12" height="16" density="20"/>
 
     <Controller direction="None" canbepicked="true" msg="Press [E]">
-      <sound file="switch.ogg" type="OnUse" range="250.0"/>
+      <sound file="Content/Items/Button/switch.ogg" type="OnUse" range="250.0"/>
     </Controller>
 
     <ConnectionPanel selectkey="Action" canbeselected = "true" msg="Rewire [Screwdriver]">
@@ -63,4 +63,4 @@
       <requireditem name="Wrench" type="Equipped"/>
     </Holdable>
   </Item>
-</Items>
\ No newline at end of file
+</Items>
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
index 4d1b6b7e9..59d9ee794 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
@@ -188,7 +188,7 @@
     <Propulsion force="80" usablein="water" particles="bubbles">
       <RequiredItems name="Battery Cell,Fulgurium Battery Cell" type="Contained" msg="Battery Cell required"/>
       <StatusEffect type="OnUse" target="Contained" Condition="-1.0"/>
-      <sound file="scooter.ogg" type="OnUse" range="500.0" loop="true"/>
+      <sound file="Content/Items/Diving/scooter.ogg" type="OnUse" range="500.0" loop="true"/>
       <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.2" range="800">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.05, 0.5" size="2.0,1.0"/>
       </LightComponent>
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Door/doors.xml b/Barotrauma/BarotraumaShared/Content/Items/Door/doors.xml
index 843bce989..19a10b0c9 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Door/doors.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Door/doors.xml
@@ -11,7 +11,7 @@
       <Sprite texture ="door.png" sourcerect="80,0,19,208" depth="0.05" origin="0.5,0.0"/>
       <WeldedSprite texture ="door.png" sourcerect="99,0,32,188" depth="0.0" origin="0.5,0.5"/>
       <BrokenSprite texture ="door.png" sourcerect="133,0,58,208" depth="0.051" origin="0.5,0.0" scale="true"/>
-      <sound file="door.ogg" type="OnUse" range="500.0"/>
+      <sound file="Content/Items/Door/door.ogg" type="OnUse" range="500.0"/>
       <sound file="Content/Items/Tools/crowbar.ogg" type="OnPicked" range="2000.0"/>
       <StatusEffect type="OnBroken" target="This">
         <sound file="Content/Items/Door/doorBreak2.ogg" range="3000"/>
@@ -45,7 +45,7 @@
       <Sprite texture="door.png" sourcerect="56,0,19,208" depth="0.05" origin="0.5,0.0"/>
       <WeldedSprite texture="door.png" sourcerect="9,0,32,188" depth="0.0" origin="0.5,0.5"/>
       <BrokenSprite texture="door.png" sourcerect="192,0,40,208" depth="0.051" origin="0.5,0.0" scale="true"/>
-      <sound file="door.ogg" type="OnUse" range="500.0"/>
+      <sound file="Content/Items/Door/door.ogg" type="OnUse" range="500.0"/>
       <sound file="Content/Items/Tools/crowbar.ogg" type="OnPicked" range="2000.0"/>
       <StatusEffect type="OnBroken" target="This">
         <sound file="Content/Items/Door/doorBreak1.ogg" range="3000"/>
@@ -79,7 +79,7 @@
       <Sprite texture="hatch.png" sourcerect="128,0,128,19" depth="0.05" origin="0.0,0.5"/>
       <WeldedSprite texture="hatch.png" sourcerect="0,56,108,33" depth="0.0" origin="0.5,0.5"/>
       <BrokenSprite texture="hatch.png" sourcerect="128,21,128,58" depth="0.051" origin="0.0,0.5" scale="true"/>
-      <sound file="door.ogg" type="OnUse" range="500.0"/>
+      <sound file="Content/Items/Door/door.ogg" type="OnUse" range="500.0"/>
       <sound file="Content/Items/Tools/crowbar.ogg" type="OnPicked" range="2000.0"/>
       <StatusEffect type="OnBroken" target="This">
         <sound file="Content/Items/Door/doorBreak1.ogg" range="3000"/>
@@ -110,8 +110,8 @@
 
     <DockingPort IsHorizontal="true" DistanceTolerance="128,64" DockedDistance="64">
       <Sprite texture ="dockingport.png" sourcerect="127,0,112,144" depth="0.05" origin="0.5,0.5"/>
-      <sound file="dockingport1.ogg" type="OnUse" range="1000.0"/>
-      <sound file="dockingport2.ogg" type="OnSecondaryUse" range="1000.0"/>
+      <sound file="Content/Items/Door/dockingport1.ogg" type="OnUse" range="1000.0"/>
+      <sound file="Content/Items/Door/dockingport2.ogg" type="OnSecondaryUse" range="1000.0"/>
       <StatusEffect type="OnBroken" target="This">
         <sound file="Content/Items/Door/doorBreak2.ogg" range="3000"/>
       </StatusEffect>
@@ -150,8 +150,8 @@
 
     <DockingPort IsHorizontal="false" DistanceTolerance="64,128" DockedDistance="64">
       <Sprite texture ="dockingport.png" sourcerect="127,144,48,112" depth="0.05" origin="0.5,0.5"/>
-      <sound file="dockingport1.ogg" type="OnUse" range="1000.0"/>
-      <sound file="dockingport2.ogg" type="OnSecondaryUse" range="1000.0"/>
+      <sound file="Content/Items/Door/dockingport1.ogg" type="OnUse" range="1000.0"/>
+      <sound file="Content/Items/Door/dockingport2.ogg" type="OnSecondaryUse" range="1000.0"/>
       <StatusEffect type="OnBroken" target="This">
         <sound file="Content/Items/Door/doorBreak2.ogg" range="3000"/>
       </StatusEffect>
@@ -193,7 +193,7 @@
       <Sprite texture ="duct.png" sourcerect="66,0,19,19" depth="0.05" origin="-0.4,0.5"/>
       <WeldedSprite texture ="duct.png" sourcerect="33,0,33,33" depth="0.0" origin="0.5,0.5"/>
       <BrokenSprite texture="duct.png" sourcerect="0,34,52,52" depth="0.051" origin="0.2,0.5" scale="true"/>
-      <sound file="duct.ogg" type="OnUse" range="300"/>
+      <sound file="Content/Items/Door/duct.ogg" type="OnUse" range="300"/>
       <sound file="Content/Items/Tools/crowbar.ogg" type="OnPicked" range="500.0"/>
       <StatusEffect type="OnBroken" target="This">
         <sound file="Content/Items/Door/ductBreak.ogg" range="2000"/>
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Engine/engine.xml b/Barotrauma/BarotraumaShared/Content/Items/Engine/engine.xml
index a0fcf1c60..e24f66ca0 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Engine/engine.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Engine/engine.xml
@@ -20,7 +20,7 @@
     <Engine minvoltage="0.5" powerconsumption="2000.0" maxforce="2000" canbeselected = "true">
       <StatusEffect type="InWater" target="This" condition="-2.0"/>
       <GuiFrame rect="0,0,350,160" alignment="Center" style="ItemUI"/>
-      <sound file="engine.ogg" type="OnActive" range="3000.0" volume="CurrentVolume" loop="true"/>
+      <sound file="Content/Items/Engine/engine.ogg" type="OnActive" range="3000.0" volume="CurrentVolume" loop="true"/>
     </Engine>
     
     <ConnectionPanel selectkey="Action" canbeselected = "true" msg="Rewire [Screwdriver]">
@@ -48,7 +48,7 @@
 
     <Engine minvoltage="0.5" powerconsumption="500.0" maxforce="300" canbeselected = "true">
       <GuiFrame rect="0,0,350,160" alignment="Center" style="ItemUI"/>
-      <sound file="engine.ogg" type="OnActive" range="3000.0" volume="CurrentVolume" loop="true"/>
+      <sound file="Content/Items/Engine/engine.ogg" type="OnActive" range="3000.0" volume="CurrentVolume" loop="true"/>
     </Engine>
 
     <ConnectionPanel selectkey="Action" canbeselected = "true" msg="Rewire [Screwdriver]">
@@ -78,7 +78,7 @@
     </Steering>
 
     <Radar canbeselected = "true" powerconsumption="100" displaybordersize="0.2">
-      <sound file="radarPing.ogg" type="OnUse" range="4000.0"/>
+      <sound file="Content/Items/Engine/radarPing.ogg" type="OnUse" range="4000.0"/>
       <GuiFrame rect="0,0,0.5,0.5" alignment="Center" style="ItemUI" color="0.0,0.0,0.0,0.0"/>
       <PingCircle texture="Content/Items/Engine/pingCircle.png" origin="0.5,0.5"/>
       <ScreenOverlay texture="Content/Items/Engine/radarOverlay.png" origin="0.5,0.5"/>
@@ -121,4 +121,4 @@
       <input name="power_in"/>
     </ConnectionPanel>
   </Item>
-</Items>
\ No newline at end of file
+</Items>
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
index 3c9e13d69..7ba864eff 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
@@ -13,7 +13,7 @@
 
       <GuiFrame rect="0,0,600,400" alignment="Center" style="ItemUI"/>
 
-      <sound file="fabricator.ogg" type="OnActive" range="1000.0" loop="true"/>
+      <sound file="Content/Items/Fabricators/fabricator.ogg" type="OnActive" range="1000.0" loop="true"/>
 
       <fabricableitem name="Harpoon Gun" requireditems="Steel Bar, Polycarbonate Bar, Aluminium" requiredtime="20">
         <RequiredSkill name="Construction" level="30"/>
@@ -135,7 +135,7 @@
 
       <GuiFrame rect="0,0,600,400" alignment="Center" style="ItemUI"/>
 
-      <sound file="fabricator.ogg" type="OnActive" range="1000.0" loop="true"/>
+      <sound file="Content/Items/Fabricators/fabricator.ogg" type="OnActive" range="1000.0" loop="true"/>
 
       <fabricableitem name="Medical Syringe" requireditems="Steel Bar" requiredtime="10"/>
       <fabricableitem name="Chloral Hydrate" requireditems="Chlorine, Ethanol" requiredtime="20">
@@ -216,7 +216,7 @@
     <Sprite texture="Content/Items/machines.png" depth="0.8" sourcerect="64,128,64,128"/>
 
     <Deconstructor canbeselected = "true" powerconsumption="500.0">
-      <sound file="deconstructor.ogg" type="OnActive" range="1000.0" loop="true"/>
+      <sound file="Content/Items/Fabricators/deconstructor.ogg" type="OnActive" range="1000.0" loop="true"/>
       
       <GuiFrame rect="0,0,300,200" alignment="Center" style="ItemUI"/>
     </Deconstructor>
@@ -229,4 +229,4 @@
     <ItemContainer capacity="5" canbeselected="true" hideitems="true" hudpos="0.5, 0.4" slotsperrow="5"/>
     <ItemContainer capacity="10" canbeselected="true" hideitems="true" hudpos="0.5, 0.8" slotsperrow="5"/>
   </Item>
-</Items>
\ No newline at end of file
+</Items>
diff --git a/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml b/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml
index ac9a8c006..5a0e92b18 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml
@@ -8,7 +8,7 @@
 
     <OxygenGenerator powerconsumption="1000.0" minvoltage="0.5" canbeselected = "true">
       <StatusEffect type="OnActive" target="Contained" targetnames="Oxygen Tank" Condition="0.5"/>
-      <sound file="oxygengenerator.ogg" type="OnActive" range="1000.0" volume="CurrFlow" volumemultiplier="0.001f" loop="true"/>
+      <sound file="Content/Items/OxygenGenerator/oxygengenerator.ogg" type="OnActive" range="1000.0" volume="CurrFlow" volumemultiplier="0.001f" loop="true"/>
     </OxygenGenerator>
   
     <trigger/>
@@ -31,8 +31,8 @@
     <Sprite texture="vent.png" depth="0.91" sourcerect="0,0,64,64"/>
 
     <Vent>
-      <sound file="ventilation.ogg" type="OnActive" range="600.0" volume="OxygenFlow" volumemultiplier="0.001f" loop="true"/>
+      <sound file="Content/Items/OxygenGenerator/ventilation.ogg" type="OnActive" range="600.0" volume="OxygenFlow" volumemultiplier="0.001f" loop="true"/>
     </Vent>
 
   </Item>
-</Items>
\ No newline at end of file
+</Items>
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Pump/pump.xml b/Barotrauma/BarotraumaShared/Content/Items/Pump/pump.xml
index 54890018e..26f62fe43 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Pump/pump.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Pump/pump.xml
@@ -8,7 +8,7 @@
 
     <Pump canbeselected = "true" maxflow="500" PowerConsumption="300.0" MinVoltage="0.3">
       <GuiFrame rect="0,0,330,145" alignment="Center" style="ItemUI"/>
-      <sound file="pump.ogg" type="OnActive" range="800.0" volume="CurrFlow" volumemultiplier="0.01" loop="true"/>
+      <sound file="Content/Items/Pump/pump.ogg" type="OnActive" range="800.0" volume="CurrFlow" volumemultiplier="0.01" loop="true"/>
     </Pump>
 
     <ConnectionPanel selectkey="Action" canbeselected = "true" msg="Rewire [Screwdriver]">
@@ -30,7 +30,7 @@
 
     <Pump canbeselected = "true" maxflow="100" PowerConsumption="60.0" MinVoltage="0.3">
       <GuiFrame rect="0,0,330,145" alignment="Center" style="ItemUI"/>
-      <sound file="pump.ogg" type="OnActive" range="500.0" volume="CurrFlow" volumemultiplier="0.01" loop="true"/>
+      <sound file="Content/Items/Pump/pump.ogg" type="OnActive" range="500.0" volume="CurrFlow" volumemultiplier="0.01" loop="true"/>
     </Pump>
 
     <ConnectionPanel selectkey="Action" canbeselected = "true" msg="Rewire [Screwdriver]">
@@ -42,4 +42,4 @@
       <input name="set_targetlevel"/>
     </ConnectionPanel>
   </Item>
-</Items>
\ No newline at end of file
+</Items>
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Reactor/reactor.xml b/Barotrauma/BarotraumaShared/Content/Items/Reactor/reactor.xml
index a5a2122bc..840b56a18 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Reactor/reactor.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Reactor/reactor.xml
@@ -26,7 +26,7 @@
       <RequiredSkill name="Construction" level="30"/>
       <StatusEffect type="InWater" target="This" Temperature="-500.0"/>
       <StatusEffect type="OnActive" target="Contained" targetnames="Fuel Rod, Heat Absorber, Temperature Control Circuit" Condition="-0.1" />
-      <sound file="reactor.ogg" type="OnActive" range="2000.0" volume="FissionRate" volumemultiplier="0.02" loop="true"/>
+      <sound file="Content/Items/Reactor/reactor.ogg" type="OnActive" range="2000.0" volume="FissionRate" volumemultiplier="0.02" loop="true"/>
 
       <StatusEffect type="OnBroken" target="This" FissionRate="0.0" disabledeltatime="true">
         <Sound file="Content/Items/Reactor/explosion.ogg" range="5000"/>
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml b/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml
index a3e8dc468..954673d6e 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml
@@ -10,7 +10,7 @@
 
     <Sprite texture ="tools.png" sourcerect="0,17,41,17" depth="0.55"/>
 
-    <!-- the item takes 10 seconds to break down in a deconstructor and turns into a polycarbonate bar and a steel bar -->
+    <!-- the item takes 10 seconds to break down in a deconstructor and turns into a polycarbonate bar, steel bar and aluminium -->
     <Deconstruct time="10">
       <Item name="Polycarbonate Bar"/>
       <Item name="Steel Bar"/>
@@ -35,7 +35,7 @@
       <ParticleEmitterHitItem particle="weldsmoke" particlespersecond="3" anglemin="-5" anglemax="5" velocitymin="10" velocitymax="100"/>
       <ParticleEmitterHitCharacter particle="fleshsmoke" particlespersecond="3" anglemin="-5" anglemax="5" velocitymin="10" velocitymax="100"/>
 
-      <sound file="weldingTool.ogg" type="OnUse" range="500.0" loop="true"/>
+      <sound file="Content/Items/Tools/weldingTool.ogg" type="OnUse" range="500.0" loop="true"/>
 
       <!-- when using, the contained welding fuel tank will detoriate (= lose fuel) -->
       <StatusEffect type="OnUse" target="Contained" targetnames="Welding Fuel Tank" Condition="-1.0"/>
@@ -48,7 +48,7 @@
 
       <!-- construction skill 20 required to use the item -->
       <RequiredSkill name="Construction" level="20"/>
-
+      <!-- if the skill requirement isn't met the welding fuel will be used 3 times as fast -->
       <StatusEffect type="OnFailure" target="Contained" targetnames="Welding Fuel Tank,Oxygen Tank" Condition="-3.0"/>
 
       <LightComponent LightColor="1.0,0.9,0.7,1.0" Flicker="0.5">
@@ -98,7 +98,7 @@
       <ParticleEmitterHitItem particle="plasmasmoke" particlespersecond="3" anglemin="-5" anglemax="5" velocitymin="10" velocitymax="100"/>
       <ParticleEmitterHitCharacter particle="fleshsmoke" particlespersecond="3" anglemin="-5" anglemax="5" velocitymin="10" velocitymax="100"/>
 
-      <sound file="plasmaCutter.ogg" type="OnUse" range="500.0" loop="true"/>
+      <sound file="Content/Items/Tools/plasmaCutter.ogg" type="OnUse" range="500.0" loop="true"/>
 
       <Fixable name="structure"/>
 
@@ -164,7 +164,7 @@
     <RepairTool extinquishamount="60.0" range="500" barrelpos="21,25">
       <ParticleEmitter particle="extinguisher" velocitymin="500.0" velocitymax="650.0" particlespersecond="50"/>
       <StatusEffect type="OnUse" target="This" Condition="-2.0"/>
-      <sound file="extinguisher.ogg" type="OnUse" range="500.0" loop="true"/>
+      <sound file="Content/Items/Tools/extinguisher.ogg" type="OnUse" range="500.0" loop="true"/>
     </RepairTool>
 
     <Propulsion force="-20" usablein="water" particles="bubbles"/>
@@ -330,7 +330,7 @@
 
       <StatusEffect type="OnBroken" target="This" IsOn="false"/>
       
-      <sound file="flare.ogg" type="OnActive" range="800.0" loop="true"/>
+      <sound file="Content/Items/Tools/flare.ogg" type="OnActive" range="800.0" loop="true"/>
     </LightComponent>
   </Item>
 
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
index ec7ea9d76..d9d44e6c9 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
@@ -43,8 +43,8 @@
               holdpos="35,-10" aimpos="35,-10" handle1="-15,-6" handle2="26,7"/>
     
     <RangedWeapon barrelpos="49,10" spread="1" unskilledspread="10">
-      <Sound file="harpoon1.ogg" type="OnUse"/>
-      <Sound file="harpoon2.ogg" type="OnUse"/>
+      <Sound file="Content/Items/Weapons/harpoon1.ogg" type="OnUse"/>
+      <Sound file="Content/Items/Weapons/harpoon2.ogg" type="OnUse"/>
       <StatusEffect type="OnUse">
         <Explosion range="150.0" force="5" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" camerashake="5.0"/>
       </StatusEffect>
@@ -78,7 +78,7 @@
               aimpos="90,10" handle1="-10,-7"/>
     
     <RangedWeapon barrelpos="30,20" spread="0" unskilledspread="10">
-      <Sound file="syringegun.ogg" type="OnUse"/>
+      <Sound file="Content/Items/Weapons/syringegun.ogg" type="OnUse"/>
       <RequiredItems name="Medical Syringe" type="Contained" msg="Please load a Syringe"/>
       <RequiredSkill name="Weapons" level="15"/>
       <RequiredSkill name="Medical" level="30"/>
@@ -128,7 +128,7 @@
               aimpos="90,10" handle1="-11,-7"/>
 
     <RangedWeapon barrelpos="14,6" spread="0" unskilledspread="2">
-      <Sound file="revolver.ogg" type="OnUse" range="3000"/>
+      <Sound file="Content/Items/Weapons/revolver.ogg" type="OnUse" range="3000"/>
       <StatusEffect type="OnUse">
         <Explosion range="150.0" force="5" shockwave="false" smoke="false" flames="false" sparks="false" camerashake="5.0"/>
       </StatusEffect>
@@ -300,7 +300,7 @@
     <Holdable slots="Any,RightHand,LeftHand" aimpos="100,0" handle1="-5,0"/>
 
     <RangedWeapon reload="2">
-      <Sound file="honk.ogg" type="OnUse"/>
+      <Sound file="Content/Items/Weapons/honk.ogg" type="OnUse"/>
     </RangedWeapon>
 
   </Item>
