diff --git a/dependencies.gradle b/dependencies.gradle
index 0c0004c8c2..9f03a4dd14 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -24,5 +24,5 @@ dependencies {
     compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797
     compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2
 
-    api('com.github.GTNewHorizons:Angelica:1.0.0-alpha29:api') {transitive = false}
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha29:api') {transitive = false}
 }
diff --git a/gradle.properties b/gradle.properties
index d9201ac5b6..e6b66f279e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -50,10 +50,10 @@ enableGenericInjection = false
 # Generate a class with a String field for the mod version named as defined below.
 # If generateGradleTokenClass is empty or not missing, no such class will be generated.
 # If gradleTokenVersion is empty or missing, the field will not be present in the class.
-generateGradleTokenClass =
+generateGradleTokenClass = crazypants.enderio.Tags
 
 # Name of the token containing the project's current version to generate/replace.
-gradleTokenVersion = GRADLETOKEN_VERSION
+gradleTokenVersion = VERSION
 
 # [DEPRECATED] Mod ID replacement token.
 gradleTokenModId =
@@ -70,7 +70,7 @@ gradleTokenGroupName =
 # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
 # version in @Mod([...], version = VERSION, [...]).
 # Leave these properties empty to skip individual token replacements.
-replaceGradleTokenInFile = EnderIO.java
+replaceGradleTokenInFile =
 
 # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
 # leave this property empty.
diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java
index 7668c638fb..2d6720451e 100644
--- a/src/main/java/crazypants/enderio/EnderIO.java
+++ b/src/main/java/crazypants/enderio/EnderIO.java
@@ -193,7 +193,7 @@ public class EnderIO {
     public static final String MODID = "EnderIO";
     public static final String DOMAIN = MODID.toLowerCase(Locale.US);
     public static final String MOD_NAME = "Ender IO";
-    public static final String VERSION = "GRADLETOKEN_VERSION";
+    public static final String VERSION = Tags.VERSION;
 
     @Instance(MODID)
     public static EnderIO instance;
diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java
index a8c9c4fd17..78f35c129a 100644
--- a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java
+++ b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java
@@ -42,7 +42,7 @@ public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Blo
 
     private CustomCubeRenderer ccr = new CustomCubeRenderer();
 
-    private PaintedBlockRenderer paintedRenderer = new PaintedBlockRenderer(this.getRenderId(), null); // passthrough
+    private final PaintedBlockRenderer paintedRenderer = new PaintedBlockRenderer(this.getRenderId(), null);
     // renderer for
     // paintable
     // machines
diff --git a/src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java b/src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java
index 0eceeb1408..1a7865d157 100644
--- a/src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java
+++ b/src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java
@@ -29,6 +29,7 @@ public PaintedBlockRenderer(int renderId, Block defaultBlock) {
     }
 
     @Override
+    @Optional.Method(modid = "angelica")
     public ThreadSafeISBRHFactory newInstance() {
         return new PaintedBlockRenderer(renderId, defaultBlock);
     }