diff --git a/data/json/vehicleparts/doors.json b/data/json/vehicleparts/doors.json
index b323ca7009324..f3907c6381651 100644
--- a/data/json/vehicleparts/doors.json
+++ b/data/json/vehicleparts/doors.json
@@ -1,6 +1,6 @@
 [
   {
-    "abstract": "door_abstract",
+    "id": "door",
     "breaks_into": "ig_vp_frame",
     "broken_color": "cyan",
     "broken_symbol": "&",
@@ -32,27 +32,30 @@
       "front": "+",
       "front_left": "+",
       "front_right": "+",
-      "rear": "+"
+      "horizontal_front": "+",
+      "horizontal_2": "+",
+      "horizontal_rear": "+",
+      "left": "+",
+      "right": "+",
+      "rear": "+",
+      "wheel_left": "+",
+      "wheel_right": "+"
     },
     "type": "vehicle_part"
   },
   {
-    "copy-from": "door_abstract",
-    "id": "door",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "door_abstract",
+    "copy-from": "door",
     "id": "door_full",
     "looks_like": "door",
     "type": "vehicle_part"
   },
   {
-    "copy-from": "door_abstract",
-    "abstract": "cloth_door_abstract",
+    "copy-from": "door",
+    "id": "cloth_flap_door",
     "type": "vehicle_part",
+    "name": { "str": "cloth flap door" },
+    "description": "A cloth sheet that can be fastened into a closed position to act as a door.",
     "item": "sheet",
-    "broken_color": "dark_gray",
     "durability": 15,
     "folded_volume": "2500 ml",
     "breaks_into": "ig_vp_cloth",
@@ -62,18 +65,10 @@
       "repair": { "skills": [ [ "fabrication", 2 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ] ] }
     },
     "damage_reduction": { "all": 0, "bash": 3 },
-    "flags": [ "CARGO", "OBSTACLE", "OPENABLE", "BOARDABLE", "DOOR" ]
+    "delete": { "flags": [ "WINDOW" ] }
   },
   {
-    "copy-from": "cloth_door_abstract",
-    "id": "cloth_flap_door",
-    "looks_like": "door",
-    "type": "vehicle_part",
-    "name": { "str": "cloth flap door" },
-    "description": "A cloth sheet that can be fastened into a closed position to act as a door."
-  },
-  {
-    "copy-from": "cloth_door_abstract",
+    "copy-from": "cloth_flap_door",
     "id": "cloth_curtain_door",
     "looks_like": "door",
     "type": "vehicle_part",
@@ -81,156 +76,72 @@
     "description": "A cloth sheet that can be slid into a closed position to act as a door."
   },
   {
-    "abstract": "door_opaque_abstract",
-    "breaks_into": "ig_vp_frame",
-    "broken_color": "cyan",
-    "broken_symbol": "&",
-    "categories": [ "hull" ],
-    "color": "cyan",
-    "damage_modifier": 80,
-    "damage_reduction": { "all": 20 },
+    "id": "door_opaque",
+    "copy-from": "door",
     "description": "A door.  Solid construction means you can't see through it when closed.",
     "durability": 240,
-    "flags": [ "CARGO", "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "DOOR" ],
-    "item": "frame",
-    "location": "center",
-    "looks_like": "door",
     "name": { "str": "opaque door" },
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 1 ] ] }
-    },
-    "size": "2500 ml",
-    "symbol": "+",
-    "symbols": { "left": "+", "right": "+", "front": "+", "rear": "+" },
+    "extend": { "flags": [ "OPAQUE" ] },
+    "delete": { "flags": [ "WINDOW" ] },
     "type": "vehicle_part"
   },
   {
-    "copy-from": "door_opaque_abstract",
-    "id": "door_opaque",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "door_opaque_abstract",
+    "copy-from": "door_opaque",
     "id": "door_opaque_full",
     "looks_like": "door_opaque",
     "type": "vehicle_part"
   },
   {
-    "abstract": "hddoor_abstract",
+    "id": "hddoor",
+    "copy-from": "door",
     "breaks_into": "ig_vp_hdframe",
-    "broken_color": "cyan",
-    "broken_symbol": "&",
-    "categories": [ "hull" ],
-    "color": "cyan",
-    "damage_modifier": 80,
     "damage_reduction": { "all": 30 },
     "description": "A strong door.  Has a window so you can see out of it, even when closed.",
     "durability": 600,
-    "flags": [ "CARGO", "OBSTACLE", "OPENABLE", "BOARDABLE", "WINDOW", "DOOR" ],
     "item": "hdframe",
-    "location": "center",
-    "looks_like": "door",
     "name": { "str": "heavy-duty door" },
     "requirements": {
       "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
       "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 3 ] ] }
     },
-    "size": "2500 ml",
-    "symbol": "+",
-    "symbols": { "left": "+", "right": "+", "front": "+", "rear": "+" },
     "type": "vehicle_part"
   },
   {
-    "copy-from": "hddoor_abstract",
-    "id": "hddoor",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "hddoor_abstract",
+    "copy-from": "hddoor",
     "id": "hddoor_full",
-    "looks_like": "hddoor",
     "type": "vehicle_part"
   },
   {
-    "abstract": "hddoor_opaque_abstract",
-    "breaks_into": "ig_vp_hdframe",
-    "broken_color": "cyan",
-    "broken_symbol": "&",
-    "categories": [ "hull" ],
-    "color": "cyan",
-    "damage_modifier": 80,
-    "damage_reduction": { "all": 30 },
+    "id": "hddoor_opaque",
+    "copy-from": "hddoor",
     "description": "A strong door.  Solid construction means you can't see through it when closed.",
     "durability": 660,
-    "flags": [ "CARGO", "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "DOOR" ],
-    "item": "hdframe",
-    "location": "center",
     "looks_like": "door_opaque",
     "name": { "str": "heavy-duty opaque door" },
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 3 ] ] }
-    },
-    "size": "2500 ml",
-    "symbol": "+",
-    "symbols": { "left": "+", "right": "+", "front": "+", "rear": "+" },
+    "extend": { "flags": [ "OPAQUE" ] },
+    "delete": { "flags": [ "WINDOW" ] },
     "type": "vehicle_part"
   },
   {
-    "copy-from": "hddoor_opaque_abstract",
-    "id": "hddoor_opaque",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "hddoor_opaque_abstract",
+    "copy-from": "hddoor_opaque",
     "id": "hddoor_opaque_full",
-    "looks_like": "hddoor_opaque",
     "type": "vehicle_part"
   },
   {
     "id": "door_internal",
-    "breaks_into": "ig_vp_frame",
-    "broken_color": "cyan",
-    "broken_symbol": "&",
-    "categories": [ "hull" ],
-    "color": "cyan",
+    "copy-from": "door_opaque",
     "damage_modifier": 75,
-    "damage_reduction": { "all": 20 },
     "description": "An interior door.  Solid construction means you can't see through it when closed.",
     "durability": 240,
-    "flags": [ "OBSTACLE", "OPAQUE", "OPENABLE", "ROOF", "BOARDABLE", "DOOR" ],
-    "item": "frame",
-    "location": "center",
-    "looks_like": "door",
     "name": { "str": "internal door" },
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 1 ] ] }
-    },
-    "symbol": "+",
-    "symbols": { "left": "+", "right": "+", "front": "+", "rear": "+" },
     "type": "vehicle_part"
   },
   {
     "id": "hatch",
-    "breaks_into": "ig_vp_frame",
-    "broken_color": "light_gray",
-    "broken_symbol": "&",
-    "categories": [ "hull" ],
-    "color": "light_gray",
-    "damage_modifier": 80,
-    "damage_reduction": { "all": 20 },
+    "copy-from": "door",
     "description": "A strong door.  A window lets you see through it when closed.",
     "durability": 420,
-    "flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "DOOR", "WINDOW" ],
-    "item": "frame",
-    "location": "center",
-    "looks_like": "door",
     "name": { "str": "hatch" },
     "requirements": {
       "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
@@ -238,50 +149,28 @@
       "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 1 ] ] }
     },
     "size": "37500 ml",
-    "symbol": "+",
-    "symbols": { "left": "+", "right": "+", "front": "+", "rear": "+" },
+    "extend": { "flags": [ "LOCKABLE_CARGO", "MULTISQUARE", "COVERED" ] },
     "type": "vehicle_part"
   },
   {
     "id": "hatch_opaque",
-    "breaks_into": "ig_vp_frame",
-    "broken_color": "light_gray",
-    "broken_symbol": "&",
-    "categories": [ "hull" ],
-    "color": "light_gray",
-    "damage_modifier": 80,
-    "damage_reduction": { "all": 20 },
+    "copy-from": "hatch",
     "description": "A strong door.  Solid construction means you can't see through it when closed.",
     "durability": 450,
-    "flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "OPAQUE", "DOOR" ],
-    "item": "frame",
-    "location": "center",
     "looks_like": "door_opaque",
     "name": { "str": "opaque hatch" },
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 1 ] ] }
-    },
-    "size": "37500 ml",
-    "symbol": "+",
-    "symbols": { "left": "+", "right": "+", "front": "+", "rear": "+" },
+    "extend": { "flags": [ "OPAQUE" ] },
+    "delete": { "flags": [ "WINDOW" ] },
     "type": "vehicle_part"
   },
   {
     "id": "hdhatch",
+    "copy-from": "hatch",
     "breaks_into": "ig_vp_hdframe",
-    "broken_color": "dark_gray",
-    "broken_symbol": "&",
-    "categories": [ "hull" ],
-    "color": "dark_gray",
-    "damage_modifier": 80,
     "damage_reduction": { "all": 30 },
     "description": "A very strong door.  A window lets you see through it when closed.",
     "durability": 900,
-    "flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "DOOR", "WINDOW" ],
     "item": "hdframe",
-    "location": "center",
     "looks_like": "hatch",
     "name": { "str": "heavy-duty hatch" },
     "requirements": {
@@ -289,35 +178,116 @@
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
       "repair": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 3 ] ] }
     },
-    "size": "37500 ml",
-    "symbol": "+",
-    "symbols": { "left": "+", "right": "+", "front": "+", "rear": "+" },
     "type": "vehicle_part"
   },
   {
     "id": "hdhatch_opaque",
-    "breaks_into": "ig_vp_hdframe",
-    "broken_color": "dark_gray",
-    "broken_symbol": "&",
-    "categories": [ "hull" ],
-    "color": "dark_gray",
-    "damage_modifier": 80,
-    "damage_reduction": { "all": 30 },
+    "copy-from": "hdhatch",
     "description": "A very strong door.  Solid construction means you can't see through it when closed.",
     "durability": 1000,
-    "flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "OPAQUE", "DOOR" ],
-    "item": "hdframe",
-    "location": "center",
     "looks_like": "hatch_opaque",
     "name": { "str": "heavy-duty opaque hatch" },
+    "extend": { "flags": [ "OPAQUE" ] },
+    "delete": { "flags": [ "WINDOW" ] },
+    "type": "vehicle_part"
+  },
+  {
+    "type": "vehicle_part",
+    "id": "door_wood",
+    "copy-from": "door",
+    "name": { "str": "wooden door" },
+    "looks_like": "t_door_c",
+    "color": "brown",
+    "broken_color": "brown",
+    "damage_modifier": 75,
+    "durability": 160,
+    "size": "0 ml",
+    "description": "A door.  Has a window so you can see out of it, even when closed.",
+    "item": "frame_wood",
     "requirements": {
-      "install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 3 ] ] }
+      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_nail_install", 1 ] ] },
+      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "vehicle_nail_removal", 1 ] ] },
+      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ] ] }
     },
-    "size": "37500 ml",
-    "symbol": "+",
-    "symbols": { "left": "+", "right": "+", "front": "+", "rear": "+" },
-    "type": "vehicle_part"
+    "breaks_into": [ { "item": "splinter", "count": [ 7, 9 ] } ],
+    "extend": { "flags": [ "SIMPLE_PART" ] },
+    "delete": { "flags": [ "CARGO" ] },
+    "damage_reduction": { "all": 8 }
+  },
+  {
+    "type": "vehicle_part",
+    "id": "door_wood_opaque",
+    "copy-from": "door_wood",
+    "name": { "str": "opaque wooden door" },
+    "durability": 170,
+    "description": "A door.  Solid construction means you can't see through it when closed.",
+    "size": "0 ml",
+    "extend": { "flags": [ "OPAQUE" ] },
+    "delete": { "flags": [ "WINDOW" ] },
+    "damage_reduction": { "all": 12 }
+  },
+  {
+    "type": "vehicle_part",
+    "id": "door_trunk",
+    "copy-from": "hatch",
+    "name": { "str": "trunk door" },
+    "durability": 150,
+    "size": "0 ml",
+    "description": "A short door.  You can always see over it, open or closed.",
+    "requirements": {
+      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
+      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
+      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 2 ] ] }
+    },
+    "extend": { "flags": [ "LOW_FINAL_AIR_DRAG", "SIMPLE_PART", "NO_ROOF_NEEDED" ] },
+    "delete": { "flags": [ "CARGO", "COVERED", "LOCKABLE_CARGO" ] }
+  },
+  {
+    "type": "vehicle_part",
+    "id": "hddoor_trunk",
+    "copy-from": "door_trunk",
+    "name": { "str": "heavy-duty trunk door" },
+    "durability": 750,
+    "description": "A strong, short door.  You can always see over it, open or closed.",
+    "item": "hdframe",
+    "requirements": {
+      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
+      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
+      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 4 ] ] }
+    },
+    "breaks_into": "ig_vp_hdframe",
+    "delete": { "flags": [ "NO_ROOF_NEEDED" ] },
+    "damage_reduction": { "all": 30 }
+  },
+  {
+    "type": "vehicle_part",
+    "id": "door_shutter",
+    "copy-from": "hatch",
+    "name": { "str": "shutter door" },
+    "size": "0 ml",
+    "durability": 95,
+    "description": "A strong door.  Solid construction means you can't see through it when closed.",
+    "item": "sheet_metal",
+    "requirements": {
+      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
+      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
+      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 2 ] ] }
+    },
+    "breaks_into": "ig_vp_sheet_metal",
+    "extend": { "flags": [ "OPAQUE", "SIMPLE_PART" ] },
+    "delete": { "flags": [ "CARGO", "COVERED", "LOCKABLE_CARGO", "WINDOW" ] },
+    "damage_reduction": { "all": 7 }
+  },
+  {
+    "type": "vehicle_part",
+    "id": "door_sliding",
+    "copy-from": "door_trunk",
+    "name": { "str": "sliding door" },
+    "looks_like": "door",
+    "durability": 150,
+    "description": "A door.  A window lets you see through it when closed.",
+    "item": "frame",
+    "breaks_into": "ig_vp_frame",
+    "delete": { "flags": [ "LOW_FINAL_AIR_DRAG", "NO_ROOF_NEEDED", "WINDOW" ] }
   }
 ]
diff --git a/data/json/vehicleparts/engineering.json b/data/json/vehicleparts/engineering.json
index 5050c4d0f3324..217ed1374b8a1 100644
--- a/data/json/vehicleparts/engineering.json
+++ b/data/json/vehicleparts/engineering.json
@@ -95,7 +95,6 @@
     "item": "frame",
     "location": "structure",
     "symbol": "|",
-    "symbols": { "horizontal_front": "|" },
     "broken_symbol": "x",
     "categories": [ "utility" ],
     "color": "light_gray",
diff --git a/data/json/vehicleparts/frames.json b/data/json/vehicleparts/frames.json
index 171d4207e2eac..3d80f130cda7f 100644
--- a/data/json/vehicleparts/frames.json
+++ b/data/json/vehicleparts/frames.json
@@ -13,9 +13,18 @@
       "cover": "^",
       "cross": "c",
       "horizontal": "h",
+      "horizontal_front": "h",
+      "horizontal_rear": "h",
       "horizontal_2": "=",
+      "horizontal_2_front": "=",
       "vertical": "j",
+      "vertical_left": "j",
+      "vertical_right": "j",
+      "vertical_T_left": "j",
+      "vertical_T_right": "j",
       "vertical_2": "H",
+      "vertical_2_left": "H",
+      "vertical_2_right": "H",
       "ne": "u",
       "nw": "y",
       "se": "n",
diff --git a/data/json/vehicleparts/seats.json b/data/json/vehicleparts/seats.json
index a3cf76fdb374a..d9b7e6a92d4e2 100644
--- a/data/json/vehicleparts/seats.json
+++ b/data/json/vehicleparts/seats.json
@@ -23,7 +23,7 @@
     "type": "item_group"
   },
   {
-    "abstract": "seat_abstract",
+    "id": "seat",
     "breaks_into": "ig_vp_seat",
     "broken_color": "red",
     "broken_symbol": "*",
@@ -51,50 +51,51 @@
     },
     "size": "25 L",
     "symbol": "#",
+    "symbols": { "vertical": "#", "vertical_left": "#", "vertical_right": "#", "left": "#", "right": "#", "rear": "#" },
     "type": "vehicle_part"
   },
   {
-    "abstract": "seat_leather_abstract",
+    "copy-from": "seat",
+    "id": "seat_swivel_chair",
+    "type": "vehicle_part"
+  },
+  {
+    "copy-from": "seat",
+    "id": "seat_windshield",
+    "type": "vehicle_part"
+  },
+  {
+    "id": "seat_leather",
     "breaks_into": "ig_vp_seat_leather",
     "copy-from": "seat",
     "item": "seat_leather",
-    "looks_like": "seat",
     "name": { "str": "leather seat" },
     "type": "vehicle_part"
   },
   {
-    "abstract": "reclining_seat_abstract",
-    "breaks_into": "ig_vp_seat",
-    "broken_color": "red",
-    "broken_symbol": "*",
-    "categories": [ "operations", "passengers" ],
-    "color": "red",
+    "copy-from": "seat_leather",
+    "id": "seat_windshield_leather",
+    "type": "vehicle_part"
+  },
+  {
+    "id": "reclining_seat",
+    "copy-from": "seat",
     "comfort": 3,
-    "damage_modifier": 60,
-    "damage_reduction": { "all": 3, "bash": 5 },
     "description": "A place to sit, and the backrest reclines to make it an uncomfortable bed.",
     "durability": 100,
-    "flags": [ "BED", "SEAT", "BOARDABLE", "BELTABLE", "CARGO" ],
     "floor_bedding_warmth": 350,
-    "item": "seat",
-    "location": "center",
-    "looks_like": "seat",
     "name": { "str": "reclining seat" },
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 1 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": {
-        "skills": [ [ "mechanics", 2 ] ],
-        "time": "30 m",
-        "using": [ [ "repair_welding_standard", 1 ], [ "sewing_standard", 8 ] ]
-      }
-    },
     "size": "6250 ml",
-    "symbol": "#",
+    "extend": { "flags": [ "BED" ] },
+    "type": "vehicle_part"
+  },
+  {
+    "copy-from": "reclining_seat",
+    "id": "reclining_seat_windshield",
     "type": "vehicle_part"
   },
   {
-    "abstract": "reclining_seat_leather_abstract",
+    "id": "reclining_seat_leather",
     "breaks_into": "ig_vp_seat_leather",
     "copy-from": "reclining_seat",
     "item": "seat_leather",
@@ -103,40 +104,25 @@
     "type": "vehicle_part"
   },
   {
-    "abstract": "seat_back_abstract",
-    "breaks_into": "ig_vp_seat",
-    "broken_color": "red",
-    "broken_symbol": "*",
-    "categories": [ "operations", "passengers" ],
-    "color": "red",
+    "copy-from": "reclining_seat_leather",
+    "id": "reclining_seat_windshield_leather",
+    "type": "vehicle_part"
+  },
+  {
+    "id": "seat_back",
+    "copy-from": "seat",
     "comfort": 4,
-    "damage_modifier": 60,
-    "damage_reduction": { "all": 3, "bash": 5 },
     "description": "A benchlike seat.  Mostly found in the second row, also known as the back or rear seat.",
-    "durability": 300,
-    "flags": [ "BED", "SEAT", "BOARDABLE", "BELTABLE", "CARGO" ],
     "floor_bedding_warmth": 500,
-    "item": "seat",
-    "location": "center",
-    "looks_like": "seat",
     "name": { "str": "back seat" },
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 1 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": {
-        "skills": [ [ "mechanics", 2 ] ],
-        "time": "30 m",
-        "using": [ [ "repair_welding_standard", 1 ], [ "sewing_standard", 8 ] ]
-      }
-    },
     "size": "30 L",
-    "symbols": { "vertical": "#", "vertical_left": "#", "vertical_right": "#", "left": "#", "right": "#" },
+    "extend": { "flags": [ "BED" ] },
     "type": "vehicle_part"
   },
   {
-    "abstract": "seat_back_leather_abstract",
-    "breaks_into": "ig_vp_seat_leather",
+    "id": "seat_back_leather",
     "copy-from": "seat_back",
+    "breaks_into": "ig_vp_seat_leather",
     "item": "seat_leather",
     "looks_like": "seat_leather",
     "name": { "str": "leather back seat" },
@@ -144,23 +130,14 @@
   },
   {
     "type": "vehicle_part",
-    "abstract": "saddle_abstract",
+    "id": "saddle",
+    "copy-from": "seat",
     "name": { "str": "saddle" },
-    "categories": [ "operations", "passengers" ],
-    "symbol": "#",
-    "looks_like": "seat",
-    "color": "red",
-    "broken_symbol": "*",
-    "broken_color": "red",
-    "damage_modifier": 20,
-    "damage_reduction": { "all": 3, "bash": 5 },
     "durability": 80,
     "description": "A padded wedge that you straddle, like a bicycle or motorcycle.",
     "folded_volume": "1250 ml",
     "comfort": 1,
-    "floor_bedding_warmth": 200,
     "item": "saddle",
-    "location": "center",
     "requirements": {
       "install": { "skills": [ [ "mechanics", 1 ] ], "time": "200 s", "using": [ [ "vehicle_wrench_2", 1 ] ] },
       "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "200 s", "using": [ [ "vehicle_wrench_2", 1 ] ] },
@@ -170,162 +147,57 @@
         "using": [ [ "repair_welding_standard", 1 ], [ "sewing_standard", 4 ] ]
       }
     },
-    "flags": [ "SEAT", "BOARDABLE", "NONBELTABLE" ],
-    "breaks_into": [ { "item": "leather", "prob": 50 }, { "item": "scrap", "count": [ 1, 2 ] } ]
+    "breaks_into": [ { "item": "leather", "prob": 50 }, { "item": "scrap", "count": [ 1, 2 ] } ],
+    "size": "0 ml",
+    "extend": { "flags": [ "NONBELTABLE" ] },
+    "delete": { "flags": [ "BELTABLE", "CARGO" ] }
+  },
+  {
+    "copy-from": "saddle",
+    "id": "saddle_pedal",
+    "type": "vehicle_part"
+  },
+  {
+    "copy-from": "saddle",
+    "id": "saddle_motor",
+    "type": "vehicle_part"
+  },
+  {
+    "copy-from": "saddle",
+    "id": "saddle_scooter",
+    "type": "vehicle_part"
   },
   {
     "type": "vehicle_part",
-    "abstract": "folding_seat_abstract",
+    "id": "folding_seat",
+    "copy-from": "saddle",
     "name": { "str": "foldable seat" },
-    "categories": [ "operations", "passengers" ],
-    "symbol": "#",
-    "looks_like": "seat",
-    "color": "red",
-    "broken_symbol": "*",
-    "broken_color": "red",
-    "damage_modifier": 10,
-    "damage_reduction": { "all": 3, "bash": 5 },
+    "comfort": 0,
+    "floor_bedding_warmth": 0,
     "durability": 20,
     "description": "A crude seat, too uncomfortable to sleep in.",
     "item": "sheet",
     "folded_volume": "2500 ml",
     "location": "anywhere",
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "200 s", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "200 s", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": {
-        "skills": [ [ "mechanics", 3 ] ],
-        "time": "20 s",
-        "using": [ [ "repair_welding_standard", 1 ], [ "sewing_standard", 3 ] ]
-      }
-    },
-    "flags": [ "SEAT", "BOARDABLE", "NONBELTABLE" ],
     "breaks_into": [ { "item": "cotton_patchwork", "count": [ 1, 6 ] } ]
   },
   {
-    "abstract": "metal_bench_abstract",
+    "id": "metal_bench",
+    "copy-from": "seat",
     "breaks_into": "ig_vp_prison_bench",
-    "broken_color": "dark_gray",
-    "broken_symbol": "*",
-    "categories": [ "operations", "passengers" ],
-    "color": "dark_gray",
     "comfort": 0,
-    "damage_modifier": 60,
-    "damage_reduction": { "all": 3, "bash": 5 },
+    "floor_bedding_warmth": 0,
     "description": "A steel bench with ankle and wrist restraints built in.  It looks very uncomfortable.",
     "durability": 450,
-    "flags": [ "SEAT", "BOARDABLE", "BELTABLE" ],
     "item": "steel_plate",
-    "location": "center",
-    "looks_like": "seat",
     "name": { "str": "steel bench" },
     "requirements": {
       "install": { "skills": [ [ "mechanics", 1 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": "vehicle_weld_removal" },
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 3 ] ] }
     },
-    "symbol": "#",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "seat_abstract",
-    "id": "seat",
-    "symbol": "#",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "seat_abstract",
-    "id": "seat_swivel_chair",
-    "symbol": "#",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "seat_abstract",
-    "id": "seat_windshield",
-    "symbol": "#",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "seat_leather_abstract",
-    "id": "seat_leather",
-    "symbol": "#",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "seat_leather_abstract",
-    "id": "seat_windshield_leather",
-    "symbol": "#",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "reclining_seat_abstract",
-    "id": "reclining_seat",
-    "symbol": "#",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "reclining_seat_abstract",
-    "id": "reclining_seat_windshield",
-    "symbol": "#",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "reclining_seat_leather_abstract",
-    "id": "reclining_seat_leather",
-    "symbol": "#",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "reclining_seat_leather_abstract",
-    "id": "reclining_seat_windshield_leather",
-    "symbol": "#",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "seat_back_abstract",
-    "id": "seat_back",
-    "symbol": "#",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "seat_back_leather_abstract",
-    "id": "seat_back_leather",
-    "symbol": "#",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "saddle_abstract",
-    "id": "saddle",
-    "symbol": "#",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "saddle_abstract",
-    "id": "saddle_pedal",
-    "symbol": "#",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "saddle_abstract",
-    "id": "saddle_motor",
-    "symbol": "#",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "saddle_abstract",
-    "id": "saddle_scooter",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "folding_seat_abstract",
-    "id": "folding_seat",
-    "symbol": "#",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "metal_bench_abstract",
-    "id": "metal_bench",
-    "symbol": "#",
+    "size": "0 ml",
+    "delete": { "flags": [ "CARGO" ] },
     "type": "vehicle_part"
   }
 ]
diff --git a/data/json/vehicleparts/vehicle_parts.json b/data/json/vehicleparts/vehicle_parts.json
index 2d18c3de72d33..731f5fdf68a6d 100644
--- a/data/json/vehicleparts/vehicle_parts.json
+++ b/data/json/vehicleparts/vehicle_parts.json
@@ -284,24 +284,17 @@
   {
     "type": "vehicle_part",
     "id": "wooden_aisle",
+    "copy-from": "aisle",
     "name": { "str": "wooden aisle" },
-    "symbol": "H",
-    "symbols": { "horizontal": "H", "vertical": "=" },
-    "looks_like": "t_floor",
-    "categories": [ "hull", "passengers" ],
     "color": "brown",
-    "broken_symbol": "#",
     "broken_color": "brown",
     "durability": 200,
-    "description": "An aisle.",
     "item": "frame_wood",
-    "location": "center",
     "requirements": {
       "install": { "skills": [ [ "fabrication", 1 ] ], "time": "30 m", "using": [ [ "vehicle_nail_install", 1 ] ] },
       "removal": { "skills": [ [ "fabrication", 2 ] ], "time": "15 m", "using": [ [ "vehicle_nail_removal", 1 ] ] },
       "repair": { "skills": [ [ "fabrication", 2 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ] ] }
     },
-    "flags": [ "AISLE", "BOARDABLE" ],
     "breaks_into": [ { "item": "splinter", "count": [ 7, 9 ] }, { "item": "nail", "charges": [ 5, 10 ] } ],
     "damage_reduction": { "all": 16 }
   },
@@ -1212,7 +1205,7 @@
       "removal": { "skills": [ [ "fabrication", 2 ] ], "time": "60 m" },
       "repair": { "skills": [ [ "tailor", 1 ] ], "time": "150 s", "using": [ [ "sewing_standard", 50 ], [ "fabric_standard", 1 ] ] }
     },
-    "flags": [ "ENGINE", "CONTROLS", "PROTRUSION", "E_STARTS_INSTANTLY", "WIND_POWERED", "OVER", "STABLE", "UNMOUNT_ON_DAMAGE" ],
+    "flags": [ "ENGINE", "CONTROLS", "PROTRUSION", "E_STARTS_INSTANTLY", "WIND_POWERED", "STABLE", "UNMOUNT_ON_DAMAGE" ],
     "breaks_into": [ { "item": "splinter", "count": [ 2, 4 ] }, { "item": "cotton_patchwork", "count": [ 5, 10 ] } ]
   },
   {
@@ -2168,112 +2161,6 @@
     "flags": [ "BEEPER", "ODDTURN" ],
     "breaks_into": "ig_vp_device"
   },
-  {
-    "type": "vehicle_part",
-    "id": "door_trunk",
-    "name": { "str": "trunk door" },
-    "symbol": "+",
-    "looks_like": "hatch",
-    "categories": [ "hull" ],
-    "color": "light_gray",
-    "broken_symbol": "&",
-    "broken_color": "light_gray",
-    "damage_modifier": 80,
-    "durability": 150,
-    "description": "A short door.  You can always see over it, open or closed.",
-    "item": "frame",
-    "location": "center",
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 2 ] ] }
-    },
-    "flags": [
-      "OBSTACLE",
-      "OPENABLE",
-      "MULTISQUARE",
-      "BOARDABLE",
-      "LOW_FINAL_AIR_DRAG",
-      "NO_ROOF_NEEDED",
-      "WINDOW",
-      "SIMPLE_PART",
-      "DOOR"
-    ],
-    "breaks_into": "ig_vp_frame",
-    "damage_reduction": { "all": 20 }
-  },
-  {
-    "type": "vehicle_part",
-    "id": "hddoor_trunk",
-    "name": { "str": "heavy-duty trunk door" },
-    "symbol": "+",
-    "categories": [ "hull" ],
-    "color": "light_gray",
-    "looks_like": "door_trunk",
-    "broken_symbol": "&",
-    "broken_color": "light_gray",
-    "damage_modifier": 80,
-    "durability": 750,
-    "description": "A strong, short door.  You can always see over it, open or closed.",
-    "item": "hdframe",
-    "location": "center",
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 4 ] ] }
-    },
-    "flags": [ "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "LOW_FINAL_AIR_DRAG", "WINDOW", "SIMPLE_PART", "DOOR" ],
-    "breaks_into": "ig_vp_hdframe",
-    "damage_reduction": { "all": 30 }
-  },
-  {
-    "type": "vehicle_part",
-    "id": "door_shutter",
-    "name": { "str": "shutter door" },
-    "looks_like": "hatch",
-    "symbol": "+",
-    "categories": [ "hull" ],
-    "color": "white",
-    "broken_symbol": "&",
-    "broken_color": "white",
-    "damage_modifier": 80,
-    "durability": 95,
-    "description": "A strong door.  Solid construction means you can't see through it when closed.",
-    "item": "sheet_metal",
-    "location": "center",
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 2 ] ] }
-    },
-    "flags": [ "OPAQUE", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "SIMPLE_PART", "DOOR" ],
-    "breaks_into": "ig_vp_sheet_metal",
-    "damage_reduction": { "all": 7 }
-  },
-  {
-    "type": "vehicle_part",
-    "id": "door_sliding",
-    "name": { "str": "sliding door" },
-    "symbol": "+",
-    "looks_like": "door",
-    "categories": [ "hull" ],
-    "color": "light_cyan",
-    "broken_symbol": "&",
-    "broken_color": "light_cyan",
-    "damage_modifier": 80,
-    "durability": 150,
-    "description": "A door.  A window lets you see through it when closed.",
-    "item": "frame",
-    "location": "center",
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 2 ] ] }
-    },
-    "flags": [ "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "SIMPLE_PART", "DOOR" ],
-    "breaks_into": "ig_vp_frame",
-    "damage_reduction": { "all": 20 }
-  },
   {
     "type": "vehicle_part",
     "id": "cargo_space",
@@ -2635,54 +2522,6 @@
     "flags": [ "SHARP", "PROTRUSION" ],
     "breaks_into": [ { "item": "splinter", "count": [ 3, 7 ] } ]
   },
-  {
-    "type": "vehicle_part",
-    "id": "door_wood",
-    "name": { "str": "wooden door" },
-    "symbol": "+",
-    "looks_like": "t_door_c",
-    "categories": [ "hull" ],
-    "color": "brown",
-    "broken_symbol": "&",
-    "broken_color": "brown",
-    "damage_modifier": 75,
-    "durability": 160,
-    "description": "A door.  Has a window so you can see out of it, even when closed.",
-    "item": "frame_wood",
-    "location": "center",
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_nail_install", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "vehicle_nail_removal", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ] ] }
-    },
-    "flags": [ "OBSTACLE", "OPENABLE", "BOARDABLE", "WINDOW", "SIMPLE_PART", "DOOR" ],
-    "breaks_into": [ { "item": "splinter", "count": [ 7, 9 ] } ],
-    "damage_reduction": { "all": 8 }
-  },
-  {
-    "type": "vehicle_part",
-    "id": "door_wood_opaque",
-    "name": { "str": "opaque wooden door" },
-    "symbol": "+",
-    "looks_like": "door_wood",
-    "categories": [ "hull" ],
-    "color": "brown",
-    "broken_symbol": "&",
-    "broken_color": "brown",
-    "damage_modifier": 75,
-    "durability": 170,
-    "description": "A door.  Solid construction means you can't see through it when closed.",
-    "item": "frame_wood",
-    "location": "center",
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_nail_install", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "vehicle_nail_removal", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ] ] }
-    },
-    "flags": [ "OBSTACLE", "OPENABLE", "BOARDABLE", "OPAQUE", "SIMPLE_PART", "DOOR" ],
-    "breaks_into": [ { "item": "splinter", "count": [ 7, 9 ] } ],
-    "damage_reduction": { "all": 12 }
-  },
   {
     "type": "vehicle_part",
     "id": "roof_wood",
diff --git a/data/json/vehicleparts/vp_flags.json b/data/json/vehicleparts/vp_flags.json
index ce19d0694170a..b298fe0b853ee 100644
--- a/data/json/vehicleparts/vp_flags.json
+++ b/data/json/vehicleparts/vp_flags.json
@@ -465,10 +465,6 @@
     "id": "OPENCLOSE_INSIDE",
     "type": "json_flag"
   },
-  {
-    "id": "OVER",
-    "type": "json_flag"
-  },
   {
     "id": "PLANTER",
     "type": "json_flag"
diff --git a/data/json/vehicleparts/wheel.json b/data/json/vehicleparts/wheel.json
index 8c2fd02078ef2..bd459cd9ab6ca 100644
--- a/data/json/vehicleparts/wheel.json
+++ b/data/json/vehicleparts/wheel.json
@@ -308,7 +308,7 @@
     "damage_reduction": { "bash": 10 }
   },
   {
-    "abstract": "wheel_bicycle_abstract",
+    "id": "wheel_bicycle",
     "type": "vehicle_part",
     "name": { "str": "bicycle wheel" },
     "item": "wheel_bicycle",
@@ -335,25 +335,12 @@
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "adhesive_rubber", 1 ], [ "tire_rubber", 1 ] ] }
     },
     "flags": [ "WHEEL", "UNSTABLE_WHEEL", "NEEDS_JACKING", "NEEDS_WHEEL_MOUNT_LIGHT" ],
+    "symbols": { "rear": "|" },
     "damage_reduction": { "bash": 6 }
   },
-  {
-    "copy-from": "wheel_bicycle_abstract",
-    "id": "wheel_bicycle",
-    "looks_like": "wheel",
-    "symbol": "|",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "wheel_bicycle_abstract",
-    "id": "wheel_bicycle_rear",
-    "looks_like": "wheel_bicycle",
-    "symbol": "|",
-    "type": "vehicle_part"
-  },
   {
     "id": "wheel_bicycle_or",
-    "copy-from": "wheel_bicycle_abstract",
+    "copy-from": "wheel_bicycle",
     "type": "vehicle_part",
     "name": { "str": "off-road bicycle wheel" },
     "item": "wheel_bicycle_or",
@@ -361,12 +348,6 @@
     "wheel_offroad_rating": 0.7,
     "wheel_terrain_modifiers": { "FLAT": [ 0, 3 ], "ROAD": [ 0, 1 ] }
   },
-  {
-    "id": "wheel_bicycle_or_rear",
-    "copy-from": "wheel_bicycle_or",
-    "type": "vehicle_part",
-    "looks_like": "wheel_bicycle_rear"
-  },
   {
     "id": "wheel_caster",
     "type": "vehicle_part",
@@ -428,7 +409,7 @@
     "flags": [ "WHEEL", "NEEDS_JACKING", "STABLE", "STEERABLE" ]
   },
   {
-    "abstract": "wheel_motorbike_abstract",
+    "id": "wheel_motorbike",
     "type": "vehicle_part",
     "name": { "str": "motorbike wheel" },
     "item": "wheel_motorbike",
@@ -455,25 +436,12 @@
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "adhesive_rubber", 1 ], [ "tire_rubber", 1 ] ] }
     },
     "flags": [ "WHEEL", "UNSTABLE_WHEEL", "NEEDS_JACKING", "NEEDS_WHEEL_MOUNT_LIGHT" ],
+    "symbols": { "rear": "o" },
     "damage_reduction": { "bash": 10 }
   },
-  {
-    "copy-from": "wheel_motorbike_abstract",
-    "id": "wheel_motorbike",
-    "looks_like": "wheel",
-    "symbol": "o",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "wheel_motorbike_abstract",
-    "id": "wheel_motorbike_rear",
-    "looks_like": "wheel",
-    "symbol": "o",
-    "type": "vehicle_part"
-  },
   {
     "id": "wheel_motorbike_or",
-    "copy-from": "wheel_motorbike_abstract",
+    "copy-from": "wheel_motorbike",
     "type": "vehicle_part",
     "name": { "str": "off-road motorbike wheel" },
     "item": "wheel_motorbike_or",
@@ -482,11 +450,6 @@
     "wheel_terrain_modifiers": { "FLAT": [ 0, 3 ], "ROAD": [ 0, 1 ] },
     "damage_reduction": { "bash": 10, "cut": 8, "stab": 4 }
   },
-  {
-    "id": "wheel_motorbike_or_rear",
-    "copy-from": "wheel_motorbike_or",
-    "type": "vehicle_part"
-  },
   {
     "abstract": "wheel_small_abstract",
     "type": "vehicle_part",
@@ -522,11 +485,7 @@
   {
     "copy-from": "wheel_small_abstract",
     "id": "wheel_small_scooter",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "wheel_small_abstract",
-    "id": "wheel_small_scooter_rear",
+    "symbols": { "rear": "o" },
     "type": "vehicle_part"
   },
   {
diff --git a/data/json/vehicleparts/windshields.json b/data/json/vehicleparts/windshields.json
index f5eb4c67e64e6..833a9d87853f4 100644
--- a/data/json/vehicleparts/windshields.json
+++ b/data/json/vehicleparts/windshields.json
@@ -1,6 +1,6 @@
 [
   {
-    "abstract": "windshield_abstract",
+    "id": "windshield",
     "type": "vehicle_part",
     "breaks_into": [ { "count": [ 25, 50 ], "item": "glass_shard" } ],
     "symbol": "\"",
@@ -15,6 +15,8 @@
       "ne_edge": "u",
       "sw_edge": "b",
       "se_edge": "n",
+      "left": "j",
+      "right": "j",
       "vertical": "j",
       "vertical_left": "j",
       "vertical_right": "j",
@@ -34,7 +36,7 @@
     "damage_modifier": 70,
     "description": "A sheet of glass that lets you see outside the vehicle.",
     "durability": 50,
-    "flags": [ "OVER", "WINDSHIELD", "OBSTACLE", "WINDOW" ],
+    "flags": [ "WINDSHIELD", "OBSTACLE", "WINDOW" ],
     "item": "glass_sheet",
     "location": "center",
     "looks_like": "t_wall_glass",
@@ -45,50 +47,21 @@
     }
   },
   {
-    "copy-from": "windshield_abstract",
-    "id": "windshield",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "windshield_abstract",
+    "copy-from": "windshield",
     "id": "windshield_full",
-    "looks_like": "windshield",
     "type": "vehicle_part",
     "name": { "str": "full windshield" }
   },
   {
-    "abstract": "reinforced_windshield_abstract",
+    "id": "reinforced_windshield",
     "type": "vehicle_part",
+    "copy-from": "windshield",
     "breaks_into": [ { "count": [ 25, 50 ], "item": "glass_shard" }, { "count": [ 4, 8 ], "item": "wire" } ],
-    "symbol": "\"",
-    "symbols": {
-      "nw": "y",
-      "ne": "u",
-      "sw": "b",
-      "se": "n",
-      "nw_edge": "y",
-      "ne_edge": "u",
-      "sw_edge": "b",
-      "se_edge": "n",
-      "vertical": "j",
-      "vertical_left": "j",
-      "vertical_right": "H",
-      "horizontal_front": "h",
-      "horizontal_front_edge": "^",
-      "horizontal_rear": "h",
-      "horizontal_rear_edge": "="
-    },
-    "broken_color": "light_gray",
-    "broken_symbol": "0",
-    "categories": [ "hull" ],
-    "color": "light_blue",
     "damage_modifier": 80,
     "damage_reduction": { "all": 16 },
     "description": "A sheet of glass that lets you see outside the vehicle.  Reinforced with wire to make it harder to break than normal glass.",
     "durability": 250,
-    "flags": [ "WINDSHIELD", "OBSTACLE", "WINDOW" ],
     "item": "reinforced_glass_sheet",
-    "location": "center",
     "looks_like": "windshield",
     "name": { "str": "reinforced windshield" },
     "requirements": {
@@ -97,12 +70,7 @@
     }
   },
   {
-    "copy-from": "reinforced_windshield_abstract",
-    "id": "reinforced_windshield",
-    "type": "vehicle_part"
-  },
-  {
-    "copy-from": "reinforced_windshield_abstract",
+    "copy-from": "reinforced_windshield",
     "id": "reinforced_windshield_full",
     "looks_like": "reinforced_windshield",
     "type": "vehicle_part",
diff --git a/data/json/vehicles/cars.json b/data/json/vehicles/cars.json
index 7d13f53fd4632..c9a44ae341600 100644
--- a/data/json/vehicles/cars.json
+++ b/data/json/vehicles/cars.json
@@ -625,8 +625,8 @@
       { "x": -1, "y": 2, "parts": [ "frame_vertical_right", "halfboard_vertical_right" ] },
       { "x": -2, "y": -1, "parts": [ "frame_sw", "halfboard_hatch_wheel_left", "wheel_mount_medium" ] },
       { "x": -2, "y": -1, "part": "wheel_slick" },
-      { "x": -2, "y": 0, "parts": [ "frame_horizontal_rear", "door_trunk_hatch_wheel_left" ] },
-      { "x": -2, "y": 1, "parts": [ "frame_horizontal_rear", "door_trunk_hatch_wheel_left" ] },
+      { "x": -2, "y": 0, "parts": [ "frame_horizontal_rear", "door_trunk_wheel_left" ] },
+      { "x": -2, "y": 1, "parts": [ "frame_horizontal_rear", "door_trunk_wheel_left" ] },
       { "x": -2, "y": 2, "parts": [ "frame_se", "halfboard_hatch_wheel_right", "wheel_mount_medium" ] },
       { "x": -2, "y": 2, "part": "wheel_slick" }
     ],
diff --git a/data/json/vehicles/carts.json b/data/json/vehicles/carts.json
index 72be38a228b41..baf8f04f99516 100644
--- a/data/json/vehicles/carts.json
+++ b/data/json/vehicles/carts.json
@@ -15,9 +15,9 @@
       [ "H" ]
     ],
     "parts": [
-      { "x": 0, "y": 0, "parts": [ "xlframe_cross_unconnected", "wheel_10", "minifridge" ] },
+      { "x": 0, "y": 0, "parts": [ "xlframe_cross", "wheel_10", "minifridge" ] },
       { "x": 0, "y": 0, "part": "controls_electronic" },
-      { "x": -1, "y": 0, "parts": [ "xlframe_cross_unconnected", "wheel_10" ] },
+      { "x": -1, "y": 0, "parts": [ "xlframe_cross", "wheel_10" ] },
       { "x": -1, "y": 0, "parts": [ "small_storage_battery" ] },
       { "x": -1, "y": 0, "part": "veh_tools_kitchen", "tools": [ "hotplate", "pan", "pot" ] }
     ],
diff --git a/data/json/vehicles/trucks.json b/data/json/vehicles/trucks.json
index bf5f564149ff8..3d3031c364a67 100644
--- a/data/json/vehicles/trucks.json
+++ b/data/json/vehicles/trucks.json
@@ -633,12 +633,12 @@
       { "x": -4, "y": 2, "parts": [ "hdframe_cross", "cargo_space", "roof_cloth" ] },
       { "x": -4, "y": 3, "parts": [ "hdframe_vertical_right", "clothboard_wheel_right" ] },
       { "x": -4, "y": 3, "parts": [ "roof_cloth", "wheel_mount_medium", "wheel_wide" ] },
-      { "x": -5, "y": -1, "parts": [ "hdframe_sw", "clothboard_sw_edge", "roof_cloth" ] },
+      { "x": -5, "y": -1, "parts": [ "hdframe_sw", "clothboard_sw", "roof_cloth" ] },
       { "x": -5, "y": 0, "parts": [ "hdframe_horizontal_rear", "cargo_space", "roof_cloth" ] },
       { "x": -5, "y": 1, "parts": [ "hdframe_horizontal_rear", "wooden_aisle_vertical" ] },
       { "x": -5, "y": 1, "part": "roof_cloth" },
       { "x": -5, "y": 2, "parts": [ "hdframe_horizontal_rear", "cargo_space", "roof_cloth" ] },
-      { "x": -5, "y": 3, "parts": [ "hdframe_se", "clothboard_se_edge", "roof_cloth" ] }
+      { "x": -5, "y": 3, "parts": [ "hdframe_se", "clothboard_se", "roof_cloth" ] }
     ],
     "items": [
       { "x": 0, "y": 0, "chance": 6, "items": [ "vodka" ] },
diff --git a/data/json/vehicles/utility.json b/data/json/vehicles/utility.json
index f78b7a084ab1b..d3fb156113d65 100644
--- a/data/json/vehicles/utility.json
+++ b/data/json/vehicles/utility.json
@@ -169,8 +169,8 @@
       { "x": 1, "y": 0, "parts": [ "wheel", "headlight" ] },
       { "x": 1, "y": 1, "parts": [ "hdframe_ne", "hdhalfboard_ne", "wheel_mount_medium" ] },
       { "x": 1, "y": 1, "parts": [ "wheel", "headlight" ] },
-      { "x": 2, "y": 0, "part": "forklift_fork_horizontal_front" },
-      { "x": 2, "y": 1, "part": "forklift_fork_horizontal_front" },
+      { "x": 2, "y": 0, "part": "forklift_fork" },
+      { "x": 2, "y": 1, "part": "forklift_fork" },
       { "x": -1, "y": 0, "parts": [ "hdframe_sw", "counterweight_sw", "wheel_mount_light_steerable" ] },
       { "x": -1, "y": 0, "part": "wheel_small" },
       { "x": -1, "y": 1, "parts": [ "hdframe_se", "counterweight_se", "wheel_mount_light_steerable" ] },
@@ -200,8 +200,8 @@
       { "x": 1, "y": 0, "parts": [ "wheel", "headlight" ] },
       { "x": 1, "y": 1, "parts": [ "hdframe_ne", "hdhalfboard_ne", "wheel_mount_medium" ] },
       { "x": 1, "y": 1, "parts": [ "wheel", "headlight" ] },
-      { "x": 2, "y": 0, "part": "forklift_fork_horizontal_front" },
-      { "x": 2, "y": 1, "part": "forklift_fork_horizontal_front" },
+      { "x": 2, "y": 0, "part": "forklift_fork" },
+      { "x": 2, "y": 1, "part": "forklift_fork" },
       { "x": -1, "y": 0, "parts": [ "hdframe_sw", "counterweight_sw", "wheel_mount_light_steerable" ] },
       { "x": -1, "y": 0, "part": "wheel_small" },
       { "x": -1, "y": 0, "part": "tank_medium", "fuel": "diesel" },
diff --git a/src/vehicle_part.cpp b/src/vehicle_part.cpp
index bcbd312deeea9..983f3df589c08 100644
--- a/src/vehicle_part.cpp
+++ b/src/vehicle_part.cpp
@@ -122,6 +122,9 @@ std::string vehicle_part::name( bool with_prefix ) const
     if( is_leaking() ) {
         res += _( " (draining)" );
     }
+    if( debug_mode ) {
+        res += "{" + variant + "}";
+    }
     return res;
 }