diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java
index 308143b73..ad9805550 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java
@@ -1,9 +1,12 @@
 package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.block.info.BlockInfoBuilder;
 import com.raoulvdberge.refinedstorage.render.IModelRegistration;
+import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright;
 import com.raoulvdberge.refinedstorage.tile.TileNetworkReceiver;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.util.BlockRenderLayer;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -16,6 +19,13 @@ public class BlockNetworkReceiver extends BlockNode {
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
         modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory"));
+
+        modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelFullbright(base, RS.ID + ":blocks/network_receiver/cutouts/connected"));
+    }
+
+    @Override
+    public BlockRenderLayer getBlockLayer() {
+        return BlockRenderLayer.CUTOUT;
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java
index bb0005045..2cb605b38 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java
@@ -1,12 +1,15 @@
 package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.RSGui;
 import com.raoulvdberge.refinedstorage.block.info.BlockInfoBuilder;
 import com.raoulvdberge.refinedstorage.render.IModelRegistration;
+import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright;
 import com.raoulvdberge.refinedstorage.tile.TileNetworkTransmitter;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
@@ -23,6 +26,13 @@ public class BlockNetworkTransmitter extends BlockNode {
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
         modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory"));
+
+        modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelFullbright(base, RS.ID + ":blocks/network_transmitter/cutouts/connected"));
+    }
+
+    @Override
+    public BlockRenderLayer getBlockLayer() {
+        return BlockRenderLayer.CUTOUT;
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java
index 11c011aeb..7b7e21800 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java
@@ -1,12 +1,15 @@
 package com.raoulvdberge.refinedstorage.block;
 
+import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.RSGui;
 import com.raoulvdberge.refinedstorage.block.info.BlockInfoBuilder;
 import com.raoulvdberge.refinedstorage.render.IModelRegistration;
+import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright;
 import com.raoulvdberge.refinedstorage.tile.TileRelay;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
@@ -23,6 +26,13 @@ public class BlockRelay extends BlockNode {
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
         modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory"));
+
+        modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelFullbright(base, RS.ID + ":blocks/relay/cutouts/connected"));
+    }
+
+    @Override
+    public BlockRenderLayer getBlockLayer() {
+        return BlockRenderLayer.CUTOUT;
     }
 
     @Override
diff --git a/src/main/resources/assets/refinedstorage/blockstates/network_receiver.json b/src/main/resources/assets/refinedstorage/blockstates/network_receiver.json
index 774d8c95a..f79e7224b 100755
--- a/src/main/resources/assets/refinedstorage/blockstates/network_receiver.json
+++ b/src/main/resources/assets/refinedstorage/blockstates/network_receiver.json
@@ -1,9 +1,11 @@
 {
   "forge_marker": 1,
   "defaults": {
-    "model": "cube_all",
+    "model": "refinedstorage:cube_all_cutout",
     "textures": {
-      "all": "refinedstorage:blocks/network_receiver_disconnected"
+      "particle": "refinedstorage:blocks/network_receiver/network_receiver",
+      "all": "refinedstorage:blocks/network_receiver/network_receiver",
+      "cutout": "refinedstorage:blocks/network_receiver/cutouts/disconnected"
     }
   },
   "variants": {
@@ -15,7 +17,7 @@
     "connected": {
       "true": {
         "textures": {
-          "all": "refinedstorage:blocks/network_receiver_connected"
+          "cutout": "refinedstorage:blocks/network_receiver/cutouts/connected"
         }
       },
       "false": {
diff --git a/src/main/resources/assets/refinedstorage/blockstates/network_transmitter.json b/src/main/resources/assets/refinedstorage/blockstates/network_transmitter.json
index 86e56d08f..a88a3dae1 100755
--- a/src/main/resources/assets/refinedstorage/blockstates/network_transmitter.json
+++ b/src/main/resources/assets/refinedstorage/blockstates/network_transmitter.json
@@ -1,9 +1,11 @@
 {
   "forge_marker": 1,
   "defaults": {
-    "model": "cube_all",
+    "model": "refinedstorage:cube_all_cutout",
     "textures": {
-      "all": "refinedstorage:blocks/network_transmitter_disconnected"
+      "particle": "refinedstorage:blocks/network_transmitter/network_transmitter",
+      "all": "refinedstorage:blocks/network_transmitter/network_transmitter",
+      "cutout": "refinedstorage:blocks/network_transmitter/cutouts/disconnected"
     }
   },
   "variants": {
@@ -15,7 +17,7 @@
     "connected": {
       "true": {
         "textures": {
-          "all": "refinedstorage:blocks/network_transmitter_connected"
+          "cutout": "refinedstorage:blocks/network_transmitter/cutouts/connected"
         }
       },
       "false": {
diff --git a/src/main/resources/assets/refinedstorage/blockstates/relay.json b/src/main/resources/assets/refinedstorage/blockstates/relay.json
index 93857548a..3acf95d9a 100755
--- a/src/main/resources/assets/refinedstorage/blockstates/relay.json
+++ b/src/main/resources/assets/refinedstorage/blockstates/relay.json
@@ -1,9 +1,11 @@
 {
   "forge_marker": 1,
   "defaults": {
-    "model": "cube_all",
+    "model": "refinedstorage:cube_all_cutout",
     "textures": {
-      "all": "refinedstorage:blocks/relay_disconnected"
+      "particle": "refinedstorage:blocks/relay/relay",
+      "all": "refinedstorage:blocks/relay/relay",
+      "cutout": "refinedstorage:blocks/relay/cutouts/disconnected"
     }
   },
   "variants": {
@@ -15,7 +17,7 @@
     "connected": {
       "true": {
         "textures": {
-          "all": "refinedstorage:blocks/relay_connected"
+          "cutout": "refinedstorage:blocks/relay/cutouts/connected"
         }
       },
       "false": {
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver/cutouts/connected.png
similarity index 100%
rename from src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png
rename to src/main/resources/assets/refinedstorage/textures/blocks/network_receiver/cutouts/connected.png
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver/cutouts/disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver/cutouts/disconnected.png
new file mode 100644
index 000000000..b5bc63f8f
Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver/cutouts/disconnected.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver/network_receiver.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver/network_receiver.png
new file mode 100644
index 000000000..f0fdad1d7
Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver/network_receiver.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected.png
deleted file mode 100755
index 6e431b3fd..000000000
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected.png and /dev/null differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png.mcmeta
deleted file mode 100644
index eea6c1fe1..000000000
--- a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png.mcmeta
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ctm": {
-    "ctm_version": 1,
-    "layer": "CUTOUT",
-    "extra": {
-      "light": 15
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_disconnected.png
deleted file mode 100755
index a99eef39f..000000000
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_disconnected.png and /dev/null differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter/cutouts/connected.png
similarity index 100%
rename from src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png
rename to src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter/cutouts/connected.png
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter/cutouts/disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter/cutouts/disconnected.png
new file mode 100644
index 000000000..d86c8677a
Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter/cutouts/disconnected.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter/network_transmitter.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter/network_transmitter.png
new file mode 100644
index 000000000..9e4f2df05
Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter/network_transmitter.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected.png
deleted file mode 100755
index 40d762639..000000000
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected.png and /dev/null differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png.mcmeta
deleted file mode 100644
index eea6c1fe1..000000000
--- a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png.mcmeta
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ctm": {
-    "ctm_version": 1,
-    "layer": "CUTOUT",
-    "extra": {
-      "light": 15
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_disconnected.png
deleted file mode 100755
index 1c0ac2baf..000000000
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_disconnected.png and /dev/null differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/relay/cutouts/connected.png
similarity index 100%
rename from src/main/resources/assets/refinedstorage/textures/blocks/relay_connected_glow.png
rename to src/main/resources/assets/refinedstorage/textures/blocks/relay/cutouts/connected.png
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay/cutouts/disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/relay/cutouts/disconnected.png
new file mode 100644
index 000000000..b1bf0e090
Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/relay/cutouts/disconnected.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay/relay.png b/src/main/resources/assets/refinedstorage/textures/blocks/relay/relay.png
new file mode 100644
index 000000000..11dd25763
Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/relay/relay.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png
deleted file mode 100755
index 9bd1c0621..000000000
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png and /dev/null differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected_glow.png.mcmeta
deleted file mode 100644
index eea6c1fe1..000000000
--- a/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected_glow.png.mcmeta
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ctm": {
-    "ctm_version": 1,
-    "layer": "CUTOUT",
-    "extra": {
-      "light": 15
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png
deleted file mode 100755
index 402aa2850..000000000
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png and /dev/null differ