diff --git a/gradle.properties b/gradle.properties
index 1af039e3..7ae2e0cf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.daemon=false
 minecraft_version=1.21.1
 archive_minecraft_version=1.21.1
 supported_version=1.21.1
-loader_version=0.15.11
+loader_version=0.16.9
 
 # Mod Properties
 mod_version=15.8.3
@@ -16,7 +16,7 @@ maven_group=snownee.jade
 archives_base_name=Jade
 
 # Dependencies
-fabric_version=0.102.1+1.21.1
+fabric_version=0.109.0+1.21.1
 cloth_config_version=7.0.65
 modmenu_version=11.0.1
 rei_version=9.1.504
diff --git a/src/main/java/snownee/jade/addon/universal/EnergyStorageProvider.java b/src/main/java/snownee/jade/addon/universal/EnergyStorageProvider.java
index c0506b0f..e3a9d242 100644
--- a/src/main/java/snownee/jade/addon/universal/EnergyStorageProvider.java
+++ b/src/main/java/snownee/jade/addon/universal/EnergyStorageProvider.java
@@ -6,11 +6,8 @@
 import java.util.Optional;
 import java.util.function.Function;
 
-import com.ibm.icu.text.DisplayContext;
-
 import org.jetbrains.annotations.Nullable;
 
-import net.minecraft.ChatFormatting;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -25,7 +22,6 @@
 import snownee.jade.api.config.IPluginConfig;
 import snownee.jade.api.config.IWailaConfig;
 import snownee.jade.api.ui.BoxStyle;
-import snownee.jade.api.ui.DisplayStyle;
 import snownee.jade.api.ui.IElementHelper;
 import snownee.jade.api.ui.ProgressStyle;
 import snownee.jade.api.view.ClientViewGroup;
@@ -35,6 +31,7 @@
 import snownee.jade.api.view.ViewGroup;
 import snownee.jade.impl.WailaClientRegistration;
 import snownee.jade.impl.WailaCommonRegistration;
+import snownee.jade.impl.ui.ElementHelper;
 import snownee.jade.util.CommonProxy;
 import snownee.jade.util.WailaExceptionHandler;
 
@@ -87,34 +84,35 @@ public static void append(ITooltip tooltip, Accessor<?> accessor, IPluginConfig
 
 		IElementHelper helper = IElementHelper.get();
 		boolean renderGroup = groups.size() > 1 || groups.getFirst().shouldRenderGroup();
-		ClientViewGroup.tooltip(tooltip, groups, renderGroup, (theTooltip, group) -> {
-			if (renderGroup) {
-				group.renderHeader(theTooltip);
-			}
-			for (var view : group.views) {
-				Component text;
-				if (view.overrideText != null) {
-					text = view.overrideText;
-				} else {
-					text = Component.translatable("jade.fe", ChatFormatting.WHITE + view.current, view.max)
-							.withStyle(ChatFormatting.GRAY);
-				}
-
-				DisplayStyle style = config.getEnum(JadeIds.UNIVERSAL_ENERGY_STORAGE_STYLE);
-				switch(style) {
-					case TEXT -> theTooltip.add(Component.translatable("jade.energy.text").append(text));
-					case SYMBOL -> {
-						ResourceLocation location = JadeIds.JADE("energy");
-						theTooltip.add(helper.sprite(location, 7, 7));
-						theTooltip.append(text);
+		ClientViewGroup.tooltip(
+				tooltip, groups, renderGroup, (theTooltip, group) -> {
+					if (renderGroup) {
+						group.renderHeader(theTooltip);
 					}
-					default -> {
-						ProgressStyle progressStyle = helper.progressStyle().color(0xFFAA0000, 0xFF660000);
-						theTooltip.add(helper.progress(view.ratio, text, progressStyle, BoxStyle.getNestedBox(), true));
+					for (var view : group.views) {
+						Component text;
+						if (view.overrideText != null) {
+							text = view.overrideText;
+						} else {
+							text = Component.translatable("jade.fe", view.current, view.max);
+						}
+
+						IWailaConfig.HandlerDisplayStyle style = config.getEnum(JadeIds.UNIVERSAL_ENERGY_STORAGE_STYLE);
+						switch (style) {
+							case PLAIN_TEXT -> theTooltip.add(Component.translatable("jade.energy.text", text));
+							case ICON -> {
+								theTooltip.add(helper.sprite(JadeIds.JADE("energy"), 10, 10)
+										.size(ElementHelper.SMALL_ITEM_SIZE)
+										.translate(ElementHelper.SMALL_ITEM_OFFSET));
+								theTooltip.append(text);
+							}
+							case PROGRESS_BAR -> {
+								ProgressStyle progressStyle = helper.progressStyle().color(0xFFAA0000, 0xFF660000);
+								theTooltip.add(helper.progress(view.ratio, text, progressStyle, BoxStyle.getNestedBox(), true));
+							}
+						}
 					}
-				}
-			}
-		});
+				});
 	}
 
 	public static void putData(Accessor<?> accessor) {
diff --git a/src/main/java/snownee/jade/addon/universal/FluidStorageProvider.java b/src/main/java/snownee/jade/addon/universal/FluidStorageProvider.java
index ea4c007e..6deafd18 100644
--- a/src/main/java/snownee/jade/addon/universal/FluidStorageProvider.java
+++ b/src/main/java/snownee/jade/addon/universal/FluidStorageProvider.java
@@ -24,8 +24,8 @@
 import snownee.jade.api.TooltipPosition;
 import snownee.jade.api.config.IPluginConfig;
 import snownee.jade.api.config.IWailaConfig;
+import snownee.jade.api.theme.IThemeHelper;
 import snownee.jade.api.ui.BoxStyle;
-import snownee.jade.api.ui.DisplayStyle;
 import snownee.jade.api.ui.IDisplayHelper;
 import snownee.jade.api.ui.IElementHelper;
 import snownee.jade.api.ui.ProgressStyle;
@@ -88,42 +88,47 @@ public static void append(ITooltip tooltip, Accessor<?> accessor, IPluginConfig
 
 		IElementHelper helper = IElementHelper.get();
 		boolean renderGroup = groups.size() > 1 || groups.getFirst().shouldRenderGroup();
-		ClientViewGroup.tooltip(tooltip, groups, renderGroup, (theTooltip, group) -> {
-			if (renderGroup) {
-				group.renderHeader(theTooltip);
-			}
-			for (var view : group.views) {
-				Component text;
-				DisplayStyle style = config.getEnum(JadeIds.UNIVERSAL_FLUID_STORAGE_STYLE);
-
-				if (view.overrideText != null) {
-					text = view.overrideText;
-				} else if (view.fluidName == null) {
-					text = Component.literal(view.current);
-				} else if (accessor.showDetails() || style != DisplayStyle.PROGRESSBAR) {
-					text = Component.translatable(
-							"jade.fluid2",
-							IDisplayHelper.get().stripColor(view.fluidName).withStyle(ChatFormatting.WHITE),
-							Component.literal(view.current).withStyle(ChatFormatting.WHITE),
-							view.max).withStyle(ChatFormatting.GRAY);
-				} else {
-					text = Component.translatable("jade.fluid", IDisplayHelper.get().stripColor(view.fluidName), view.current);
-				}
-
-				switch(style) {
-					case TEXT -> theTooltip.add(Component.translatable("jade.fluid.text").append(text));
-					case SYMBOL -> {
-						ResourceLocation location = JadeIds.JADE("fluid");
-						theTooltip.add(helper.smallItem(new ItemStack(Items.BUCKET)));
-						theTooltip.append(text);
+		ClientViewGroup.tooltip(
+				tooltip, groups, renderGroup, (theTooltip, group) -> {
+					if (renderGroup) {
+						group.renderHeader(theTooltip);
 					}
-					default -> {
-						ProgressStyle progressStyle = helper.progressStyle().overlay(view.overlay);
-						theTooltip.add(helper.progress(view.ratio, text, progressStyle, BoxStyle.getNestedBox(), true));
+					for (var view : group.views) {
+						Component text;
+						IWailaConfig.HandlerDisplayStyle style = config.getEnum(JadeIds.UNIVERSAL_FLUID_STORAGE_STYLE);
+
+						if (view.overrideText != null) {
+							text = view.overrideText;
+						} else if (view.fluidName == null) {
+							// when do we reach here?
+							text = IThemeHelper.get().info(view.current);
+						} else {
+							Component fluidName = IThemeHelper.get().info(IDisplayHelper.get().stripColor(view.fluidName));
+							if (accessor.showDetails() || style != IWailaConfig.HandlerDisplayStyle.PROGRESS_BAR) {
+								text = Component.translatable(
+										"jade.fluid.with_capacity",
+										IThemeHelper.get().info(view.current),
+										view.max);
+							} else {
+								text = IThemeHelper.get().info(view.current);
+							}
+							String key = style == IWailaConfig.HandlerDisplayStyle.PLAIN_TEXT ? "jade.fluid.text" : "jade.fluid";
+							text = Component.translatable(key, fluidName, text);
+						}
+
+						switch (style) {
+							case PLAIN_TEXT -> theTooltip.add(text);
+							case ICON -> {
+								theTooltip.add(helper.smallItem(new ItemStack(Items.BUCKET)));
+								theTooltip.append(text);
+							}
+							case PROGRESS_BAR -> {
+								ProgressStyle progressStyle = helper.progressStyle().overlay(view.overlay);
+								theTooltip.add(helper.progress(view.ratio, text, progressStyle, BoxStyle.getNestedBox(), true));
+							}
+						}
 					}
-				}
-			}
-		});
+				});
 	}
 
 	public static void putData(Accessor<?> accessor) {
diff --git a/src/main/java/snownee/jade/addon/universal/UniversalPlugin.java b/src/main/java/snownee/jade/addon/universal/UniversalPlugin.java
index 4eba5590..a793b968 100644
--- a/src/main/java/snownee/jade/addon/universal/UniversalPlugin.java
+++ b/src/main/java/snownee/jade/addon/universal/UniversalPlugin.java
@@ -8,7 +8,7 @@
 import snownee.jade.api.IWailaPlugin;
 import snownee.jade.api.JadeIds;
 import snownee.jade.api.WailaPlugin;
-import snownee.jade.api.ui.DisplayStyle;
+import snownee.jade.api.config.IWailaConfig;
 
 @WailaPlugin
 public class UniversalPlugin implements IWailaPlugin {
@@ -40,9 +40,9 @@ public void registerClient(IWailaClientRegistration registration) {
 		registration.addConfig(JadeIds.UNIVERSAL_ITEM_STORAGE_SHOW_NAME_AMOUNT, 5, 0, 9, true);
 		registration.addConfig(JadeIds.UNIVERSAL_ITEM_STORAGE_ITEMS_PER_LINE, 9, 3, 27, true);
 		registration.addConfig(JadeIds.UNIVERSAL_ENERGY_STORAGE_DETAILED, false);
-		registration.addConfig(JadeIds.UNIVERSAL_ENERGY_STORAGE_STYLE, DisplayStyle.PROGRESSBAR);
+		registration.addConfig(JadeIds.UNIVERSAL_ENERGY_STORAGE_STYLE, IWailaConfig.HandlerDisplayStyle.PROGRESS_BAR);
 		registration.addConfig(JadeIds.UNIVERSAL_FLUID_STORAGE_DETAILED, false);
-		registration.addConfig(JadeIds.UNIVERSAL_FLUID_STORAGE_STYLE, DisplayStyle.PROGRESSBAR);
+		registration.addConfig(JadeIds.UNIVERSAL_FLUID_STORAGE_STYLE, IWailaConfig.HandlerDisplayStyle.PROGRESS_BAR);
 
 		registration.registerBlockComponent(ItemStorageProvider.getBlock(), Block.class);
 		registration.registerEntityComponent(ItemStorageProvider.getEntity(), Entity.class);
diff --git a/src/main/java/snownee/jade/api/config/IWailaConfig.java b/src/main/java/snownee/jade/api/config/IWailaConfig.java
index 9026b548..4af9411f 100644
--- a/src/main/java/snownee/jade/api/config/IWailaConfig.java
+++ b/src/main/java/snownee/jade/api/config/IWailaConfig.java
@@ -60,6 +60,10 @@ enum PerspectiveMode implements SimpleStringRepresentable {
 		CAMERA, EYE
 	}
 
+	enum HandlerDisplayStyle implements SimpleStringRepresentable {
+		PROGRESS_BAR, ICON, PLAIN_TEXT;
+	}
+
 	@NonExtendable
 	interface IConfigGeneral {
 
diff --git a/src/main/java/snownee/jade/api/ui/DisplayStyle.java b/src/main/java/snownee/jade/api/ui/DisplayStyle.java
deleted file mode 100644
index 51d15326..00000000
--- a/src/main/java/snownee/jade/api/ui/DisplayStyle.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package snownee.jade.api.ui;
-
-public enum DisplayStyle {
-	TEXT, SYMBOL, PROGRESSBAR;
-}
diff --git a/src/main/java/snownee/jade/impl/ui/SimpleProgressStyle.java b/src/main/java/snownee/jade/impl/ui/SimpleProgressStyle.java
index c6a94217..2d334f52 100644
--- a/src/main/java/snownee/jade/impl/ui/SimpleProgressStyle.java
+++ b/src/main/java/snownee/jade/impl/ui/SimpleProgressStyle.java
@@ -10,9 +10,10 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.phys.Vec2;
 import snownee.jade.api.config.IWailaConfig.IConfigOverlay;
+import snownee.jade.api.theme.IThemeHelper;
 import snownee.jade.api.ui.Color;
-import snownee.jade.api.ui.ScreenDirection;
 import snownee.jade.api.ui.ProgressStyle;
+import snownee.jade.api.ui.ScreenDirection;
 import snownee.jade.overlay.DisplayHelper;
 import snownee.jade.overlay.OverlayRenderer;
 
@@ -25,7 +26,7 @@ public class SimpleProgressStyle extends ProgressStyle {
 	public boolean vertical;
 
 	public SimpleProgressStyle() {
-		color(0xFFFFFFFF);
+		color(-1);
 	}
 
 	private static Vector3f RGBtoHSV(int rgb) {
@@ -68,7 +69,9 @@ public ProgressStyle color(int color, int color2) {
 
 	@Override
 	public ProgressStyle direction(ScreenDirection direction) {
-		Preconditions.checkArgument(direction == ScreenDirection.UP || direction == ScreenDirection.RIGHT, "Only UP and RIGHT are supported");
+		Preconditions.checkArgument(
+				direction == ScreenDirection.UP || direction == ScreenDirection.RIGHT,
+				"Only UP and RIGHT are supported");
 		super.direction(direction);
 		vertical = direction.isVertical();
 		return this;
@@ -131,8 +134,10 @@ public void render(GuiGraphics guiGraphics, float x, float y, float width, float
 				if (overlay == null && RGBtoHSV(color2).z() > 0.75f) {
 					textColor = 0xFF000000;
 				} else {
-					textColor = 0xFFFFFFFF;
+					textColor = IThemeHelper.get().getNormalColor();
 				}
+			} else if (textColor == -1) {
+				textColor = IThemeHelper.get().getNormalColor();
 			}
 			y += height - font.lineHeight;
 			if (vertical && font.lineHeight < progress) {
diff --git a/src/main/resources/assets/jade/lang/de_de.json b/src/main/resources/assets/jade/lang/de_de.json
index 04dd108b..efda575e 100644
--- a/src/main/resources/assets/jade/lang/de_de.json
+++ b/src/main/resources/assets/jade/lang/de_de.json
@@ -109,7 +109,7 @@
 	"config.jade.plugin_minecraft.item_tooltip": "Item-Tooltip",
 	"jade.locked": "Inventar ist gesperrt",
 	"jade.fe": "%s / %s",
-	"jade.energy.text": "Energie: ",
+	"jade.energy.text": "Energie: %s",
 	"jade.fluid": "%s %s",
 	"jade.fluid.empty": "Leer",
 	"config.jade.plugin_minecraft.lectern": "Lesepult",
diff --git a/src/main/resources/assets/jade/lang/en_us.json b/src/main/resources/assets/jade/lang/en_us.json
index 20038bfc..06bea565 100644
--- a/src/main/resources/assets/jade/lang/en_us.json
+++ b/src/main/resources/assets/jade/lang/en_us.json
@@ -257,26 +257,24 @@
 	"config.jade.plugin_minecraft.energy_storage": "Energy Storage",
 	"config.jade.plugin_minecraft.energy_storage.detailed": "Detailed-Only",
 	"config.jade.plugin_minecraft.energy_storage.detailed_desc": "Only show energy info when ${SHOW_DETAILS} is pressed.",
-	"config.jade.plugin_minecraft.energy_storage.style": "Display style",
-	"config.jade.plugin_minecraft.energy_storage.style_text": "Text",
-	"config.jade.plugin_minecraft.energy_storage.style_symbol": "Symbol",
-	"config.jade.plugin_minecraft.energy_storage.style_progressbar": "Progressbar",
-	"config.jade.plugin_minecraft.energy_storage.style_desc": "Choose between the following Display Styles:\n- Progressbar\n- Text\n- Symbol",
-	"jade.energy.text": "Energy: ",
+	"config.jade.plugin_minecraft.energy_storage.style": "Display Style",
+	"config.jade.plugin_minecraft.energy_storage.style_plain_text": "Plain Text",
+	"config.jade.plugin_minecraft.energy_storage.style_icon": "Icon",
+	"config.jade.plugin_minecraft.energy_storage.style_progress_bar": "Progress Bar",
 	"jade.fe": "%s / %s",
+	"jade.energy.text": "Energy: %s",
 	"config.jade.plugin_minecraft.fluid_storage": "Fluid Storage",
 	"config.jade.plugin_minecraft.fluid_storage_extra_msg": "tank,liquid",
 	"config.jade.plugin_minecraft.fluid_storage.detailed": "Detailed-Only",
 	"config.jade.plugin_minecraft.fluid_storage.detailed_desc": "Only show fluid info when ${SHOW_DETAILS} is pressed.",
-	"config.jade.plugin_minecraft.fluid_storage.style": "Display style",
-	"config.jade.plugin_minecraft.fluid_storage.style_text": "Text",
-	"config.jade.plugin_minecraft.fluid_storage.style_symbol": "Symbol",
-	"config.jade.plugin_minecraft.fluid_storage.style_progressbar": "Progressbar",
-	"config.jade.plugin_minecraft.fluid_storage.style_desc": "Choose between the following Display Styles:\n- Progressbar\n- Text\n- Symbol",
-	"jade.fluid.text": "Fluid: ",
+	"config.jade.plugin_minecraft.fluid_storage.style": "Display Style",
+	"config.jade.plugin_minecraft.fluid_storage.style_plain_text": "Plain Text",
+	"config.jade.plugin_minecraft.fluid_storage.style_icon": "Icon",
+	"config.jade.plugin_minecraft.fluid_storage.style_progress_bar": "Progress Bar",
 	"jade.fluid": "%s %s",
-	"jade.fluid2": "%s %s / %s",
+	"jade.fluid.with_capacity": "%s / %s",
 	"jade.fluid.empty": "Empty",
+	"jade.fluid.text": "%s: %s",
 	"config.jade.plugin_minecraft.lectern": "Lectern",
 	"config.jade.plugin_minecraft.animal_owner": "Animal Owner",
 	"config.jade.plugin_minecraft.animal_owner_extra_msg": "horse,pet",
diff --git a/src/main/resources/assets/jade/lang/es_es.json b/src/main/resources/assets/jade/lang/es_es.json
index 050fa691..f62ccf92 100644
--- a/src/main/resources/assets/jade/lang/es_es.json
+++ b/src/main/resources/assets/jade/lang/es_es.json
@@ -247,7 +247,6 @@
 	"config.jade.plugin_minecraft.fluid_storage.detailed": "Sólo detallado",
 	"config.jade.plugin_minecraft.fluid_storage.detailed_desc": "Solo muestra información del fluido cuando se presiona ${SHOW_DETAILS}.",
 	"jade.fluid": "%s %s",
-	"jade.fluid2": "%s %s / %s",
 	"jade.fluid.empty": "Vacío",
 	"config.jade.plugin_minecraft.lectern": "Atril",
 	"config.jade.plugin_minecraft.animal_owner": "Dueño del animal",
diff --git a/src/main/resources/assets/jade/lang/ja_jp.json b/src/main/resources/assets/jade/lang/ja_jp.json
index 41964789..3f07fbc6 100644
--- a/src/main/resources/assets/jade/lang/ja_jp.json
+++ b/src/main/resources/assets/jade/lang/ja_jp.json
@@ -231,7 +231,7 @@
 	"config.jade.plugin_minecraft.fluid_storage.detailed": "詳細のみ",
 	"config.jade.plugin_minecraft.fluid_storage.detailed_desc": "${SHOW_DETAILS}を押した時にのみ液体情報を表示します。",
 	"jade.fluid": "%s %s",
-	"jade.fluid2": "%s %s／%s",
+	"jade.fluid.with_capacity": "%s／%s",
 	"jade.fluid.empty": "空",
 	"config.jade.plugin_minecraft.lectern": "書見台",
 	"config.jade.plugin_minecraft.animal_owner": "動物の所有者",
diff --git a/src/main/resources/assets/jade/lang/ko_kr.json b/src/main/resources/assets/jade/lang/ko_kr.json
index d3ee1e39..60d273ed 100644
--- a/src/main/resources/assets/jade/lang/ko_kr.json
+++ b/src/main/resources/assets/jade/lang/ko_kr.json
@@ -251,7 +251,6 @@
 	"config.jade.plugin_minecraft.fluid_storage.detailed": "상세-전용",
 	"config.jade.plugin_minecraft.fluid_storage.detailed_desc": "${SHOW_DETAILS} 키를 눌렀을 때만 액체 정보를 표시.",
 	"jade.fluid": "%s %s",
-	"jade.fluid2": "%s %s / %s",
 	"jade.fluid.empty": "비어있음",
 	"config.jade.plugin_minecraft.lectern": "독서대",
 	"config.jade.plugin_minecraft.animal_owner": "동물 주인",
diff --git a/src/main/resources/assets/jade/lang/nl_nl.json b/src/main/resources/assets/jade/lang/nl_nl.json
index b7491503..f05fc71e 100644
--- a/src/main/resources/assets/jade/lang/nl_nl.json
+++ b/src/main/resources/assets/jade/lang/nl_nl.json
@@ -247,7 +247,6 @@
 	"config.jade.plugin_minecraft.fluid_storage.detailed": "Alleen gedetailleerd",
 	"config.jade.plugin_minecraft.fluid_storage.detailed_desc": "Toon alleen vloeistofinformatie wanneer ${SHOW_DETAILS} wordt ingedrukt.",
 	"jade.fluid": "%s %s",
-	"jade.fluid2": "%s %s / %s",
 	"jade.fluid.empty": "Leeg",
 	"config.jade.plugin_minecraft.lectern": "Lessenaar",
 	"config.jade.plugin_minecraft.animal_owner": "Diereneigenaar",
diff --git a/src/main/resources/assets/jade/lang/ru_ru.json b/src/main/resources/assets/jade/lang/ru_ru.json
index 84bcc0ce..b6dff53d 100644
--- a/src/main/resources/assets/jade/lang/ru_ru.json
+++ b/src/main/resources/assets/jade/lang/ru_ru.json
@@ -253,7 +253,6 @@
 	"config.jade.plugin_minecraft.fluid_storage.detailed": "Только детальная информация",
 	"config.jade.plugin_minecraft.fluid_storage.detailed_desc": "Показывать информацию о жидкости только при нажатии клавиши ${SHOW_DETAILS}.",
 	"jade.fluid": "%s %s",
-	"jade.fluid2": "%s %s / %s",
 	"jade.fluid.empty": "Пусто",
 	"config.jade.plugin_minecraft.lectern": "Кафедра",
 	"config.jade.plugin_minecraft.animal_owner": "Владелец животного",
diff --git a/src/main/resources/assets/jade/lang/uk_ua.json b/src/main/resources/assets/jade/lang/uk_ua.json
index 367f775e..9d149094 100644
--- a/src/main/resources/assets/jade/lang/uk_ua.json
+++ b/src/main/resources/assets/jade/lang/uk_ua.json
@@ -254,7 +254,6 @@
 	"config.jade.plugin_minecraft.fluid_storage.detailed": "Тільки детально",
 	"config.jade.plugin_minecraft.fluid_storage.detailed_desc": "Показувати інформацію про рідину лише тоді, коли натиснуто ${SHOW_DETAILS}.",
 	"jade.fluid": "%s %s",
-	"jade.fluid2": "%s %s / %s",
 	"jade.fluid.empty": "Порожньо",
 	"config.jade.plugin_minecraft.lectern": "Аналой",
 	"config.jade.plugin_minecraft.animal_owner": "Власник тварини",
diff --git a/src/main/resources/assets/jade/lang/zh_cn.json b/src/main/resources/assets/jade/lang/zh_cn.json
index 19730bf8..aa54ece4 100644
--- a/src/main/resources/assets/jade/lang/zh_cn.json
+++ b/src/main/resources/assets/jade/lang/zh_cn.json
@@ -254,7 +254,6 @@
 	"config.jade.plugin_minecraft.fluid_storage.detailed": "仅在细节显示",
 	"config.jade.plugin_minecraft.fluid_storage.detailed_desc": "仅在按下${SHOW_DETAILS}时显示。",
 	"jade.fluid": "%s %s",
-	"jade.fluid2": "%s %s / %s",
 	"jade.fluid.empty": "空",
 	"config.jade.plugin_minecraft.lectern": "讲台",
 	"config.jade.plugin_minecraft.animal_owner": "动物主人",
diff --git a/src/main/resources/assets/jade/lang/zh_tw.json b/src/main/resources/assets/jade/lang/zh_tw.json
index aa091f8f..113e27bb 100644
--- a/src/main/resources/assets/jade/lang/zh_tw.json
+++ b/src/main/resources/assets/jade/lang/zh_tw.json
@@ -254,7 +254,7 @@
 	"config.jade.plugin_minecraft.fluid_storage.detailed": "僅詳細資料",
 	"config.jade.plugin_minecraft.fluid_storage.detailed_desc": "只在按下${SHOW_DETAILS}時顯示流體資訊。",
 	"jade.fluid": "%s %s",
-	"jade.fluid2": "%s %s/%s",
+	"jade.fluid.with_capacity": "%s/%s",
 	"jade.fluid.empty": "空",
 	"config.jade.plugin_minecraft.lectern": "講台",
 	"config.jade.plugin_minecraft.animal_owner": "動物主人",
diff --git a/src/main/resources/assets/jade/textures/gui/sprites/energy.png b/src/main/resources/assets/jade/textures/gui/sprites/energy.png
index ce49521b..7d051b89 100644
Binary files a/src/main/resources/assets/jade/textures/gui/sprites/energy.png and b/src/main/resources/assets/jade/textures/gui/sprites/energy.png differ