diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index 1b9cc8ab4f..53a5d4518b 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -60,12 +60,12 @@
     heldPrefix: off
   - type: ToggleableLightVisuals
   - type: PointLight
-    netsync: false
     enabled: false
     radius: 3
     energy: 2
     mask: /Textures/Effects/LightMasks/cone.png
     autoRot: true
+    netsync: false
   - type: Appearance
   - type: HandheldLight
     addPrefix: true
@@ -179,12 +179,12 @@
     equippedPrefix: off
   - type: ToggleableLightVisuals
   - type: PointLight
-    netsync: false
     enabled: false
     radius: 3
     energy: 2
     mask: /Textures/Effects/LightMasks/cone.png
     autoRot: true
+    netsync: false
   - type: Appearance
   - type: HandheldLight
     addPrefix: true
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
index cdacbc1cc3..3eb7aaa5d5 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
@@ -13,11 +13,11 @@
   - type: Clothing
     equippedPrefix: off
   - type: PointLight
-    netsync: false
     enabled: false
     mask: /Textures/Effects/LightMasks/cone.png
     autoRot: true
     radius: 3
+    netsync: false
   - type: Appearance
   - type: HandheldLight
     addPrefix: false
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
index 71b0742174..caf9683b11 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -41,12 +41,11 @@
     footstepSoundCollection:
       collection: FootstepClown
   - type: PointLight
-    netsync: false
     enabled: true
     radius: 3
     energy: 2
     color: "#FFD800"
-
+    netsync: false
 - type: entity
   parent: ClothingShoesBaseButcherable
   id: ClothingShoesCult
diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
index 5e14925d78..def26ec826 100644
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -44,7 +44,6 @@
       - state: foam
         map: ["enum.FoamVisualLayers.Base"]
   - type: AnimationPlayer
-    netsync: false
   - type: Appearance
   - type: SmokeVisuals
   - type: FoamVisuals
diff --git a/Resources/Prototypes/Entities/Effects/portal.yml b/Resources/Prototypes/Entities/Effects/portal.yml
index 3f533ee8bb..4ce2bfb865 100644
--- a/Resources/Prototypes/Entities/Effects/portal.yml
+++ b/Resources/Prototypes/Entities/Effects/portal.yml
@@ -32,11 +32,10 @@
     layers:
     - state: portal-red
   - type: PointLight
-    netsync: false
     color: OrangeRed
     radius: 3
     energy: 3
-
+    netsync: false
 - type: entity
   id: PortalBlue
   parent: BasePortal
@@ -45,7 +44,7 @@
     layers:
     - state: portal-blue
   - type: PointLight
-    netsync: false
     color: SkyBlue
     radius: 3
     energy: 3
+    netsync: false
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
index 5b75611d04..6a7af9d132 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
@@ -15,7 +15,6 @@
     sprite: Objects/Consumable/Food/egg.rsi
   - type: Item
     sprite: Objects/Consumable/Food/egg.rsi
-    netsync: false
     size: 1
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index c298c7b27b..5cba6ae8d9 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -164,10 +164,9 @@
   - type: Sprite
     state: plushie_lamp
   - type: PointLight
-    netsync: false
     radius: 1.5
     energy: 2
-
+    netsync: false
 - type: entity
   parent: BasePlushie
   id: PlushieLizard #Weh!
@@ -941,11 +940,11 @@
     - type: UseDelay
       delay: 1.0
     - type: PointLight
-      netsync: false
       enabled: false
       radius: 2
       energy: 2
       color: white
+      netsync: false
     - type: Appearance
     - type: ToggleableLightVisuals
       spriteLayer: blade
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index cdc1c6c228..d021ab2e30 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -249,7 +249,6 @@
     sprite: Clothing/Head/Misc/hides.rsi
     heldPrefix: bear
   - type: Clothing
-    netsync: false
     sprite: Clothing/Head/Misc/hides.rsi
     equippedPrefix: bear
     slots:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index e80d063d2d..90c377f4e7 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -46,10 +46,10 @@
     size: 20
     heldPrefix: off
   - type: PointLight
-    netsync: false
     enabled: false
     radius: 3
     energy: 2
+    netsync: false
   - type: ToggleableLightVisuals
   - type: Appearance
   - type: Physics
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
index 653a3ab975..f58cae975f 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -63,11 +63,11 @@
   - type: Item
     sprite: Objects/Tools/flashlight.rsi
   - type: PointLight
-    netsync: false
     enabled: false
     mask: /Textures/Effects/LightMasks/cone.png
     autoRot: true
     radius: 6
+    netsync: false
   - type: Appearance
   - type: StaticPrice
     price: 40
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
index 11cbf0ff65..883bb3ef40 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
@@ -41,11 +41,11 @@
       sprite: Objects/Tools/lantern.rsi
       heldPrefix: off
     - type: PointLight
-      netsync: false
       enabled: false
       radius: 3
       energy: 2.5
       color: "#FFC458"
+      netsync: false
     - type: Appearance
     - type: ToggleableLightVisuals
     - type: PowerCellSlot
diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index f9519e4825..710e7d5be0 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -53,10 +53,10 @@
         Heat: 8
         Blunt: -5
   - type: PointLight
-    netsync: false
     enabled: false
     radius: 1.5
     color: orange
+    netsync: false
   - type: Appearance
   - type: RequiresEyeProtection
   - type: PhysicalComposition
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index a2fefa39fd..3ddea67f46 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -34,11 +34,11 @@
   - type: UseDelay
     delay: 1.0
   - type: PointLight
-    netsync: false
     enabled: false
     radius: 2
     energy: 2
     color: white
+    netsync: false
   - type: Appearance
   - type: ToggleableLightVisuals
     spriteLayer: blade
@@ -98,11 +98,11 @@
   - type: UseDelay
     delay: 1.0
   - type: PointLight
-    netsync: false
     enabled: false
     radius: 1.5
     energy: 1.5
     color: white
+    netsync: false
   - type: Appearance
   - type: ToggleableLightVisuals
     spriteLayer: blade
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 77f61f8943..54bc1dbf41 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -80,9 +80,9 @@
   components:
     - type: PointLight
       enabled: true
-      netsync: false
       radius: 5
       energy: 8
+      netsync: false
     - type: LightFade
       duration: 0.5
     - type: TimedDespawn
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
index e7afb09ab0..fe863af453 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
@@ -100,11 +100,11 @@
     sound:
       path: /Audio/Ambience/Objects/hdd_buzz.ogg
   - type: PointLight
-    netsync: false
     radius: 1.5
     energy: 1.6
     color: "#3db83b"
     castShadows: false
+    netsync: false
   - type: Fixtures
   - type: Transform
     anchored: true
diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml
index 6a9c7416da..27dfa17ff5 100644
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -13,11 +13,11 @@
     sound:
       path: /Audio/Ambience/Objects/hdd_buzz.ogg
   - type: PointLight
-    netsync: false
     radius: 1.5
     energy: 1.6
     color: "#3db83b"
     castShadows: false
+    netsync: false
   - type: Clickable
   - type: AccessReader
     access: [["Engineering"]]
diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml
index b9441824db..26723c8b47 100644
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -114,10 +114,10 @@
     sound:
       path: /Audio/Ambience/Objects/buzzing.ogg
   - type: PointLight
-    netsync: false
     radius: 1.5
     energy: 1.6
     color: "#3db83b"
+    netsync: false
     castShadows: false
   - type: Clickable
   - type: AccessReader