diff --git a/config/oreveins/ore_veins.json b/config/oreveins/ore_veins.json
index b09b871..556c532 100644
--- a/config/oreveins/ore_veins.json
+++ b/config/oreveins/ore_veins.json
@@ -69,9 +69,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/silver",
+      "blocks": {
+        "block": "thermalfoundation:ore",
+        "meta": 2
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 240,
@@ -90,9 +93,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/platinium",
+      "blocks": {
+        "block": "thermalfoundation:ore",
+        "meta": 6
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 300,
@@ -111,9 +117,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/tin",
+      "blocks": {
+        "block": "mekanism:oreblock",
+        "meta": 2
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 180,
@@ -133,9 +142,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/aluminium",
+      "blocks": {
+        "block": "thermalfoundation:ore",
+        "meta": 4
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 190,
@@ -154,9 +166,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/nickel",
+      "blocks": {
+        "block": "thermalfoundation:ore",
+        "meta": 5
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 210,
@@ -175,9 +190,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/redstone",
+      "blocks": {
+        "block": "minecraft:redstone_ore",
+        "meta": 0
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 170,
@@ -195,9 +213,9 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/osmium",
+      "blocks": "mekanism:oreblock",
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 190,
@@ -216,9 +234,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/magnesium",
+      "blocks": {
+        "block": "nuclearcraft:ore",
+        "meta": 7
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 255,
@@ -233,21 +254,24 @@
     "type": "cluster",
     "ore": {
       "block": "nuclearcraft:ore",
-      "meta": 5
+      "meta": 7
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/boron",
+      "blocks": {
+        "block": "nuclearcraft:ore",
+        "meta": 7
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
-    "rarity": 280,
+    "rarity": 255,
     "min_y": 5,
-    "max_y": 25,
-    "density": 55,
-    "vertical_size": 11,
-    "horizontal_size": 7
+    "max_y": 45,
+    "density": 65,
+    "vertical_size": 12,
+    "horizontal_size": 9
   },
 
   "lithium_ore": {
@@ -258,9 +282,10 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/lithium",
+      "blocks": "nuclearcraft:ore",
+      "meta": 6,
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 255,
@@ -279,9 +304,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/uranium",
+      "blocks": {
+        "block": "nuclearcraft:ore",
+        "meta": 4
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 260,
@@ -299,9 +327,9 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/coal",
+      "blocks": "minecraft:coal_ore",
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 90,
@@ -320,9 +348,9 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/iron",
+      "blocks": "minecraft:iron_ore",
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 160,
@@ -340,9 +368,9 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/diamond",
+      "blocks": "minecraft:diamond_ore",
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 300,
@@ -353,16 +381,16 @@
     "horizontal_size": 6
   },
 
-  "lapis_ore": {
+  "lapislazuli_ore": {
     "type": "cluster",
     "ore": {
       "block": "minecraft:lapis_ore"
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/lapis",
+      "blocks": "minecraft:lapis_ore",
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 150,
@@ -381,9 +409,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/silicon",
+      "blocks": {
+        "block": "galacticraftcore:basic_block_core",
+        "meta": 8
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 210,
@@ -401,9 +432,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/lead",
+      "blocks": {
+        "block": "thermalfoundation:ore",
+        "meta": 3
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 185,
@@ -421,9 +455,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/iridium",
+      "blocks": {
+        "block": "thermalfoundation:ore",
+        "meta": 7
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 360,
@@ -442,9 +479,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/blackquartz",
+      "blocks": {
+        "block": "actuallyadditions:block_misc",
+        "meta": 3
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 265,
@@ -463,9 +503,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/ruby",
+      "blocks": {
+        "block": "biomesoplenty:gem_ore",
+        "meta": 1
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 310,
@@ -479,13 +522,16 @@
     "type": "cluster",
     "ore": {
       "block": "biomesoplenty:gem_ore",
-      "meta": 7
+      "meta": 2
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/amber",
+      "blocks": {
+        "block": "biomesoplenty:gem_ore",
+        "meta": 2
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 275,
@@ -503,9 +549,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/sapphire",
+      "blocks": {
+        "block": "biomesoplenty:gem_ore",
+        "meta": 6
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 310,
@@ -523,9 +572,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/peridot",
+      "blocks": {
+        "block": "biomesoplenty:gem_ore",
+        "meta": 3
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 300,
@@ -543,9 +595,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/malachite",
+      "blocks": {
+        "block": "biomesoplenty:gem_ore",
+        "meta": 5
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 270,
@@ -563,9 +618,12 @@
     },
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/tanzite",
+      "blocks": {
+        "block": "biomesoplenty:gem_ore",
+        "meta": 3
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 295,
@@ -576,7 +634,7 @@
     "horizontal_size": 4
   },
 
-  "certus_quartz_ore": {
+  "Certuz_quarz_ore": {
     "type": "cluster",
     "ore": [{
       "block": "appliedenergistics2:quartz_ore",
@@ -589,9 +647,12 @@
     ],
     "stone": "minecraft:stone",
     "indicator": {
-      "blocks": "contenttweaker:juice/internal/indicator/certus_quartz",
+      "blocks": {
+        "block": "biomesoplenty:gem_ore",
+        "meta": 3
+      },
       "ignore_vegatation": false,
-      "ignore_liquids": false,
+      "ignore_liquids": true,
       "rarity": 24
     },
     "rarity": 330,
diff --git a/index.toml b/index.toml
index c3de786..c3884c2 100644
--- a/index.toml
+++ b/index.toml
@@ -1146,7 +1146,7 @@ hash = "5046cde3673ccd62ba2209aaab9a917b3e1b0da7f521477e89f68bdba1648187"
 
 [[files]]
 file = "config/oreveins/ore_veins.json"
-hash = "e1b2b9e15458917be388f68454e78dec70d299e82525f35233d817ea9e2b03cf"
+hash = "7067d0416027c37e15664292adee87595e6854ef706191138d4e833f40d7ee69"
 
 [[files]]
 file = "config/sereneseasons/biome_info.json"
@@ -2396,7 +2396,7 @@ hash = "a07879875ad20ae8e285c3cb39beeee648bd080ec12985b76583ad707a3de3ee"
 
 [[files]]
 file = "scripts/ore_veins/indicators.1.zs"
-hash = "e1c7d1f08c0c54de9b6f9be8c29b3fe4c6f35bc3c8e917d06aaf7bf4fd182a2a"
+hash = "eee1737869c3a9a2d2261894b32f09d8dee48df55f07393eec54ba8748a13d79"
 
 [[files]]
 file = "scripts/ore_veins/indicators.2.zs"
diff --git a/pack.toml b/pack.toml
index 4659ff7..b0db9ee 100644
--- a/pack.toml
+++ b/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "d16c25fabb4e0584e25d5d3196037dcfd66ecf74bb6b569e9e8a4bec59e90d11"
+hash = "527f56bf2ae60d1bb9da7e557bcc334b28b86463a098678d67220e81479a5bf9"
 
 [versions]
 forge = "14.23.5.2860"
diff --git a/scripts/ore_veins/indicators.1.zs b/scripts/ore_veins/indicators.1.zs
index 5a2b4d8..f0cee4f 100644
--- a/scripts/ore_veins/indicators.1.zs
+++ b/scripts/ore_veins/indicators.1.zs
@@ -7,35 +7,9 @@ import mods.contenttweaker.VanillaFactory;
 
 var nugget_table as string[][] = [
     # [name, id, meta]
-    ["copper", "ic2:resource", "1"],
+    ["copper", "thermalfoundation:ore", "0"],
     ["apatite", "forestry:resources", "0"],
-    ["gold", "minecraft:gold_ore", "0"],
-    ["silver", "thermalfoundation:ore", "2"],
-    ["platinium", "thermalfoundation:ore", "6"],
-    ["tin", "mekanism:oreblock", "2"],
-    ["aliminium", "thermalfoundation:ore", "4"],
-    ["nickel", "thermalfoundation:ore", "5"],
-    ["redstone", "minecraft:redstone_ore", "0"],
-    ["osmium", "mekanism:oreblock", "0"],
-    ["magnesium", "nuclearcraft:ore", "7"],
-    ["boron", "nuclearcraft:ore", "5"],
-    ["lithium", "nuclearcraft:ore", "6"],
-    ["uranium", "nuclearcraft:ore", "4"],
-    ["coal", "minecarft:coal_ore", "0"],
-    ["iron", "minecraft:iron_ore", "0"],
-    ["diamond", "minecraft:diamond_ore", "0"],
-    ["lapis", "minecraft:lapis_ore", "0"],
-    ["silicon", "galacticraftcore:basic_block_core", "8"],
-    ["lead", "thermalfoundation:ore", "3"],
-    ["iridium", "thermalfoundation:ore", "7"],
-    ["blackquartz", "actuallyadditions:block_misc", "3"],
-    ["ruby", "biomesofplenty:gem_ore", "1"],
-    ["amber", "biomesofplenty:gem_ore", "7"],
-    ["sapphire", "biomesofplenty:gem_ore", "6"],
-    ["peridot", "biomesofplenty:gem_ore", "2"],
-    ["malachite", "biomesofplenty:gem_ore", "5"],
-    ["tanzite", "biomesofplenty:gem_ore", "4"],
-    ["certus_quartz", "appliedenegistics2:material", "0"]
+    ["gold", "minecraft:gold_ore", "0"]
 ];
 
 function replaceCommand(blockName as string, item as string, meta as string, blockPos as mods.contenttweaker.BlockPos) as string {