diff --git a/src/main/java/openblocks/Config.java b/src/main/java/openblocks/Config.java
index e9e2e0a8b..4ec5ee237 100644
--- a/src/main/java/openblocks/Config.java
+++ b/src/main/java/openblocks/Config.java
@@ -1273,7 +1273,7 @@ public int getBurnTime(ItemStack fuel) {
 
         if (OpenBlocks.Items.stencil != null) {
             if (stencilLoot) {
-                for (Stencil stencil : Stencil.values()) {
+                for (Stencil stencil : Stencil.VALUES) {
                     WeightedRandomChestContent drop = new WeightedRandomChestContent(
                             new ItemStack(OpenBlocks.Items.stencil, 1, stencil.ordinal()),
                             1,
diff --git a/src/main/java/openblocks/client/gui/GuiDrawingTable.java b/src/main/java/openblocks/client/gui/GuiDrawingTable.java
index cf0179368..4f02f6f69 100644
--- a/src/main/java/openblocks/client/gui/GuiDrawingTable.java
+++ b/src/main/java/openblocks/client/gui/GuiDrawingTable.java
@@ -70,7 +70,7 @@ public void componentMouseDown(BaseComponent component, int x, int y, int button
         (iconDisplay = new GuiComponentSprite(
                 80,
                 34,
-                Stencil.values()[0].getBlockIcon(),
+                Stencil.VALUES[0].getBlockIcon(),
                 TextureMap.locationBlocksTexture)).setColor(0f, 0f, 0f).setOverlayMode(true)
                         .setEnabled(inventorySlots.getSlot(0).getStack() != null);
         root.addComponent(iconDisplay);
diff --git a/src/main/java/openblocks/common/block/BlockCanvas.java b/src/main/java/openblocks/common/block/BlockCanvas.java
index 554ddb0c0..da5098c19 100644
--- a/src/main/java/openblocks/common/block/BlockCanvas.java
+++ b/src/main/java/openblocks/common/block/BlockCanvas.java
@@ -47,7 +47,7 @@ public void registerBlockIcons(IIconRegister registry) {
         super.registerBlockIcons(registry);
         baseIcon = registry.registerIcon("openblocks:canvas");
         wallpaper = registry.registerIcon("openblocks:wallpaper");
-        for (Stencil stencil : Stencil.values()) stencil.registerBlockIcons(registry);
+        for (Stencil stencil : Stencil.VALUES) stencil.registerBlockIcons(registry);
     }
 
     public void setLayerForRender(int layer) {
diff --git a/src/main/java/openblocks/common/item/ItemStencil.java b/src/main/java/openblocks/common/item/ItemStencil.java
index d2d6c2c2d..0db9d5900 100644
--- a/src/main/java/openblocks/common/item/ItemStencil.java
+++ b/src/main/java/openblocks/common/item/ItemStencil.java
@@ -35,13 +35,13 @@ public int getSpriteNumber() {
 
     @Override
     public IIcon getIconFromDamage(int dmg) {
-        return Objects.firstNonNull(Stencil.values()[dmg].getCoverBlockIcon(), itemIcon);
+        return Objects.firstNonNull(Stencil.VALUES[dmg].getCoverBlockIcon(), itemIcon);
     }
 
     @Override
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) {
-        for (Stencil stencil : Stencil.values()) {
+        for (Stencil stencil : Stencil.VALUES) {
             list.add(new ItemStack(item, 1, stencil.ordinal()));
         }
     }
diff --git a/src/main/java/openblocks/common/sync/SyncableBlockLayers.java b/src/main/java/openblocks/common/sync/SyncableBlockLayers.java
index d25a3c543..092506ce3 100644
--- a/src/main/java/openblocks/common/sync/SyncableBlockLayers.java
+++ b/src/main/java/openblocks/common/sync/SyncableBlockLayers.java
@@ -80,7 +80,7 @@ public static Layer createFromStream(DataInput stream) {
                 layer.setRotation(stream.readByte());
                 byte b = stream.readByte();
                 if (b > -1) {
-                    layer.setStencil(Stencil.values()[b]);
+                    layer.setStencil(Stencil.VALUES[b]);
                 }
                 layer.setHasStencilCover(stream.readBoolean());
             } catch (Exception e) {