diff --git a/resources/Schema/Entities/RayAssaultBlue.xml b/resources/Schema/Entities/RayAssaultBlue.xml
index e36c4073..b474ff2c 100644
--- a/resources/Schema/Entities/RayAssaultBlue.xml
+++ b/resources/Schema/Entities/RayAssaultBlue.xml
@@ -5,6 +5,7 @@
     <c:Lifetime>
       <Lifetime>0.079999998211860657</Lifetime>
     </c:Lifetime>
+    <c:NetworkComponent/>
     <c:Transform/>
   </Components>
 
diff --git a/resources/Schema/Entities/RayDefenderBlue.xml b/resources/Schema/Entities/RayDefenderBlue.xml
index 1c6e7ff2..56a416ce 100644
--- a/resources/Schema/Entities/RayDefenderBlue.xml
+++ b/resources/Schema/Entities/RayDefenderBlue.xml
@@ -5,6 +5,7 @@
     <c:Lifetime>
       <Lifetime>0.079999998211860657</Lifetime>
     </c:Lifetime>
+    <c:NetworkComponent/>
     <c:Transform/>
   </Components>
 
diff --git a/resources/Schema/Entities/RaySideArmBlue.xml b/resources/Schema/Entities/RaySideArmBlue.xml
index 8a1648bc..f48a8fc3 100644
--- a/resources/Schema/Entities/RaySideArmBlue.xml
+++ b/resources/Schema/Entities/RaySideArmBlue.xml
@@ -8,6 +8,7 @@
     <c:Fade>
       <FadeTime>0.080000000000000002</FadeTime>
     </c:Fade>
+    <c:NetworkComponent/>
     <c:Transform/>
   </Components>
 
diff --git a/resources/Schema/Entities/SidearmWeaponBlueWorld.xml b/resources/Schema/Entities/SidearmWeaponBlueWorld.xml
index d497e955..2b81d63b 100644
--- a/resources/Schema/Entities/SidearmWeaponBlueWorld.xml
+++ b/resources/Schema/Entities/SidearmWeaponBlueWorld.xml
@@ -9,16 +9,37 @@
   </Components>
 
   <Children>
-    <Entity name="WeaponMuzzle">
+    <Entity name="Muzzle">
       <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
-        </c:Spawner>
         <c:Transform>
-          <Position X="0.0123999491" Y="0.102453232" Z="-0.273824364"/>
+          <Position X="-0.0169804785" Y="-0.0188358482" Z="-0.222064406"/>
         </c:Transform>
       </Components>
-      <Children/>
+      <Children>
+        <Entity name="WeaponMuzzleRay">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/RaySideArmBlue.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0" Y="0.125075191" Z="-0.206788138"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="WeaponMuzzleFlash">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/MuzzleFlashSideArmBlue.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0.0240342002" Y="0.116005458" Z="-0.0419839472"/>
+              <Scale X="0.5" Y="0.5" Z="0.5"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
     </Entity>
   </Children>
 
diff --git a/resources/Schema/Entities/WeaponAssaultBlueWorld.xml b/resources/Schema/Entities/WeaponAssaultBlueWorld.xml
index cb1d8292..efb2d1a4 100644
--- a/resources/Schema/Entities/WeaponAssaultBlueWorld.xml
+++ b/resources/Schema/Entities/WeaponAssaultBlueWorld.xml
@@ -32,7 +32,7 @@
               <EntityFile>Schema/Entities/MuzzleFlashBlue.xml</EntityFile>
             </c:Spawner>
             <c:Transform>
-              <Position X="0.000221854658" Y="-0.000376355601" Z="0"/>
+              <Position X="-8.41593719e-05" Y="-0.000816107844" Z="0.0612007342"/>
             </c:Transform>
           </Components>
           <Children/>
diff --git a/resources/Schema/Entities/WeaponDefenderBlueWorld.xml b/resources/Schema/Entities/WeaponDefenderBlueWorld.xml
index 40bd0a40..8c7de4ed 100644
--- a/resources/Schema/Entities/WeaponDefenderBlueWorld.xml
+++ b/resources/Schema/Entities/WeaponDefenderBlueWorld.xml
@@ -21,7 +21,7 @@
     <Entity name="Muzzle">
       <Components>
         <c:Transform>
-          <Position X="0.137428522" Y="-0.145251781" Z="-0.590083241"/>
+          <Position X="-0.0100463303" Y="0.0624945536" Z="-0.372351319"/>
         </c:Transform>
       </Components>
       <Children>
@@ -31,7 +31,7 @@
               <EntityFile>Schema/Entities/RayDefenderBlue.xml</EntityFile>
             </c:Spawner>
             <c:Transform>
-              <Position X="0.0180841181" Y="0.0252480619" Z="-0.663679719"/>
+              <Position X="0.0180841181" Y="0.0252480619" Z="-0.551815569"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -46,7 +46,231 @@
               <Scale X="1.5" Y="1.5" Z="1"/>
             </c:Transform>
           </Components>
-          <Children/>
+          <Children>
+            <Entity name="MuzzleFlashFire">
+              <Components>
+                <c:Lifetime>
+                  <Lifetime>0.080000000000000002</Lifetime>
+                </c:Lifetime>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="Level1">
+                  <Components>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="Cone1Outside">
+                      <Components>
+                        <c:Fade>
+                          <FadeTime>0.080000000000000002</FadeTime>
+                          <Reverse>true</Reverse>
+                        </c:Fade>
+                        <c:Model>
+                          <GlowIntensity>2</GlowIntensity>
+                          <Resource>Models/Effects/MuzzleFlash/Blue/Cone1Outside.mesh</Resource>
+                          <Shadow>false</Shadow>
+                          <Transparent>true</Transparent>
+                        </c:Model>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="Cone1Inside">
+                      <Components>
+                        <c:Fade>
+                          <FadeTime>0.080000000000000002</FadeTime>
+                          <Reverse>true</Reverse>
+                        </c:Fade>
+                        <c:Model>
+                          <GlowIntensity>2</GlowIntensity>
+                          <Resource>Models/Effects/MuzzleFlash/Blue/Cone1Inside.mesh</Resource>
+                          <Shadow>false</Shadow>
+                          <Transparent>true</Transparent>
+                        </c:Model>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="Level2">
+                  <Components>
+                    <c:Transform>
+                      <Position X="0.000134464673" Y="8.11116188e-05" Z="-0.0197895896"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="Cone2Inside">
+                      <Components>
+                        <c:Fade>
+                          <FadeTime>0.080000000000000002</FadeTime>
+                          <Reverse>true</Reverse>
+                        </c:Fade>
+                        <c:Model>
+                          <GlowIntensity>2</GlowIntensity>
+                          <Resource>Models/Effects/MuzzleFlash/Blue/Cone2Inside.mesh</Resource>
+                          <Shadow>false</Shadow>
+                          <Transparent>true</Transparent>
+                        </c:Model>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="Cone2Outside">
+                      <Components>
+                        <c:Fade>
+                          <FadeTime>0.080000000000000002</FadeTime>
+                          <Reverse>true</Reverse>
+                        </c:Fade>
+                        <c:Model>
+                          <GlowIntensity>2</GlowIntensity>
+                          <Resource>Models/Effects/MuzzleFlash/Blue/Cone2Outside.mesh</Resource>
+                          <Shadow>false</Shadow>
+                          <Transparent>true</Transparent>
+                        </c:Model>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="Level3">
+                  <Components>
+                    <c:Transform>
+                      <Position X="0.000216802931" Y="0.000130779619" Z="-0.0319075659"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="PlaneLeft">
+                      <Components>
+                        <c:Fade>
+                          <FadeTime>0.080000000000000002</FadeTime>
+                          <Reverse>true</Reverse>
+                        </c:Fade>
+                        <c:Model>
+                          <GlowIntensity>2</GlowIntensity>
+                          <Resource>Models/Effects/MuzzleFlash/Blue/PlaneLeft.mesh</Resource>
+                          <Shadow>false</Shadow>
+                          <Transparent>true</Transparent>
+                        </c:Model>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="PlaneRight">
+                      <Components>
+                        <c:Fade>
+                          <FadeTime>0.080000000000000002</FadeTime>
+                          <Reverse>true</Reverse>
+                        </c:Fade>
+                        <c:Model>
+                          <GlowIntensity>2</GlowIntensity>
+                          <Resource>Models/Effects/MuzzleFlash/Blue/PlaneRight.mesh</Resource>
+                          <Shadow>false</Shadow>
+                          <Transparent>true</Transparent>
+                        </c:Model>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="PlaneUp">
+                      <Components>
+                        <c:Fade>
+                          <FadeTime>0.080000000000000002</FadeTime>
+                          <Reverse>true</Reverse>
+                        </c:Fade>
+                        <c:Model>
+                          <GlowIntensity>2</GlowIntensity>
+                          <Resource>Models/Effects/MuzzleFlash/Blue/PlaneUp.mesh</Resource>
+                          <Shadow>false</Shadow>
+                          <Transparent>true</Transparent>
+                        </c:Model>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="PlaneDown">
+                      <Components>
+                        <c:Fade>
+                          <FadeTime>0.080000000000000002</FadeTime>
+                          <Reverse>true</Reverse>
+                        </c:Fade>
+                        <c:Model>
+                          <GlowIntensity>2</GlowIntensity>
+                          <Resource>Models/Effects/MuzzleFlash/Blue/PlaneDown.mesh</Resource>
+                          <Shadow>false</Shadow>
+                          <Transparent>true</Transparent>
+                        </c:Model>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="Lights">
+                  <Components>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="Light_front">
+                      <Components>
+                        <c:Model>
+                          <Resource>Models/Core/UnitSphere.mesh</Resource>
+                          <Visible>false</Visible>
+                          <Shadow>false</Shadow>
+                        </c:Model>
+                        <c:PointLight>
+                          <Color A="1" B="1" G="1" R="0"/>
+                        </c:PointLight>
+                        <c:Transform>
+                          <Position X="-0.000288648967" Y="0.000489665952" Z="0.0824639797"/>
+                          <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="Light_Side">
+                      <Components>
+                        <c:Model>
+                          <Resource>Models/Core/UnitSphere.mesh</Resource>
+                          <Color A="1" B="1" G="1" R="0"/>
+                          <Visible>false</Visible>
+                          <Shadow>false</Shadow>
+                        </c:Model>
+                        <c:PointLight>
+                          <Color A="1" B="1" G="1" R="0"/>
+                          <Radius>0.40000000596046448</Radius>
+                        </c:PointLight>
+                        <c:Transform>
+                          <Position X="-0.0870000049" Y="0.0210000016" Z="0.186000004"/>
+                          <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="Light_front2">
+                      <Components>
+                        <c:Model>
+                          <Resource>Models/Core/UnitSphere.mesh</Resource>
+                          <Visible>false</Visible>
+                          <Shadow>false</Shadow>
+                        </c:Model>
+                        <c:PointLight>
+                          <Color A="1" B="1" G="1" R="0"/>
+                        </c:PointLight>
+                        <c:Transform>
+                          <Position X="0.000448234321" Y="-0.000760387513" Z="-0.323961914"/>
+                          <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
         </Entity>
       </Children>
     </Entity>
diff --git a/resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml b/resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml
index e48cffba..3778cc80 100644
--- a/resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml
+++ b/resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml
@@ -204,7 +204,7 @@
         <Entity name="Muzzle">
           <Components>
             <c:Transform>
-              <Position X="0.197295129" Y="-0.116625182" Z="-0.709192753"/>
+              <Position X="0.189540595" Y="-0.114737265" Z="-0.681462705"/>
             </c:Transform>
           </Components>
           <Children>
@@ -213,9 +213,7 @@
                 <c:Spawner>
                   <EntityFile>Schema/Entities/RaySideArmBlue.xml</EntityFile>
                 </c:Spawner>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="-0.155046776"/>
-                </c:Transform>
+                <c:Transform/>
               </Components>
               <Children/>
             </Entity>
diff --git a/resources/Schema/Entities/WeaponSidearmDefenderBlueView.xml b/resources/Schema/Entities/WeaponSidearmDefenderBlueView.xml
index 129082ed..0d647ba7 100644
--- a/resources/Schema/Entities/WeaponSidearmDefenderBlueView.xml
+++ b/resources/Schema/Entities/WeaponSidearmDefenderBlueView.xml
@@ -8,6 +8,7 @@
     </c:BlendAdditive>
     <c:Model>
       <Resource>Models/Characters/Defender/FirstPersonDefenderBlue.mesh</Resource>
+      <Shadow>false</Shadow>
     </c:Model>
     <c:Transform/>
   </Components>
@@ -86,7 +87,7 @@
           <BoneName>R_Ammo_Joint</BoneName>
         </c:BoneAttachment>
         <c:Transform>
-          <Position X="0.109812573" Y="-0.0832190216" Z="-0.373473197"/>
+          <Position X="0.109812573" Y="-0.0832190216" Z="-0.373473227"/>
           <Orientation X="0.00118373742" Y="0.077411525" Z="0.00458352407"/>
           <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
         </c:Transform>
@@ -183,9 +184,10 @@
             <c:Model>
               <GlowIntensity>1.5</GlowIntensity>
               <Resource>Models/Weapons/Blue/SecondaryWeaponBlue.mesh</Resource>
+              <Shadow>false</Shadow>
             </c:Model>
             <c:Transform>
-              <Position X="0.18578662" Y="-0.216220587" Z="-0.382728696"/>
+              <Position X="0.18578662" Y="-0.216220587" Z="-0.382728726"/>
               <Orientation X="0.010279973" Y="-0.00312555139" Z="0.0428142436"/>
             </c:Transform>
           </Components>
@@ -204,10 +206,19 @@
         <Entity name="Muzzle">
           <Components>
             <c:Transform>
-              <Position X="0.196999997" Y="-0.116999999" Z="-0.668634355"/>
+              <Position X="0.192775041" Y="-0.117133088" Z="-0.647809923"/>
             </c:Transform>
           </Components>
           <Children>
+            <Entity name="WeaponMuzzleRay">
+              <Components>
+                <c:Spawner>
+                  <EntityFile>Schema/Entities/RaySideArmBlue.xml</EntityFile>
+                </c:Spawner>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
             <Entity name="WeaponMuzzleFlash">
               <Components>
                 <c:Spawner>
@@ -219,17 +230,6 @@
               </Components>
               <Children/>
             </Entity>
-            <Entity name="WeaponMuzzleRay">
-              <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/RaySideArmBlue.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="-0.155000001"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
           </Children>
         </Entity>
       </Children>