diff --git a/src/main/java/storagecraft/block/BlockBase.java b/src/main/java/storagecraft/block/BlockBase.java
index aa0600b5c..efe7cfd60 100755
--- a/src/main/java/storagecraft/block/BlockBase.java
+++ b/src/main/java/storagecraft/block/BlockBase.java
@@ -30,6 +30,7 @@ public abstract class BlockBase extends Block
 
 		this.name = name;
 
+		setHardness(0.6F);
 		setCreativeTab(StorageCraft.TAB);
 	}
 
diff --git a/src/main/java/storagecraft/gui/GuiBase.java b/src/main/java/storagecraft/gui/GuiBase.java
index 50842fa9c..45f1606f5 100755
--- a/src/main/java/storagecraft/gui/GuiBase.java
+++ b/src/main/java/storagecraft/gui/GuiBase.java
@@ -178,7 +178,9 @@ public abstract class GuiBase extends GuiContainer
 
 	public void drawString(int x, int y, String message, int color)
 	{
+		GL11.glDisable(GL11.GL_LIGHTING);
 		fontRendererObj.drawString(message, x, y, color);
+		GL11.glEnable(GL11.GL_LIGHTING);
 	}
 
 	public void drawTooltip(int x, int y, String message)
diff --git a/src/main/resources/assets/storagecraft/blockstates/constructor.json b/src/main/resources/assets/storagecraft/blockstates/constructor.json
index 97fef7a1a..a49d89b4e 100755
--- a/src/main/resources/assets/storagecraft/blockstates/constructor.json
+++ b/src/main/resources/assets/storagecraft/blockstates/constructor.json
@@ -11,6 +11,7 @@
         "inventory": [
             {
                 "y": 0,
+                "transform": "forge:default-block",
                 "textures": {
                     "front": "storagecraft:blocks/constructor_disconnected"
                 }
diff --git a/src/main/resources/assets/storagecraft/blockstates/controller.json b/src/main/resources/assets/storagecraft/blockstates/controller.json
index 206dd8c12..681688e67 100755
--- a/src/main/resources/assets/storagecraft/blockstates/controller.json
+++ b/src/main/resources/assets/storagecraft/blockstates/controller.json
@@ -11,10 +11,8 @@
     "variants": {
         "inventory": [
             {
-                "y": 0
-            },
-            {
-                "y": 0
+                "y": 0,
+                "transform": "forge:default-block"
             }
         ],
         "energy": {
diff --git a/src/main/resources/assets/storagecraft/blockstates/destructor.json b/src/main/resources/assets/storagecraft/blockstates/destructor.json
index 2a02785cc..a4214178e 100755
--- a/src/main/resources/assets/storagecraft/blockstates/destructor.json
+++ b/src/main/resources/assets/storagecraft/blockstates/destructor.json
@@ -11,6 +11,7 @@
         "inventory": [
             {
                 "y": 0,
+                "transform": "forge:default-block",
                 "textures": {
                     "front": "storagecraft:blocks/destructor_disconnected"
                 }
diff --git a/src/main/resources/assets/storagecraft/blockstates/detector.json b/src/main/resources/assets/storagecraft/blockstates/detector.json
index 3274b8a90..994482d45 100755
--- a/src/main/resources/assets/storagecraft/blockstates/detector.json
+++ b/src/main/resources/assets/storagecraft/blockstates/detector.json
@@ -11,10 +11,8 @@
     "variants": {
         "inventory": [
             {
-                "y": 0
-            },
-            {
-                "y": 0
+                "y": 0,
+                "transform": "forge:default-block"
             }
         ],
         "connected": {
diff --git a/src/main/resources/assets/storagecraft/blockstates/drive.json b/src/main/resources/assets/storagecraft/blockstates/drive.json
index 687d2f39f..942f32d62 100755
--- a/src/main/resources/assets/storagecraft/blockstates/drive.json
+++ b/src/main/resources/assets/storagecraft/blockstates/drive.json
@@ -11,9 +11,7 @@
     "variants": {
         "inventory": [
             {
-                "y": 0
-            },
-            {
+                "transform": "forge:default-block",
                 "y": 0
             }
         ],
diff --git a/src/main/resources/assets/storagecraft/blockstates/exporter.json b/src/main/resources/assets/storagecraft/blockstates/exporter.json
index 2c95f7061..756884c90 100755
--- a/src/main/resources/assets/storagecraft/blockstates/exporter.json
+++ b/src/main/resources/assets/storagecraft/blockstates/exporter.json
@@ -11,10 +11,8 @@
     "variants": {
         "inventory": [
             {
-                "y": 0
-            },
-            {
-                "y": 0
+                "y": 0,
+                "transform": "forge:default-block"
             }
         ],
         "connected": {
diff --git a/src/main/resources/assets/storagecraft/blockstates/external_storage.json b/src/main/resources/assets/storagecraft/blockstates/external_storage.json
index fad505e78..06fc84438 100755
--- a/src/main/resources/assets/storagecraft/blockstates/external_storage.json
+++ b/src/main/resources/assets/storagecraft/blockstates/external_storage.json
@@ -11,10 +11,8 @@
     "variants": {
         "inventory": [
             {
-                "y": 0
-            },
-            {
-                "y": 0
+                "y": 0,
+                "transform": "forge:default-block"
             }
         ],
         "connected": {
diff --git a/src/main/resources/assets/storagecraft/blockstates/grid.json b/src/main/resources/assets/storagecraft/blockstates/grid.json
index 4ac862475..f1d8d3023 100755
--- a/src/main/resources/assets/storagecraft/blockstates/grid.json
+++ b/src/main/resources/assets/storagecraft/blockstates/grid.json
@@ -13,12 +13,14 @@
                 "textures": {
                     "front": "storagecraft:blocks/grid_disconnected"
                 },
+                "transform": "forge:default-block",
                 "y": 0
             },
             {
                 "textures": {
                     "front": "storagecraft:blocks/grid_disconnected"
                 },
+                "transform": "forge:default-block",
                 "y": 0
             }
         ],
diff --git a/src/main/resources/assets/storagecraft/blockstates/importer.json b/src/main/resources/assets/storagecraft/blockstates/importer.json
index 889e1b10c..a288cd052 100755
--- a/src/main/resources/assets/storagecraft/blockstates/importer.json
+++ b/src/main/resources/assets/storagecraft/blockstates/importer.json
@@ -11,10 +11,8 @@
     "variants": {
         "inventory": [
             {
-                "y": 0
-            },
-            {
-                "y": 0
+                "y": 0,
+                "transform": "forge:default-block"
             }
         ],
         "connected": {
diff --git a/src/main/resources/assets/storagecraft/blockstates/machine_casing.json b/src/main/resources/assets/storagecraft/blockstates/machine_casing.json
index cdbd97b41..591c90bce 100755
--- a/src/main/resources/assets/storagecraft/blockstates/machine_casing.json
+++ b/src/main/resources/assets/storagecraft/blockstates/machine_casing.json
@@ -9,6 +9,7 @@
     "variants": {
         "inventory": [
             {
+                "transform": "forge:default-block"
             }
         ],
         "direction": {
diff --git a/src/main/resources/assets/storagecraft/blockstates/solderer.json b/src/main/resources/assets/storagecraft/blockstates/solderer.json
index 9d0e26606..64056b11b 100755
--- a/src/main/resources/assets/storagecraft/blockstates/solderer.json
+++ b/src/main/resources/assets/storagecraft/blockstates/solderer.json
@@ -13,7 +13,8 @@
                 "y": 0,
                 "textures": {
                     "front": "storagecraft:blocks/solderer_disconnected"
-                }
+                },
+                "transform": "forge:default-block"
             }
         ],
         "connected": {
diff --git a/src/main/resources/assets/storagecraft/blockstates/wireless_transmitter.json b/src/main/resources/assets/storagecraft/blockstates/wireless_transmitter.json
index a33577ac8..b8ce3c80c 100755
--- a/src/main/resources/assets/storagecraft/blockstates/wireless_transmitter.json
+++ b/src/main/resources/assets/storagecraft/blockstates/wireless_transmitter.json
@@ -11,7 +11,8 @@
     "variants": {
         "inventory": [
             {
-                "y": 0
+                "y": 0,
+                "transform": "forge:default-block"
             }
         ],
         "connected": {