diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2de952828..61a20aaed 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,9 @@
 - Removed Project E integration (raoulvdberge)
 - Removed Storage Drawers integration (you can still attach an External Storage to drawers, though) (raoulvdberge)
 - Removed blocking mode in autocrafting (raoulvdberge)
+- Removed the Wrench (raoulvdberge)
 - Added new storage disk system where the storage disk data (items, fluids) are stored off the disk itself, in another file (refinedstorage_disks.dat). The disk itself only stores its ID (raoulvdberge)
+- Changed fluid storage progression to be 64k - 256k - 1024k - 4096k (raoulvdberge)
 - You can no longer put a Filter in filter slots to gain additional filter slots (raoulvdberge)
 - You can now re-insert Processing Patterns in the Pattern Grid and have the inputs and outputs be completed (raoulvdberge)
 - Fixed bug where pattern was recipe pattern was creatable when there was no recipe output (raoulvdberge)
@@ -14,7 +16,6 @@
 - If an Interface is configured to expose the entire network storage (by configuring no export slots), it will no longer expose the entire RS storage, due to performance issues (raoulvdberge)
 - The Portable Grid no longer exposes a inventory for crossmod interaction, due to performance issues (raoulvdberge)
 - The Crafting Monitor is now resizable and its size can be configured (stretched, small, medium, large) (raoulvdberge)
-- Removed the Wrench (raoulvdberge)
 - Made all IO blocks have a blacklist instead of a whitelist by default (raoulvdberge)
 - An empty blacklist now means: accept any item. An empty whitelist now means: don't accept any item (an empty whitelist USED to mean: accept any item) (raoulvdberge)
 - Any mod can now add JSON Solderer recipes without requiring the API, by putting the JSONs in their assets directory in a "solderer_recipes" directory (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageType.java b/src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageType.java
index f0da354c4..23c9bcfdc 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageType.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/FluidStorageType.java
@@ -4,9 +4,9 @@ import net.minecraft.util.IStringSerializable;
 
 public enum FluidStorageType implements IStringSerializable {
     TYPE_64K(0, 64_000, "64k"),
-    TYPE_128K(1, 128_000, "128k"),
-    TYPE_256K(2, 256_000, "256k"),
-    TYPE_512K(3, 512_000, "512k"),
+    TYPE_256K(1, 256_000, "256k"),
+    TYPE_1024K(2, 1024_000, "1024k"),
+    TYPE_4096K(3, 4096_000, "4096k"),
     TYPE_CREATIVE(4, -1, "creative");
 
     private int id;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/ItemStorageType.java b/src/main/java/com/raoulvdberge/refinedstorage/block/ItemStorageType.java
index 54485e6af..a45275a66 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/ItemStorageType.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/ItemStorageType.java
@@ -3,10 +3,10 @@ package com.raoulvdberge.refinedstorage.block;
 import net.minecraft.util.IStringSerializable;
 
 public enum ItemStorageType implements IStringSerializable {
-    TYPE_1K(0, 1000, "1k"),
-    TYPE_4K(1, 4000, "4k"),
-    TYPE_16K(2, 16000, "16k"),
-    TYPE_64K(3, 64000, "64k"),
+    TYPE_1K(0, 1_000, "1k"),
+    TYPE_4K(1, 4_000, "4k"),
+    TYPE_16K(2, 16_000, "16k"),
+    TYPE_64K(3, 64_000, "64k"),
     TYPE_CREATIVE(4, -1, "creative");
 
     private int id;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java
index f57b6673a..9670cf868 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java
@@ -29,9 +29,9 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid
     private static final String NBT_ID = "Id";
 
     public static final int TYPE_64K = 0;
-    public static final int TYPE_128K = 1;
-    public static final int TYPE_256K = 2;
-    public static final int TYPE_512K = 3;
+    public static final int TYPE_256K = 1;
+    public static final int TYPE_1024K = 2;
+    public static final int TYPE_4096K = 3;
     public static final int TYPE_CREATIVE = 4;
 
     public ItemFluidStorageDisk() {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java
index 37bcb861b..effd1481e 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java
@@ -6,9 +6,9 @@ import net.minecraft.util.NonNullList;
 
 public class ItemFluidStoragePart extends ItemBase {
     public static final int TYPE_64K = 0;
-    public static final int TYPE_128K = 1;
-    public static final int TYPE_256K = 2;
-    public static final int TYPE_512K = 3;
+    public static final int TYPE_256K = 1;
+    public static final int TYPE_1024K = 2;
+    public static final int TYPE_4096K = 3;
 
     public ItemFluidStoragePart() {
         super("fluid_storage_part");
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
index 5c20ad11f..a162d3d8a 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
@@ -100,17 +100,17 @@ public class ProxyClient extends ProxyCommon {
 
         ModelBakery.registerItemVariants(RSItems.FLUID_STORAGE_DISK,
             new ResourceLocation("refinedstorage:64k_fluid_storage_disk"),
-            new ResourceLocation("refinedstorage:128k_fluid_storage_disk"),
             new ResourceLocation("refinedstorage:256k_fluid_storage_disk"),
-            new ResourceLocation("refinedstorage:512k_fluid_storage_disk"),
+            new ResourceLocation("refinedstorage:1024k_fluid_storage_disk"),
+            new ResourceLocation("refinedstorage:4096k_fluid_storage_disk"),
             new ResourceLocation("refinedstorage:creative_fluid_storage_disk")
         );
 
         ModelBakery.registerItemVariants(RSItems.FLUID_STORAGE_PART,
             new ResourceLocation("refinedstorage:64k_fluid_storage_part"),
-            new ResourceLocation("refinedstorage:128k_fluid_storage_part"),
             new ResourceLocation("refinedstorage:256k_fluid_storage_part"),
-            new ResourceLocation("refinedstorage:512k_fluid_storage_part")
+            new ResourceLocation("refinedstorage:1024k_fluid_storage_part"),
+            new ResourceLocation("refinedstorage:4096k_fluid_storage_part")
         );
 
         ModelBakery.registerItemVariants(RSItems.PROCESSOR,
@@ -150,15 +150,15 @@ public class ProxyClient extends ProxyCommon {
         ModelLoader.setCustomModelResourceLocation(RSItems.STORAGE_PART, ItemStoragePart.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_part", "inventory"));
 
         ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_fluid_storage_disk", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_128K, new ModelResourceLocation("refinedstorage:128k_fluid_storage_disk", "inventory"));
         ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_256K, new ModelResourceLocation("refinedstorage:256k_fluid_storage_disk", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_512K, new ModelResourceLocation("refinedstorage:512k_fluid_storage_disk", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_1024K, new ModelResourceLocation("refinedstorage:1024k_fluid_storage_disk", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_4096K, new ModelResourceLocation("refinedstorage:4096k_fluid_storage_disk", "inventory"));
         ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_CREATIVE, new ModelResourceLocation("refinedstorage:creative_fluid_storage_disk", "inventory"));
 
         ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_fluid_storage_part", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_128K, new ModelResourceLocation("refinedstorage:128k_fluid_storage_part", "inventory"));
         ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_256K, new ModelResourceLocation("refinedstorage:256k_fluid_storage_part", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_512K, new ModelResourceLocation("refinedstorage:512k_fluid_storage_part", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_1024K, new ModelResourceLocation("refinedstorage:1024k_fluid_storage_part", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RSItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_4096K, new ModelResourceLocation("refinedstorage:4096k_fluid_storage_part", "inventory"));
 
         ModelLoader.setCustomModelResourceLocation(RSItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_BASIC, new ModelResourceLocation("refinedstorage:basic_printed_processor", "inventory"));
         ModelLoader.setCustomModelResourceLocation(RSItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_IMPROVED, new ModelResourceLocation("refinedstorage:improved_printed_processor", "inventory"));
@@ -209,9 +209,9 @@ public class ProxyClient extends ProxyCommon {
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE), ItemStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=64k"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE), ItemStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:storage", "type=creative"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_STORAGE), FluidStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=64k"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_STORAGE), FluidStorageType.TYPE_128K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=128k"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_STORAGE), FluidStorageType.TYPE_256K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=256k"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_STORAGE), FluidStorageType.TYPE_512K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=512k"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_STORAGE), FluidStorageType.TYPE_1024K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=1024k"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_STORAGE), FluidStorageType.TYPE_4096K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=4096k"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_STORAGE), FluidStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=creative"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.DISK_MANIPULATOR), 0, new ModelResourceLocation("refinedstorage:disk_manipulator", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.QUARTZ_ENRICHED_IRON), 0, new ModelResourceLocation("refinedstorage:quartz_enriched_iron_block", "inventory"));
diff --git a/src/main/resources/assets/refinedstorage/blockstates/fluid_storage.json b/src/main/resources/assets/refinedstorage/blockstates/fluid_storage.json
index a6dfa7feb..abdecd38e 100755
--- a/src/main/resources/assets/refinedstorage/blockstates/fluid_storage.json
+++ b/src/main/resources/assets/refinedstorage/blockstates/fluid_storage.json
@@ -11,19 +11,19 @@
           "all": "refinedstorage:blocks/64k_fluid_storage_block"
         }
       },
-      "128k": {
-        "textures": {
-          "all": "refinedstorage:blocks/128k_fluid_storage_block"
-        }
-      },
       "256k": {
         "textures": {
           "all": "refinedstorage:blocks/256k_fluid_storage_block"
         }
       },
-      "512k": {
+      "1024k": {
         "textures": {
-          "all": "refinedstorage:blocks/512k_fluid_storage_block"
+          "all": "refinedstorage:blocks/1024k_fluid_storage_block"
+        }
+      },
+      "4096k": {
+        "textures": {
+          "all": "refinedstorage:blocks/4096k_fluid_storage_block"
         }
       },
       "creative": {
diff --git a/src/main/resources/assets/refinedstorage/lang/de_de.lang b/src/main/resources/assets/refinedstorage/lang/de_de.lang
index 2d519ed67..be3df6d4a 100755
--- a/src/main/resources/assets/refinedstorage/lang/de_de.lang
+++ b/src/main/resources/assets/refinedstorage/lang/de_de.lang
@@ -171,9 +171,9 @@ block.refinedstorage:network_receiver.name=Funk-Netzwerkempfänger
 block.refinedstorage:network_transmitter.name=Funk-Netzwerksender
 block.refinedstorage:fluid_interface.name=Flüssigkeiten Schnittstelle
 block.refinedstorage:fluid_storage.0.name=64k Flüssigspeicher
-block.refinedstorage:fluid_storage.1.name=128k Flüssigspeicher
-block.refinedstorage:fluid_storage.2.name=256k Flüssigspeicher
-block.refinedstorage:fluid_storage.3.name=512k Flüssigspeicher
+block.refinedstorage:fluid_storage.1.name=256k Flüssigspeicher
+block.refinedstorage:fluid_storage.2.name=1024k Flüssigspeicher
+block.refinedstorage:fluid_storage.3.name=4096k Flüssigspeicher
 block.refinedstorage:fluid_storage.4.name=Kreativmodus Flüssigspeicher
 block.refinedstorage:reader.name=Lesegerät
 block.refinedstorage:writer.name=Schreibgerät
@@ -185,9 +185,9 @@ item.refinedstorage:storage_disk.3.name=64k Diskette
 item.refinedstorage:storage_disk.4.name=Kreativmodus Diskette
 item.refinedstorage:storage_disk.5.name=Fehlerkorrektur Diskette
 item.refinedstorage:fluid_storage_disk.0.name=64k Flüssigspeicher Diskette
-item.refinedstorage:fluid_storage_disk.1.name=128k Flüssigspeicher Diskette
-item.refinedstorage:fluid_storage_disk.2.name=256k Flüssigspeicher Diskette
-item.refinedstorage:fluid_storage_disk.3.name=512k Flüssigspeicher Diskette
+item.refinedstorage:fluid_storage_disk.1.name=256k Flüssigspeicher Diskette
+item.refinedstorage:fluid_storage_disk.2.name=1024k Flüssigspeicher Diskette
+item.refinedstorage:fluid_storage_disk.3.name=4096k Flüssigspeicher Diskette
 item.refinedstorage:fluid_storage_disk.4.name=Kreativmous Flüssigspeicher Diskette
 item.refinedstorage:fluid_storage_disk.5.name=Fehlerkorrektur Flüssigspeicher Diskette
 item.refinedstorage:wireless_grid.0.name=Funk-Matrix
@@ -210,9 +210,9 @@ item.refinedstorage:storage_part.1.name=4k Speicherkern
 item.refinedstorage:storage_part.2.name=16k Speicherkern
 item.refinedstorage:storage_part.3.name=64k Speicherkern
 item.refinedstorage:fluid_storage_part.0.name=64k Flüssigspeicherkern
-item.refinedstorage:fluid_storage_part.1.name=128k Flüssigspeicherkern
-item.refinedstorage:fluid_storage_part.2.name=256k Flüssigspeicherkern
-item.refinedstorage:fluid_storage_part.3.name=512k Flüssigspeicherkern
+item.refinedstorage:fluid_storage_part.1.name=256k Flüssigspeicherkern
+item.refinedstorage:fluid_storage_part.2.name=1024k Flüssigspeicherkern
+item.refinedstorage:fluid_storage_part.3.name=4096k Flüssigspeicherkern
 item.refinedstorage:pattern.name=Muster
 item.refinedstorage:upgrade.0.name=Verbesserung
 item.refinedstorage:upgrade.1.name=Verbesserung der Reichweite
diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.lang b/src/main/resources/assets/refinedstorage/lang/en_us.lang
index 03de5c77e..003e1cd3c 100644
--- a/src/main/resources/assets/refinedstorage/lang/en_us.lang
+++ b/src/main/resources/assets/refinedstorage/lang/en_us.lang
@@ -227,9 +227,9 @@ block.refinedstorage:network_receiver.name=Network Receiver
 block.refinedstorage:network_transmitter.name=Network Transmitter
 block.refinedstorage:fluid_interface.name=Fluid Interface
 block.refinedstorage:fluid_storage.0.name=64k Fluid Storage Block
-block.refinedstorage:fluid_storage.1.name=128k Fluid Storage Block
-block.refinedstorage:fluid_storage.2.name=256k Fluid Storage Block
-block.refinedstorage:fluid_storage.3.name=512k Fluid Storage Block
+block.refinedstorage:fluid_storage.1.name=256k Fluid Storage Block
+block.refinedstorage:fluid_storage.2.name=1024k Fluid Storage Block
+block.refinedstorage:fluid_storage.3.name=4096k Fluid Storage Block
 block.refinedstorage:fluid_storage.4.name=Creative Fluid Storage Block
 block.refinedstorage:reader.name=Reader
 block.refinedstorage:writer.name=Writer
@@ -248,9 +248,9 @@ item.refinedstorage:storage_disk.3.name=64k Storage Disk
 item.refinedstorage:storage_disk.4.name=Creative Storage Disk
 item.refinedstorage:storage_disk.5.name=Debug Storage Disk
 item.refinedstorage:fluid_storage_disk.0.name=64k Fluid Storage Disk
-item.refinedstorage:fluid_storage_disk.1.name=128k Fluid Storage Disk
-item.refinedstorage:fluid_storage_disk.2.name=256k Fluid Storage Disk
-item.refinedstorage:fluid_storage_disk.3.name=512k Fluid Storage Disk
+item.refinedstorage:fluid_storage_disk.1.name=256k Fluid Storage Disk
+item.refinedstorage:fluid_storage_disk.2.name=1024k Fluid Storage Disk
+item.refinedstorage:fluid_storage_disk.3.name=4096k Fluid Storage Disk
 item.refinedstorage:fluid_storage_disk.4.name=Creative Fluid Storage Disk
 item.refinedstorage:fluid_storage_disk.5.name=Debug Fluid Storage Disk
 item.refinedstorage:wireless_grid.0.name=Wireless Grid
@@ -275,9 +275,9 @@ item.refinedstorage:storage_part.1.name=4k Storage Part
 item.refinedstorage:storage_part.2.name=16k Storage Part
 item.refinedstorage:storage_part.3.name=64k Storage Part
 item.refinedstorage:fluid_storage_part.0.name=64k Fluid Storage Part
-item.refinedstorage:fluid_storage_part.1.name=128k Fluid Storage Part
-item.refinedstorage:fluid_storage_part.2.name=256k Fluid Storage Part
-item.refinedstorage:fluid_storage_part.3.name=512k Fluid Storage Part
+item.refinedstorage:fluid_storage_part.1.name=256k Fluid Storage Part
+item.refinedstorage:fluid_storage_part.2.name=1024k Fluid Storage Part
+item.refinedstorage:fluid_storage_part.3.name=4096k Fluid Storage Part
 item.refinedstorage:pattern.name=Pattern
 item.refinedstorage:upgrade.0.name=Upgrade
 item.refinedstorage:upgrade.1.name=Range Upgrade
diff --git a/src/main/resources/assets/refinedstorage/lang/es_es.lang b/src/main/resources/assets/refinedstorage/lang/es_es.lang
index e6a69c5ca..55013c8d1 100644
--- a/src/main/resources/assets/refinedstorage/lang/es_es.lang
+++ b/src/main/resources/assets/refinedstorage/lang/es_es.lang
@@ -223,9 +223,9 @@ block.refinedstorage:network_receiver.name=Receptor de Red
 block.refinedstorage:network_transmitter.name=Transmisor de red
 block.refinedstorage:fluid_interface.name=Interfaz de Fluidos
 block.refinedstorage:fluid_storage.0.name=Bloque de Memoria de Fluidos de 64k 
-block.refinedstorage:fluid_storage.1.name=Bloque de Memoria de Fluidos de 128k
-block.refinedstorage:fluid_storage.2.name=Bloque de Memoria de Fluidos de 256k
-block.refinedstorage:fluid_storage.3.name=Bloque de Memoria de Fluidos de 512k
+block.refinedstorage:fluid_storage.1.name=Bloque de Memoria de Fluidos de 256k
+block.refinedstorage:fluid_storage.2.name=Bloque de Memoria de Fluidos de 1024k
+block.refinedstorage:fluid_storage.3.name=Bloque de Memoria de Fluidos de 4096k
 block.refinedstorage:fluid_storage.4.name=Bloque de Memoria de Fluidos Creativo
 block.refinedstorage:reader.name=Lector
 block.refinedstorage:writer.name=Escritor
@@ -243,9 +243,9 @@ item.refinedstorage:storage_disk.3.name=Disco Duro de 64k
 item.refinedstorage:storage_disk.4.name=Disco Duro Creativo
 item.refinedstorage:storage_disk.5.name=Disco Duro de depuración
 item.refinedstorage:fluid_storage_disk.0.name=Disco Duro de Fluidos de 64k
-item.refinedstorage:fluid_storage_disk.1.name=Disco Duro de Fluidos de 128k
-item.refinedstorage:fluid_storage_disk.2.name=Disco Duro de Fluidos de 256k
-item.refinedstorage:fluid_storage_disk.3.name=Disco Duro de Fluidos de 512k
+item.refinedstorage:fluid_storage_disk.1.name=Disco Duro de Fluidos de 256k
+item.refinedstorage:fluid_storage_disk.2.name=Disco Duro de Fluidos de 1024k
+item.refinedstorage:fluid_storage_disk.3.name=Disco Duro de Fluidos de 4096k
 item.refinedstorage:fluid_storage_disk.4.name=Disco Duro de Fluidos Creativo
 item.refinedstorage:fluid_storage_disk.5.name=Disco Duro de Fluido de depuración
 item.refinedstorage:wireless_grid.0.name=Panel Inalámbrico
@@ -270,9 +270,9 @@ item.refinedstorage:storage_part.1.name=Parte de Memoria de 4k
 item.refinedstorage:storage_part.2.name=Parte de Memoria de 16k
 item.refinedstorage:storage_part.3.name=Parte de Memoria de 64k
 item.refinedstorage:fluid_storage_part.0.name=Parte de Memoria de Fluidos de 64k
-item.refinedstorage:fluid_storage_part.1.name=Parte de Memoria de Fluidos de 128k
-item.refinedstorage:fluid_storage_part.2.name=Parte de Memoria de Fluidos de 256k
-item.refinedstorage:fluid_storage_part.3.name=Parte de Memoria de Fluidos de 512k
+item.refinedstorage:fluid_storage_part.1.name=Parte de Memoria de Fluidos de 256k
+item.refinedstorage:fluid_storage_part.2.name=Parte de Memoria de Fluidos de 1024k
+item.refinedstorage:fluid_storage_part.3.name=Parte de Memoria de Fluidos de 4096k
 item.refinedstorage:pattern.name=Patrón
 item.refinedstorage:upgrade.0.name=Mejora
 item.refinedstorage:upgrade.1.name=Mejora de Rango
diff --git a/src/main/resources/assets/refinedstorage/lang/fr_fr.lang b/src/main/resources/assets/refinedstorage/lang/fr_fr.lang
index 20b66f505..406e2aa64 100755
--- a/src/main/resources/assets/refinedstorage/lang/fr_fr.lang
+++ b/src/main/resources/assets/refinedstorage/lang/fr_fr.lang
@@ -199,9 +199,9 @@ block.refinedstorage:network_receiver.name=Récepteur réseau
 block.refinedstorage:network_transmitter.name=Transmetteur réseau
 block.refinedstorage:fluid_interface.name=Interface de fluides
 block.refinedstorage:fluid_storage.0.name=Bloc de stockage de fluides de 64k
-block.refinedstorage:fluid_storage.1.name=Bloc de stockage de fluides de 128k
-block.refinedstorage:fluid_storage.2.name=Bloc de stockage de fluides de 256k
-block.refinedstorage:fluid_storage.3.name=Bloc de stockage de fluides de 512k
+block.refinedstorage:fluid_storage.1.name=Bloc de stockage de fluides de 256k
+block.refinedstorage:fluid_storage.2.name=Bloc de stockage de fluides de 1024k
+block.refinedstorage:fluid_storage.3.name=Bloc de stockage de fluides de 4096k
 block.refinedstorage:fluid_storage.4.name=Bloc de stockage de fluides créatif
 block.refinedstorage:reader.name=Scanneur
 block.refinedstorage:writer.name=Imprimeur
@@ -219,9 +219,9 @@ item.refinedstorage:storage_disk.3.name=Disque de stockage 64K
 item.refinedstorage:storage_disk.4.name=Disque de stockage créatif
 item.refinedstorage:storage_disk.5.name=Disque de stockage de débogage
 item.refinedstorage:fluid_storage_disk.0.name=Disque de stockage de fluides 64K
-item.refinedstorage:fluid_storage_disk.1.name=Disque de stockage de fluides 128K
-item.refinedstorage:fluid_storage_disk.2.name=Disque de stockage de fluides 256K
-item.refinedstorage:fluid_storage_disk.3.name=Disque de stockage de fluides 512K
+item.refinedstorage:fluid_storage_disk.1.name=Disque de stockage de fluides 256K
+item.refinedstorage:fluid_storage_disk.2.name=Disque de stockage de fluides 1024K
+item.refinedstorage:fluid_storage_disk.3.name=Disque de stockage de fluides 4096K
 item.refinedstorage:fluid_storage_disk.4.name=Disque de stockage de fluides créatif
 item.refinedstorage:fluid_storage_disk.5.name=Disque de stockage de fluides de débogage
 item.refinedstorage:wireless_grid.0.name=Grille sans fil
@@ -246,9 +246,9 @@ item.refinedstorage:storage_part.1.name=Pièce de stockage 4k
 item.refinedstorage:storage_part.2.name=Pièce de stockage 16k
 item.refinedstorage:storage_part.3.name=Pièce de stockage 64k
 item.refinedstorage:fluid_storage_part.0.name=Pièce de stockage de fluides 64k
-item.refinedstorage:fluid_storage_part.1.name=Pièce de stockage de fluides 128k
-item.refinedstorage:fluid_storage_part.2.name=Pièce de stockage de fluides 256k
-item.refinedstorage:fluid_storage_part.3.name=Pièce de stockage de fluides 512k
+item.refinedstorage:fluid_storage_part.1.name=Pièce de stockage de fluides 256k
+item.refinedstorage:fluid_storage_part.2.name=Pièce de stockage de fluides 1024k
+item.refinedstorage:fluid_storage_part.3.name=Pièce de stockage de fluides 4096k
 item.refinedstorage:pattern.name=Modèle
 item.refinedstorage:upgrade.0.name=Amélioration
 item.refinedstorage:upgrade.1.name=Amélioration de portée
diff --git a/src/main/resources/assets/refinedstorage/lang/ko_kr.lang b/src/main/resources/assets/refinedstorage/lang/ko_kr.lang
index 5474211b6..453e7a5e3 100644
--- a/src/main/resources/assets/refinedstorage/lang/ko_kr.lang
+++ b/src/main/resources/assets/refinedstorage/lang/ko_kr.lang
@@ -201,9 +201,9 @@ block.refinedstorage:network_receiver.name=네트워크 수신기
 block.refinedstorage:network_transmitter.name=네트워크 송신기
 block.refinedstorage:fluid_interface.name=액체 인터페이스
 block.refinedstorage:fluid_storage.0.name=64k 액체 저장 공간
-block.refinedstorage:fluid_storage.1.name=128k 액체 저장 공간
-block.refinedstorage:fluid_storage.2.name=256k 액체 저장 공간
-block.refinedstorage:fluid_storage.3.name=512k 액체 저장 공간
+block.refinedstorage:fluid_storage.1.name=256k 액체 저장 공간
+block.refinedstorage:fluid_storage.2.name=1024k 액체 저장 공간
+block.refinedstorage:fluid_storage.3.name=4096k 액체 저장 공간
 block.refinedstorage:fluid_storage.4.name=크리에이티브 액체 저장 공간
 block.refinedstorage:reader.name=수신기
 block.refinedstorage:writer.name=송신기
@@ -221,9 +221,9 @@ item.refinedstorage:storage_disk.3.name=64k 저장 디스크
 item.refinedstorage:storage_disk.4.name=크리에이티브 저장 디스크
 item.refinedstorage:storage_disk.5.name=디버그 저장 디스크
 item.refinedstorage:fluid_storage_disk.0.name=64k 액체 저장 디스크
-item.refinedstorage:fluid_storage_disk.1.name=128k 액체 저장 디스크
-item.refinedstorage:fluid_storage_disk.2.name=256k 액체 저장 디스크
-item.refinedstorage:fluid_storage_disk.3.name=512k 액체 저장 디스크
+item.refinedstorage:fluid_storage_disk.1.name=256k 액체 저장 디스크
+item.refinedstorage:fluid_storage_disk.2.name=1024k 액체 저장 디스크
+item.refinedstorage:fluid_storage_disk.3.name=4096k 액체 저장 디스크
 item.refinedstorage:fluid_storage_disk.4.name=크리에이티브 액체 저장 디스크
 item.refinedstorage:fluid_storage_disk.5.name=디버그 액체 저장 디스크
 item.refinedstorage:wireless_grid.0.name=무선 그리드
@@ -248,9 +248,9 @@ item.refinedstorage:storage_part.1.name=4k 저장 파트
 item.refinedstorage:storage_part.2.name=16k 저장 파트
 item.refinedstorage:storage_part.3.name=64k 저장 파트
 item.refinedstorage:fluid_storage_part.0.name=64k 액체 저장 파트
-item.refinedstorage:fluid_storage_part.1.name=128k 액체 저장 파트
-item.refinedstorage:fluid_storage_part.2.name=256k 액체 저장 파트
-item.refinedstorage:fluid_storage_part.3.name=512k 액체 저장 파트
+item.refinedstorage:fluid_storage_part.1.name=256k 액체 저장 파트
+item.refinedstorage:fluid_storage_part.2.name=1024k 액체 저장 파트
+item.refinedstorage:fluid_storage_part.3.name=4096k 액체 저장 파트
 item.refinedstorage:pattern.name=패턴
 item.refinedstorage:upgrade.0.name=업그레이드
 item.refinedstorage:upgrade.1.name=범위 업그레이드
diff --git a/src/main/resources/assets/refinedstorage/lang/nl_nl.lang b/src/main/resources/assets/refinedstorage/lang/nl_nl.lang
index 4840af646..868f039e9 100755
--- a/src/main/resources/assets/refinedstorage/lang/nl_nl.lang
+++ b/src/main/resources/assets/refinedstorage/lang/nl_nl.lang
@@ -140,9 +140,9 @@ block.refinedstorage:network_receiver.name=Netwerkontvanger
 block.refinedstorage:network_transmitter.name=Netwerkzender
 block.refinedstorage:fluid_interface.name=Vloeistof Interface
 block.refinedstorage:fluid_storage.0.name=64k Vloeistof Opslagblok
-block.refinedstorage:fluid_storage.1.name=128k Vloeistof Opslagblok
-block.refinedstorage:fluid_storage.2.name=256k Vloeistof Opslagblok
-block.refinedstorage:fluid_storage.3.name=512k Vloeistof Opslagblok
+block.refinedstorage:fluid_storage.1.name=256k Vloeistof Opslagblok
+block.refinedstorage:fluid_storage.2.name=1024k Vloeistof Opslagblok
+block.refinedstorage:fluid_storage.3.name=4096k Vloeistof Opslagblok
 block.refinedstorage:fluid_storage.4.name=Creative Vloeistof Opslagblok
 
 item.refinedstorage:storage_disk.0.name=1k Opslagschijf
@@ -152,9 +152,9 @@ item.refinedstorage:storage_disk.3.name=64k Opslagschijf
 item.refinedstorage:storage_disk.4.name=Creative Opslagschijf
 item.refinedstorage:storage_disk.5.name=Debug Opslagschijf
 item.refinedstorage:fluid_storage_disk.0.name=64k Vloeistof Opslagschijf
-item.refinedstorage:fluid_storage_disk.1.name=128k Vloeistof Opslagschijf
-item.refinedstorage:fluid_storage_disk.2.name=256k Vloeistof Opslagschijf
-item.refinedstorage:fluid_storage_disk.3.name=512k Vloeistof Opslagschijf
+item.refinedstorage:fluid_storage_disk.1.name=256k Vloeistof Opslagschijf
+item.refinedstorage:fluid_storage_disk.2.name=1024k Vloeistof Opslagschijf
+item.refinedstorage:fluid_storage_disk.3.name=4096k Vloeistof Opslagschijf
 item.refinedstorage:fluid_storage_disk.4.name=Creative Vloeistof Opslagschijf
 item.refinedstorage:fluid_storage_disk.5.name=Debug Vloeistof Opslagschijf
 item.refinedstorage:wireless_grid.0.name=Draadloos Rooster
@@ -175,9 +175,9 @@ item.refinedstorage:storage_part.1.name=4k Opslagdeel
 item.refinedstorage:storage_part.2.name=16k Opslagdeel
 item.refinedstorage:storage_part.3.name=64k Opslagdeel
 item.refinedstorage:fluid_storage_part.0.name=64k Vloeistof Opslagdeel
-item.refinedstorage:fluid_storage_part.1.name=128k Vloeistof Opslagdeel
-item.refinedstorage:fluid_storage_part.2.name=256k Vloeistof Opslagdeel
-item.refinedstorage:fluid_storage_part.3.name=512k Vloeistof Opslagdeel
+item.refinedstorage:fluid_storage_part.1.name=256k Vloeistof Opslagdeel
+item.refinedstorage:fluid_storage_part.2.name=1024k Vloeistof Opslagdeel
+item.refinedstorage:fluid_storage_part.3.name=4096k Vloeistof Opslagdeel
 item.refinedstorage:pattern.name=Patroon
 item.refinedstorage:upgrade.0.name=Upgrade
 item.refinedstorage:upgrade.1.name=Afstand Upgrade
diff --git a/src/main/resources/assets/refinedstorage/lang/pt_br.lang b/src/main/resources/assets/refinedstorage/lang/pt_br.lang
index 9fb19eb7b..976532409 100755
--- a/src/main/resources/assets/refinedstorage/lang/pt_br.lang
+++ b/src/main/resources/assets/refinedstorage/lang/pt_br.lang
@@ -201,9 +201,9 @@ block.refinedstorage:network_receiver.name=Receptor de Rede
 block.refinedstorage:network_transmitter.name=Transmissor de Rede
 block.refinedstorage:fluid_interface.name=Interface de Fluidos
 block.refinedstorage:fluid_storage.0.name=Bloco de Armazenamento de Fluidos 64k
-block.refinedstorage:fluid_storage.1.name=Bloco de Armazenamento de Fluidos 128k
-block.refinedstorage:fluid_storage.2.name=Bloco de Armazenamento de Fluidos 256k
-block.refinedstorage:fluid_storage.3.name=Bloco de Armazenamento de Fluidos 512k
+block.refinedstorage:fluid_storage.1.name=Bloco de Armazenamento de Fluidos 256k
+block.refinedstorage:fluid_storage.2.name=Bloco de Armazenamento de Fluidos 1024k
+block.refinedstorage:fluid_storage.3.name=Bloco de Armazenamento de Fluidos 4096k
 block.refinedstorage:fluid_storage.4.name=Bloco de Armazenamento de Fluidos (Modo Criativo)
 block.refinedstorage:reader.name=Leitor
 block.refinedstorage:writer.name=Escritor
@@ -221,9 +221,9 @@ item.refinedstorage:storage_disk.3.name=Disco de Armazenamento 64k
 item.refinedstorage:storage_disk.4.name=Disco de Armazenamento (Modo Criativo)
 item.refinedstorage:storage_disk.5.name=Disco de Armazenamento de Depuração
 item.refinedstorage:fluid_storage_disk.0.name=Disco de Armazenamento de Fluidos 64k
-item.refinedstorage:fluid_storage_disk.1.name=Disco de Armazenamento de Fluidos 128k
-item.refinedstorage:fluid_storage_disk.2.name=Disco de Armazenamento de Fluidos 256k
-item.refinedstorage:fluid_storage_disk.3.name=Disco de Armazenamento de Fluidos 512k
+item.refinedstorage:fluid_storage_disk.1.name=Disco de Armazenamento de Fluidos 256k
+item.refinedstorage:fluid_storage_disk.2.name=Disco de Armazenamento de Fluidos 1024k
+item.refinedstorage:fluid_storage_disk.3.name=Disco de Armazenamento de Fluidos 4096k
 item.refinedstorage:fluid_storage_disk.4.name=Disco de Armazenamento de Fluidos (Modo Criativo)
 item.refinedstorage:fluid_storage_disk.5.name=Disco de Armazenamento de Fluidos de Depuração
 item.refinedstorage:wireless_grid.0.name=Grade Wireless
@@ -248,9 +248,9 @@ item.refinedstorage:storage_part.1.name=Parte de Armazenamento 4k
 item.refinedstorage:storage_part.2.name=Parte de Armazenamento 16k
 item.refinedstorage:storage_part.3.name=Parte de Armazenamento 64k
 item.refinedstorage:fluid_storage_part.0.name=Parte de armazenamento de Fluidos 64k
-item.refinedstorage:fluid_storage_part.1.name=Parte de armazenamento de Fluidos 128k
-item.refinedstorage:fluid_storage_part.2.name=Parte de armazenamento de Fluidos 256k
-item.refinedstorage:fluid_storage_part.3.name=Parte de armazenamento de Fluidos 512k 
+item.refinedstorage:fluid_storage_part.1.name=Parte de armazenamento de Fluidos 256k
+item.refinedstorage:fluid_storage_part.2.name=Parte de armazenamento de Fluidos 1024k
+item.refinedstorage:fluid_storage_part.3.name=Parte de armazenamento de Fluidos 4096k
 item.refinedstorage:pattern.name=Padrão
 item.refinedstorage:upgrade.0.name=Aprimoramento
 item.refinedstorage:upgrade.1.name=Aprimoramento de Alcance
diff --git a/src/main/resources/assets/refinedstorage/lang/ru_ru.lang b/src/main/resources/assets/refinedstorage/lang/ru_ru.lang
index 25f010207..768a01488 100755
--- a/src/main/resources/assets/refinedstorage/lang/ru_ru.lang
+++ b/src/main/resources/assets/refinedstorage/lang/ru_ru.lang
@@ -224,9 +224,9 @@ block.refinedstorage:network_receiver.name=Сетевой приемник
 block.refinedstorage:network_transmitter.name=Сетевой передатчик
 block.refinedstorage:fluid_interface.name=Жидкостный интерфейс
 block.refinedstorage:fluid_storage.0.name=Жидкостный блок хранения 64Кб
-block.refinedstorage:fluid_storage.1.name=Жидкостный блок хранения 128Кб
-block.refinedstorage:fluid_storage.2.name=Жидкостный блок хранения 256Кб
-block.refinedstorage:fluid_storage.3.name=Жидкостный блок хранения 512Кб
+block.refinedstorage:fluid_storage.1.name=Жидкостный блок хранения 256Кб
+block.refinedstorage:fluid_storage.2.name=Жидкостный блок хранения 1024Кб
+block.refinedstorage:fluid_storage.3.name=Жидкостный блок хранения 4096Кб
 block.refinedstorage:fluid_storage.4.name=Творческий жидкостный блок хранения
 block.refinedstorage:reader.name=Устройство чтения
 block.refinedstorage:writer.name=Устройство записи
@@ -245,9 +245,9 @@ item.refinedstorage:storage_disk.3.name=Диск хранения 64Кб
 item.refinedstorage:storage_disk.4.name=Творческая дискета хранения
 item.refinedstorage:storage_disk.5.name=Диск хранения отладки
 item.refinedstorage:fluid_storage_disk.0.name=Диск хранения жидкости 64Кб
-item.refinedstorage:fluid_storage_disk.1.name=Диск хранения жидкости 128Кб
-item.refinedstorage:fluid_storage_disk.2.name=Диск хранения жидкости 256Кб
-item.refinedstorage:fluid_storage_disk.3.name=Диск хранения жидкости 512Кб
+item.refinedstorage:fluid_storage_disk.1.name=Диск хранения жидкости 256Кб
+item.refinedstorage:fluid_storage_disk.2.name=Диск хранения жидкости 1024Кб
+item.refinedstorage:fluid_storage_disk.3.name=Диск хранения жидкости 4096Кб
 item.refinedstorage:fluid_storage_disk.4.name=Творческий диск хранения жидкости
 item.refinedstorage:fluid_storage_disk.5.name=Жидкостный диск хранения отладки
 item.refinedstorage:wireless_grid.0.name=Беспроводной терминал
@@ -272,9 +272,9 @@ item.refinedstorage:storage_part.1.name=Дискетная плата 4Кб
 item.refinedstorage:storage_part.2.name=Дискетная плата 16Кб
 item.refinedstorage:storage_part.3.name=Дискетная плата 64Кб
 item.refinedstorage:fluid_storage_part.0.name=Жидкостная дискетная плата 64Кб
-item.refinedstorage:fluid_storage_part.1.name=Жидкостная дискетная плата 128Кб
-item.refinedstorage:fluid_storage_part.2.name=Жидкостная дискетная плата 256Кб
-item.refinedstorage:fluid_storage_part.3.name=Жидкостная дискетная плата 512Кб
+item.refinedstorage:fluid_storage_part.1.name=Жидкостная дискетная плата 256Кб
+item.refinedstorage:fluid_storage_part.2.name=Жидкостная дискетная плата 1024Кб
+item.refinedstorage:fluid_storage_part.3.name=Жидкостная дискетная плата 4096Кб
 item.refinedstorage:pattern.name=Шаблон
 item.refinedstorage:upgrade.0.name=Улучшение
 item.refinedstorage:upgrade.1.name=Улучшение: "Радиус"
diff --git a/src/main/resources/assets/refinedstorage/lang/zh_cn.lang b/src/main/resources/assets/refinedstorage/lang/zh_cn.lang
index d5ea6cf73..b9d0fd532 100755
--- a/src/main/resources/assets/refinedstorage/lang/zh_cn.lang
+++ b/src/main/resources/assets/refinedstorage/lang/zh_cn.lang
@@ -202,9 +202,9 @@ block.refinedstorage:network_receiver.name=网络接收器
 block.refinedstorage:network_transmitter.name=网络变送器
 block.refinedstorage:fluid_interface.name=流体面板
 block.refinedstorage:fluid_storage.0.name=64k 流体存储方块
-block.refinedstorage:fluid_storage.1.name=128k 流体存储方块
-block.refinedstorage:fluid_storage.2.name=256k 流体存储方块
-block.refinedstorage:fluid_storage.3.name=512k 流体存储方块
+block.refinedstorage:fluid_storage.1.name=256k 流体存储方块
+block.refinedstorage:fluid_storage.2.name=1024k 流体存储方块
+block.refinedstorage:fluid_storage.3.name=4096k 流体存储方块
 block.refinedstorage:fluid_storage.4.name=创造流体存储方块
 block.refinedstorage:reader.name=读取器
 block.refinedstorage:writer.name=写入器
@@ -222,9 +222,9 @@ item.refinedstorage:storage_disk.3.name=64k 存储磁盘
 item.refinedstorage:storage_disk.4.name=创造存储磁盘
 item.refinedstorage:storage_disk.5.name=调试用存储磁盘
 item.refinedstorage:fluid_storage_disk.0.name=64k 流体存储磁盘
-item.refinedstorage:fluid_storage_disk.1.name=128k 流体存储磁盘
-item.refinedstorage:fluid_storage_disk.2.name=256k 流体存储磁盘
-item.refinedstorage:fluid_storage_disk.3.name=512k 流体存储磁盘
+item.refinedstorage:fluid_storage_disk.1.name=256k 流体存储磁盘
+item.refinedstorage:fluid_storage_disk.2.name=1024k 流体存储磁盘
+item.refinedstorage:fluid_storage_disk.3.name=4096k 流体存储磁盘
 item.refinedstorage:fluid_storage_disk.4.name=创造流体存储磁盘
 item.refinedstorage:fluid_storage_disk.5.name=调试用流体存储磁盘
 item.refinedstorage:wireless_grid.0.name=无线终端
@@ -249,9 +249,9 @@ item.refinedstorage:storage_part.1.name=4k 存储元件
 item.refinedstorage:storage_part.2.name=16k 存储元件
 item.refinedstorage:storage_part.3.name=64k 存储元件
 item.refinedstorage:fluid_storage_part.0.name=64k 流体存储原件
-item.refinedstorage:fluid_storage_part.1.name=128k 流体存储原件
-item.refinedstorage:fluid_storage_part.2.name=256k 流体存储原件
-item.refinedstorage:fluid_storage_part.3.name=512k 流体存储原件
+item.refinedstorage:fluid_storage_part.1.name=256k 流体存储原件
+item.refinedstorage:fluid_storage_part.2.name=1024k 流体存储原件
+item.refinedstorage:fluid_storage_part.3.name=4096k 流体存储原件
 item.refinedstorage:pattern.name=模板
 item.refinedstorage:upgrade.0.name=空白升级
 item.refinedstorage:upgrade.1.name=范围升级
diff --git a/src/main/resources/assets/refinedstorage/models/item/1024k_fluid_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/1024k_fluid_storage_disk.json
new file mode 100644
index 000000000..677dd314e
--- /dev/null
+++ b/src/main/resources/assets/refinedstorage/models/item/1024k_fluid_storage_disk.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "refinedstorage:items/1024k_fluid_storage_disk"
+  }
+}
diff --git a/src/main/resources/assets/refinedstorage/models/item/1024k_fluid_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/1024k_fluid_storage_part.json
new file mode 100644
index 000000000..aa548b72c
--- /dev/null
+++ b/src/main/resources/assets/refinedstorage/models/item/1024k_fluid_storage_part.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "refinedstorage:items/1024k_fluid_storage_part"
+  }
+}
diff --git a/src/main/resources/assets/refinedstorage/models/item/128k_fluid_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/128k_fluid_storage_disk.json
deleted file mode 100755
index 8503c025d..000000000
--- a/src/main/resources/assets/refinedstorage/models/item/128k_fluid_storage_disk.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "refinedstorage:items/128k_fluid_storage_disk"
-  }
-}
diff --git a/src/main/resources/assets/refinedstorage/models/item/128k_fluid_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/128k_fluid_storage_part.json
deleted file mode 100755
index 6a0f26529..000000000
--- a/src/main/resources/assets/refinedstorage/models/item/128k_fluid_storage_part.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "refinedstorage:items/128k_fluid_storage_part"
-  }
-}
diff --git a/src/main/resources/assets/refinedstorage/models/item/4096k_fluid_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/4096k_fluid_storage_disk.json
new file mode 100644
index 000000000..514ccb526
--- /dev/null
+++ b/src/main/resources/assets/refinedstorage/models/item/4096k_fluid_storage_disk.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "refinedstorage:items/4096k_fluid_storage_disk"
+  }
+}
diff --git a/src/main/resources/assets/refinedstorage/models/item/4096k_fluid_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/4096k_fluid_storage_part.json
new file mode 100644
index 000000000..70d35b959
--- /dev/null
+++ b/src/main/resources/assets/refinedstorage/models/item/4096k_fluid_storage_part.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "refinedstorage:items/4096k_fluid_storage_part"
+  }
+}
diff --git a/src/main/resources/assets/refinedstorage/models/item/512k_fluid_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/512k_fluid_storage_disk.json
deleted file mode 100755
index c915ab76b..000000000
--- a/src/main/resources/assets/refinedstorage/models/item/512k_fluid_storage_disk.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "refinedstorage:items/512k_fluid_storage_disk"
-  }
-}
diff --git a/src/main/resources/assets/refinedstorage/models/item/512k_fluid_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/512k_fluid_storage_part.json
deleted file mode 100755
index 04771a814..000000000
--- a/src/main/resources/assets/refinedstorage/models/item/512k_fluid_storage_part.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "refinedstorage:items/512k_fluid_storage_part"
-  }
-}
diff --git a/src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_disk.json b/src/main/resources/assets/refinedstorage/recipes/1024k_fluid_storage_disk.json
similarity index 93%
rename from src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_disk.json
rename to src/main/resources/assets/refinedstorage/recipes/1024k_fluid_storage_disk.json
index 71e9e9d24..6f59012be 100644
--- a/src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_disk.json
+++ b/src/main/resources/assets/refinedstorage/recipes/1024k_fluid_storage_disk.json
@@ -15,7 +15,7 @@
     },
     "P": {
       "item": "refinedstorage:fluid_storage_part",
-      "data": 1
+      "data": 2
     },
     "E": {
       "item": "refinedstorage:quartz_enriched_iron"
@@ -23,6 +23,6 @@
   },
   "result": {
     "item": "refinedstorage:fluid_storage_disk",
-    "data": 1
+    "data": 2
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_disk_from_storage_housing.json b/src/main/resources/assets/refinedstorage/recipes/1024k_fluid_storage_disk_from_storage_housing.json
similarity index 89%
rename from src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_disk_from_storage_housing.json
rename to src/main/resources/assets/refinedstorage/recipes/1024k_fluid_storage_disk_from_storage_housing.json
index 9ef3afc9f..3ce6811f7 100644
--- a/src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_disk_from_storage_housing.json
+++ b/src/main/resources/assets/refinedstorage/recipes/1024k_fluid_storage_disk_from_storage_housing.json
@@ -6,11 +6,11 @@
     },
     {
       "item": "refinedstorage:fluid_storage_part",
-      "data": 1
+      "data": 2
     }
   ],
   "result": {
     "item": "refinedstorage:fluid_storage_disk",
-    "data": 1
+    "data": 2
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_part.json b/src/main/resources/assets/refinedstorage/recipes/1024k_fluid_storage_part.json
similarity index 85%
rename from src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_part.json
rename to src/main/resources/assets/refinedstorage/recipes/1024k_fluid_storage_part.json
index 01aee1eb1..d741f82a3 100644
--- a/src/main/resources/assets/refinedstorage/recipes/128k_fluid_storage_part.json
+++ b/src/main/resources/assets/refinedstorage/recipes/1024k_fluid_storage_part.json
@@ -7,14 +7,14 @@
   ],
   "key": {
     "P": {
-      "item": "#basic_processor"
+      "item": "#improved_processor"
     },
     "E": {
       "item": "refinedstorage:quartz_enriched_iron"
     },
     "S": {
       "item": "refinedstorage:fluid_storage_part",
-      "data": 0
+      "data": 1
     },
     "R": {
       "item": "minecraft:bucket"
@@ -22,6 +22,6 @@
   },
   "result": {
     "item": "refinedstorage:fluid_storage_part",
-    "data": 1
+    "data": 2
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk.json b/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk.json
index 6f59012be..71e9e9d24 100644
--- a/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk.json
+++ b/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk.json
@@ -15,7 +15,7 @@
     },
     "P": {
       "item": "refinedstorage:fluid_storage_part",
-      "data": 2
+      "data": 1
     },
     "E": {
       "item": "refinedstorage:quartz_enriched_iron"
@@ -23,6 +23,6 @@
   },
   "result": {
     "item": "refinedstorage:fluid_storage_disk",
-    "data": 2
+    "data": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk_from_storage_housing.json b/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk_from_storage_housing.json
index 3ce6811f7..9ef3afc9f 100644
--- a/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk_from_storage_housing.json
+++ b/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_disk_from_storage_housing.json
@@ -6,11 +6,11 @@
     },
     {
       "item": "refinedstorage:fluid_storage_part",
-      "data": 2
+      "data": 1
     }
   ],
   "result": {
     "item": "refinedstorage:fluid_storage_disk",
-    "data": 2
+    "data": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_part.json b/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_part.json
index d741f82a3..01aee1eb1 100644
--- a/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_part.json
+++ b/src/main/resources/assets/refinedstorage/recipes/256k_fluid_storage_part.json
@@ -7,14 +7,14 @@
   ],
   "key": {
     "P": {
-      "item": "#improved_processor"
+      "item": "#basic_processor"
     },
     "E": {
       "item": "refinedstorage:quartz_enriched_iron"
     },
     "S": {
       "item": "refinedstorage:fluid_storage_part",
-      "data": 1
+      "data": 0
     },
     "R": {
       "item": "minecraft:bucket"
@@ -22,6 +22,6 @@
   },
   "result": {
     "item": "refinedstorage:fluid_storage_part",
-    "data": 2
+    "data": 1
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_disk.json b/src/main/resources/assets/refinedstorage/recipes/4096k_fluid_storage_disk.json
similarity index 100%
rename from src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_disk.json
rename to src/main/resources/assets/refinedstorage/recipes/4096k_fluid_storage_disk.json
diff --git a/src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_disk_from_storage_housing.json b/src/main/resources/assets/refinedstorage/recipes/4096k_fluid_storage_disk_from_storage_housing.json
similarity index 100%
rename from src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_disk_from_storage_housing.json
rename to src/main/resources/assets/refinedstorage/recipes/4096k_fluid_storage_disk_from_storage_housing.json
diff --git a/src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_part.json b/src/main/resources/assets/refinedstorage/recipes/4096k_fluid_storage_part.json
similarity index 100%
rename from src/main/resources/assets/refinedstorage/recipes/512k_fluid_storage_part.json
rename to src/main/resources/assets/refinedstorage/recipes/4096k_fluid_storage_part.json
diff --git a/src/main/resources/assets/refinedstorage/solderer_recipes/128k_fluid_storage_block.json b/src/main/resources/assets/refinedstorage/solderer_recipes/1024k_fluid_storage_block.json
similarity index 90%
rename from src/main/resources/assets/refinedstorage/solderer_recipes/128k_fluid_storage_block.json
rename to src/main/resources/assets/refinedstorage/solderer_recipes/1024k_fluid_storage_block.json
index 92d18e8f7..6ab058b04 100644
--- a/src/main/resources/assets/refinedstorage/solderer_recipes/128k_fluid_storage_block.json
+++ b/src/main/resources/assets/refinedstorage/solderer_recipes/1024k_fluid_storage_block.json
@@ -1,7 +1,7 @@
 {
   "result": {
     "item": "refinedstorage:fluid_storage",
-    "data": 1
+    "data": 2
   },
   "duration": 200,
   "rows": [
@@ -11,7 +11,7 @@
     },
     {
       "item": "refinedstorage:fluid_storage_part",
-      "data": 1
+      "data": 2
     },
     {
       "item": "refinedstorage:machine_casing"
diff --git a/src/main/resources/assets/refinedstorage/solderer_recipes/256k_fluid_storage_block.json b/src/main/resources/assets/refinedstorage/solderer_recipes/256k_fluid_storage_block.json
index 6ab058b04..92d18e8f7 100644
--- a/src/main/resources/assets/refinedstorage/solderer_recipes/256k_fluid_storage_block.json
+++ b/src/main/resources/assets/refinedstorage/solderer_recipes/256k_fluid_storage_block.json
@@ -1,7 +1,7 @@
 {
   "result": {
     "item": "refinedstorage:fluid_storage",
-    "data": 2
+    "data": 1
   },
   "duration": 200,
   "rows": [
@@ -11,7 +11,7 @@
     },
     {
       "item": "refinedstorage:fluid_storage_part",
-      "data": 2
+      "data": 1
     },
     {
       "item": "refinedstorage:machine_casing"
diff --git a/src/main/resources/assets/refinedstorage/solderer_recipes/512k_fluid_storage_block.json b/src/main/resources/assets/refinedstorage/solderer_recipes/4096k_fluid_storage_block.json
similarity index 100%
rename from src/main/resources/assets/refinedstorage/solderer_recipes/512k_fluid_storage_block.json
rename to src/main/resources/assets/refinedstorage/solderer_recipes/4096k_fluid_storage_block.json
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/128k_fluid_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/1024k_fluid_storage_block.png
old mode 100755
new mode 100644
similarity index 88%
rename from src/main/resources/assets/refinedstorage/textures/blocks/128k_fluid_storage_block.png
rename to src/main/resources/assets/refinedstorage/textures/blocks/1024k_fluid_storage_block.png
index fd9dc3862..d460dc9c6
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/128k_fluid_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/1024k_fluid_storage_block.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/256k_fluid_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/256k_fluid_storage_block.png
index d460dc9c6..fd9dc3862 100755
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/256k_fluid_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/256k_fluid_storage_block.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/512k_fluid_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/4096k_fluid_storage_block.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/resources/assets/refinedstorage/textures/blocks/512k_fluid_storage_block.png
rename to src/main/resources/assets/refinedstorage/textures/blocks/4096k_fluid_storage_block.png
diff --git a/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/1024k_fluid_storage_disk.png
old mode 100755
new mode 100644
similarity index 93%
rename from src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_disk.png
rename to src/main/resources/assets/refinedstorage/textures/items/1024k_fluid_storage_disk.png
index 4389a459f..28e1b1435
Binary files a/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/1024k_fluid_storage_disk.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/1024k_fluid_storage_part.png
old mode 100755
new mode 100644
similarity index 88%
rename from src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_part.png
rename to src/main/resources/assets/refinedstorage/textures/items/1024k_fluid_storage_part.png
index 47d51e333..8c9362153
Binary files a/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_part.png and b/src/main/resources/assets/refinedstorage/textures/items/1024k_fluid_storage_part.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_disk.png
index 28e1b1435..4389a459f 100755
Binary files a/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_disk.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_part.png
index 8c9362153..47d51e333 100755
Binary files a/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_part.png and b/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_part.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/4096k_fluid_storage_disk.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_disk.png
rename to src/main/resources/assets/refinedstorage/textures/items/4096k_fluid_storage_disk.png
diff --git a/src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/4096k_fluid_storage_part.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_part.png
rename to src/main/resources/assets/refinedstorage/textures/items/4096k_fluid_storage_part.png