diff --git a/core/src/com/riiablo/panel/CharacterPanel.java b/core/src/com/riiablo/panel/CharacterPanel.java
index ab54ace1..c196e52b 100644
--- a/core/src/com/riiablo/panel/CharacterPanel.java
+++ b/core/src/com/riiablo/panel/CharacterPanel.java
@@ -17,6 +17,7 @@ import com.riiablo.Cvars;
 import com.riiablo.Riiablo;
 import com.riiablo.codec.DC6;
 import com.riiablo.entity.Player;
+import com.riiablo.item.Attributes;
 import com.riiablo.item.Stat;
 import com.riiablo.loader.DC6Loader;
 import com.riiablo.screen.GameScreen;
@@ -124,8 +125,7 @@ public class CharacterPanel extends WidgetGroup implements Disposable {
     defenseLabel.setAlignment(Align.center);
     addActor(defenseLabel);
 
-    //Label armorclass = createStatLabel(Stat.armorclass);
-    Label armorclass = new StatLabel(Riiablo.charData.getStats(), Stat.armorclass);
+    Label armorclass = createStatLabel(Stat.armorclass);
     armorclass.setPosition(272, getHeight() - 210);
     armorclass.setSize(40, 16);
     addActor(armorclass);
@@ -206,7 +206,7 @@ public class CharacterPanel extends WidgetGroup implements Disposable {
     fireResLabel.setAlignment(Align.center);
     addActor(fireResLabel);
 
-    Label fireRes = createStatLabel(Stat.fireresist, false);
+    Label fireRes = createStatLabel(Stat.fireresist, StatLabel.Colorizer.RESISTANCE);
     fireRes.setPosition(273, getHeight() - 349);
     fireRes.setSize(36, 16);
     addActor(fireRes);
@@ -217,7 +217,7 @@ public class CharacterPanel extends WidgetGroup implements Disposable {
     coldResLabel.setAlignment(Align.center);
     addActor(coldResLabel);
 
-    Label coldRes = createStatLabel(Stat.coldresist, false);
+    Label coldRes = createStatLabel(Stat.coldresist, StatLabel.Colorizer.RESISTANCE);
     coldRes.setPosition(273, getHeight() - 373);
     coldRes.setSize(36, 16);
     addActor(coldRes);
@@ -228,7 +228,7 @@ public class CharacterPanel extends WidgetGroup implements Disposable {
     lightningResLabel.setAlignment(Align.center);
     addActor(lightningResLabel);
 
-    Label lightningRes = createStatLabel(Stat.lightresist, false);
+    Label lightningRes = createStatLabel(Stat.lightresist, StatLabel.Colorizer.RESISTANCE);
     lightningRes.setPosition(273, getHeight() - 397);
     lightningRes.setSize(36, 16);
     addActor(lightningRes);
@@ -239,7 +239,7 @@ public class CharacterPanel extends WidgetGroup implements Disposable {
     poisonResLabel.setAlignment(Align.center);
     addActor(poisonResLabel);
 
-    Label poisonRes = createStatLabel(Stat.poisonresist, false);
+    Label poisonRes = createStatLabel(Stat.poisonresist, StatLabel.Colorizer.RESISTANCE);
     poisonRes.setPosition(273, getHeight() - 421);
     poisonRes.setSize(36, 16);
     addActor(poisonRes);
@@ -248,17 +248,12 @@ public class CharacterPanel extends WidgetGroup implements Disposable {
   }
 
   private Label createStatLabel(int statId) {
-    return createStatLabel(statId, true);
+    return createStatLabel(statId, StatLabel.Colorizer.DEFAULT);
   }
 
-  private Label createStatLabel(int statId, boolean mod) {
-    Stat stat = Riiablo.charData.getStats().get(statId);
-    int value = stat.entry.ValShift > 0 ? (int) stat.toFloat() : stat.value();
-    String text = Integer.toString(value);
-    Label label = new Label(text, getFont(text.length()));
-    label.setColor(getColor(mod, stat, value));
-    label.setAlignment(Align.center);
-    return label;
+  private Label createStatLabel(int statId, StatLabel.Colorizer colorizer) {
+    Attributes attrs = Riiablo.charData.getStats();
+    return new StatLabel(attrs, statId, colorizer);
   }
 
   private BitmapFont getFont(int length) {
diff --git a/core/src/com/riiablo/widget/StatLabel.java b/core/src/com/riiablo/widget/StatLabel.java
index 4b04cbeb..e255acc3 100644
--- a/core/src/com/riiablo/widget/StatLabel.java
+++ b/core/src/com/riiablo/widget/StatLabel.java
@@ -14,10 +14,14 @@ public class StatLabel extends Label {
   Colorizer colorizer;
 
   public StatLabel(Attributes attrs, int stat) {
+    this(attrs, stat, Colorizer.DEFAULT);
+  }
+
+  public StatLabel(Attributes attrs, int stat, Colorizer colorizer) {
     super(Riiablo.fonts.font16);
     this.attrs = attrs;
     this.stat = stat;
-    colorizer = Colorizer.DEFAULT;
+    this.colorizer = colorizer;
     updateSize = false;
   }
 
@@ -28,9 +32,11 @@ public class StatLabel extends Label {
   }
 
   private void updateValue() {
-    int curValue = attrs.get(stat).value();
+    Stat s = attrs.get(stat);
+    int curValue = s.value();
     if (value != curValue) {
       value = curValue;
+      if (s.entry.ValShift > 0) value = (int) s.toFloat();
       setAlignment(Align.center);
       setText(Integer.toString(value));
       setColor(colorizer.getColor(attrs.get(stat)));
@@ -70,13 +76,18 @@ public class StatLabel extends Label {
     RESISTANCE {
       @Override
       Color getColor(Stat stat) {
-        if (stat.value() < 0) {
+        int value = stat.value();
+        if (value < 0) {
           return Riiablo.colors.red;
+        } else if (value < 75) {
+          return Riiablo.colors.white;
+        //} else if (value == MAX) {
+        //  return Riiablo.colors.gold;
+        //} else if (75 < value < MAX) {
+        //  return Riiablo.colors.blue;
+        } else {
+          return Riiablo.colors.white;
         }
-
-        return stat.isModified()
-            ? Riiablo.colors.blue
-            : Riiablo.colors.white;
       }
     };