diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml
index b31f821629..f9fbe6b11b 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml
@@ -16,7 +16,6 @@
   id: ClothingHeadEyeBaseFlippable
   abstract: true
   components:
-  - type: Appearance
   - type: FlippableClothingVisuals
   - type: Foldable
     canFoldInsideContainer: true
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index dbf50a67a1..1aa5c3d56f 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -556,7 +556,6 @@
   components:
   - type: Clothing
     sprite: Clothing/Head/Hats/santahat.rsi
-  - type: Appearance
   - type: HideLayerClothing
     layers:
       Hair: HEAD
@@ -681,7 +680,6 @@
   components:
   - type: Clothing
     sprite: Clothing/Head/Hats/ushanka.rsi
-  - type: Appearance
   - type: RussianAccent
     relayAccent: true
   - type: Foldable
diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
index 815f86032f..a5b0b7abaf 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
@@ -3,7 +3,6 @@
   id: ClothingHeadHeadHatBaseFlippable
   abstract: true
   components:
-  - type: Appearance
   - type: Foldable
     canFoldInsideContainer: true
     unfoldVerbText: fold-flip-verb
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
index 5075002d72..52e195f091 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
@@ -3,7 +3,6 @@
   id: ClothingMaskBandanaBase
   abstract: true
   components:
-  - type: Appearance
   - type: Foldable
     canFoldInsideContainer: true
   - type: FoldableClothing
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
index 18b6030372..e04f8fb3c2 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -66,7 +66,6 @@
   parent: [ClothingOuterStorageBase, BaseFoldable]
   id: ClothingOuterStorageFoldableBase
   components:
-  - type: Appearance
   - type: Foldable
     canFoldInsideContainer: true
     unfoldVerbText: fold-zip-verb
diff --git a/Resources/Prototypes/Entities/Objects/Tools/decoys.yml b/Resources/Prototypes/Entities/Objects/Tools/decoys.yml
index 52a3aea628..4e1153e8f8 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/decoys.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/decoys.yml
@@ -25,7 +25,6 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/pop_high.ogg
-  - type: Appearance
   - type: Item
     size: Normal
   - type: RandomMetadata # No metagaming these, jimbo.
diff --git a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
index bde8a37002..336ee6b8a9 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
@@ -38,20 +38,16 @@
     - type: Clickable
     - type: InteractionOutline
     - type: FultonBeacon
-    - type: Appearance
-    - type: GenericVisualizer
-      visuals:
-        enum.FoldedVisuals.State:
-          foldedLayer:
-            True: { state: folded_extraction }
-            False: { state: extraction_point }
     - type: Sprite
       sprite: Objects/Tools/fulton.rsi
       drawdepth: SmallObjects
       noRot: true
       layers:
         - state: extraction_point
-          map: [ "foldedLayer" ]
+          map: ["unfoldedLayer"]
+          visible: false
+        - state: folded_extraction
+          map: ["foldedLayer"]
 
 - type: entity
   id: Fulton
diff --git a/Resources/Prototypes/Entities/Objects/Vehicles/vehicles.yml b/Resources/Prototypes/Entities/Objects/Vehicles/vehicles.yml
index fc41b914c6..fcfb7732fe 100644
--- a/Resources/Prototypes/Entities/Objects/Vehicles/vehicles.yml
+++ b/Resources/Prototypes/Entities/Objects/Vehicles/vehicles.yml
@@ -52,7 +52,6 @@
     - state: wheelchair_folded
       map: ["foldedLayer"]
       visible: false
-  - type: Appearance
   - type: Item
     size: Ginormous
   - type: Damageable
diff --git a/Resources/Prototypes/Entities/foldable.yml b/Resources/Prototypes/Entities/Objects/base_foldable.yml
similarity index 90%
rename from Resources/Prototypes/Entities/foldable.yml
rename to Resources/Prototypes/Entities/Objects/base_foldable.yml
index 260cda799b..b7f46be3bb 100644
--- a/Resources/Prototypes/Entities/foldable.yml
+++ b/Resources/Prototypes/Entities/Objects/base_foldable.yml
@@ -1,9 +1,9 @@
 - type: entity
-  id: BaseFoldable
-  name: "foldable"
   abstract: true
+  id: BaseFoldable
   components:
   - type: Foldable
+  - type: Appearance
   - type: GenericVisualizer
     visuals:
       enum.FoldedVisuals.State:
@@ -18,6 +18,5 @@
   abstract: true
   parent: BaseFoldable
   id: BaseDeployFoldable
-  name: "deploy foldable"
   components:
   - type: DeployFoldable
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index 2a8b7cb998..9fe9e91d87 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -335,7 +335,6 @@
       visible: false
   - type: Item
     size: Huge
-  - type: Appearance
   - type: MeleeWeapon
     damage:
       types: