diff --git a/code/datums/autolathe/engineering.dm b/code/datums/autolathe/engineering.dm
index 228f0d54281..78b7da1e8e0 100644
--- a/code/datums/autolathe/engineering.dm
+++ b/code/datums/autolathe/engineering.dm
@@ -80,7 +80,7 @@
 
 /datum/category_item/autolathe/engineering/electrochromic
 	name = "electrochromic window control electronics"
-	path =/obj/item/circuitboard/electrochromic
+	path =/obj/item/weapon/circuitboard/electrochromic
 
 /datum/category_item/autolathe/engineering/pipelayer
 	name = "pipe layer electronics"
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 28ff940097a..6f97f72e3d3 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -41,8 +41,8 @@
 			stacktype = material.stack_type
 
 /obj/item/stack/tile/attackby(obj/item/W as obj, mob/user as mob)
-	if (istype(W, /obj/item/weldingtool))
-		var/obj/item/weldingtool/WT = W
+	if (istype(W, /obj/item/weapon/weldingtool))
+		var/obj/item/weapon/weldingtool/WT = W
 
 		if(can_weld == FALSE)
 			to_chat("You can't reform these into their original components.")
diff --git a/code/game/objects/items/weapons/circuitboards/frame.dm b/code/game/objects/items/weapons/circuitboards/frame.dm
index ef1e041fb7f..c9bed28a5ea 100644
--- a/code/game/objects/items/weapons/circuitboards/frame.dm
+++ b/code/game/objects/items/weapons/circuitboards/frame.dm
@@ -74,7 +74,7 @@
 	board_type = new /datum/frame/frame_types/geiger
 	matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
 
-/obj/item/circuitboard/electrochromic
+/obj/item/weapon/circuitboard/electrochromic
 	name = T_BOARD("electrochromic button")
 	build_path = /obj/machinery/button/windowtint
 	board_type = new /datum/frame/frame_types/electrochromic_button
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 3c91dd3374f..35e7a339afa 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -637,7 +637,7 @@
 	icon_state = "light0"
 	desc = "A remote control switch for polarized windows."
 	var/range = 7
-	circuit = /obj/item/circuitboard/electrochromic
+	circuit = /obj/item/weapon/circuitboard/electrochromic
 
 /obj/machinery/button/windowtint/attack_hand(mob/user as mob)
 	if(..())
diff --git a/icons/obj/stock_parts.dmi b/icons/obj/stock_parts.dmi
index 1f58fb93302..30baa36e3cd 100644
Binary files a/icons/obj/stock_parts.dmi and b/icons/obj/stock_parts.dmi differ
diff --git a/icons/obj/stock_parts_vr.dmi b/icons/obj/stock_parts_vr.dmi
index 7b078871a72..8e48a4c0a30 100644
Binary files a/icons/obj/stock_parts_vr.dmi and b/icons/obj/stock_parts_vr.dmi differ
diff --git a/vorestation.dme b/vorestation.dme
index b31ae156799..3759d2cb5c0 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2619,6 +2619,7 @@
 #include "code\modules\materials\materials\metals\steel_vr.dm"
 #include "code\modules\materials\materials\organic\animal_products.dm"
 #include "code\modules\materials\materials\organic\cloth.dm"
+#include "code\modules\materials\materials\organic\grass.dm"
 #include "code\modules\materials\materials\organic\leather.dm"
 #include "code\modules\materials\materials\organic\resin.dm"
 #include "code\modules\materials\materials\organic\wood.dm"