diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt
index 68846f7b9..8cf6bd9b6 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt
@@ -114,6 +114,9 @@ fun addBlockStates(provider: MatteryBlockStateProvider) {
 	provider.block(MBlocks.ENERGY_SERVO.values)
 	provider.block(MBlocks.COBBLESTONE_GENERATOR.values)
 
+	provider.block(MBlocks.PAINTER)
+	provider.block(MBlocks.INFINITE_WATER_SOURCE)
+
 	provider.exec {
 		for (block in MBlocks.ESSENCE_STORAGE.values) {
 			provider.getVariantBuilder(block).forAllStates {
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
index daadb672c..349820416 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
@@ -186,6 +186,9 @@ fun addItemModels(provider: MatteryItemModelProvider) {
 	provider.coloredWithBaseBlock(MItems.MATTER_RECYCLER, "matter_recycler", "_idle")
 	provider.coloredWithBaseBlock(MItems.COBBLESTONE_GENERATOR, "cobblestone_generator")
 
+	provider.block(MItems.PAINTER, "painter")
+	provider.block(MItems.INFINITE_WATER_SOURCE, "infinite_water_source")
+
 	provider.exec {
 		provider.withExistingParent("essence_storage", modLocation("block/essence_storage_empty"))
 			.override()
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/water_source.json b/src/main/resources/assets/overdrive_that_matters/models/block/infinite_water_source.json
similarity index 100%
rename from src/main/resources/assets/overdrive_that_matters/models/block/water_source.json
rename to src/main/resources/assets/overdrive_that_matters/models/block/infinite_water_source.json
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/painting_table.json b/src/main/resources/assets/overdrive_that_matters/models/block/painter.json
similarity index 100%
rename from src/main/resources/assets/overdrive_that_matters/models/block/painting_table.json
rename to src/main/resources/assets/overdrive_that_matters/models/block/painter.json
diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/matter_cable.json b/src/main/resources/assets/overdrive_that_matters/models/item/matter_cable.json
deleted file mode 100644
index 530e26553..000000000
--- a/src/main/resources/assets/overdrive_that_matters/models/item/matter_cable.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-	"parent": "block/block",
-	"texture_size": [16, 16],
-	"textures": {
-		"0": "overdrive_that_matters:block/matter_cable",
-		"particle": "#0"
-	},
-	"elements": [
-		{
-			"from": [6, 6, 6],
-			"to": [10, 10, 10],
-			"faces": {
-				"north": {"uv": [0, 0, 4, 4], "texture": "#0"},
-				"south": {"uv": [0, 0, 4, 4], "texture": "#0"},
-				"up": {"uv": [0, 0, 4, 4], "texture": "#0"},
-				"down": {"uv": [0, 0, 4, 4], "texture": "#0"}
-			}
-		},
-		{
-			"from": [0, 6, 6],
-			"to": [6, 10, 10],
-			"faces": {
-				"north": {"uv": [4, 0, 10, 4], "texture": "#0"},
-				"south": {"uv": [10, 0, 4, 4], "texture": "#0"},
-				"west": {"uv": [0, 0, 4, 4], "texture": "#0"},
-				"up": {"uv": [10, 0, 4, 4], "texture": "#0"},
-				"down": {"uv": [10, 0, 4, 4], "texture": "#0"}
-			}
-		},
-		{
-			"from": [10, 6, 6],
-			"to": [16, 10, 10],
-			"faces": {
-				"north": {"uv": [10, 0, 16, 4], "texture": "#0"},
-				"east": {"uv": [0, 0, 4, 4], "texture": "#0"},
-				"south": {"uv": [16, 0, 10, 4], "texture": "#0"},
-				"up": {"uv": [16, 0, 10, 4], "texture": "#0"},
-				"down": {"uv": [16, 0, 10, 4], "texture": "#0"}
-			}
-		}
-	],
-	"gui_light": "front",
-	"display": {
-		"gui": {
-			"rotation": [0, 0, 0],
-			"translation": [0, 0, 0],
-			"scale": [1, 1, 1]
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_tritanium_ore.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_tritanium_ore.png
index 1cff8f467..786132f8b 100644
Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_tritanium_ore.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_tritanium_ore.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/tritanium_ore.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/tritanium_ore.png
index 53a1f0e06..b8ad6556b 100644
Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/tritanium_ore.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/tritanium_ore.png differ