diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java
index 83639dae4..1a92eedec 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java
@@ -228,7 +228,7 @@ public class Potion extends Item {
 	
 	public void shatter( int cell ) {
 		if (Dungeon.visible[cell]) {
-			GLog.i( Messages.get(Potion.class, "shatter", color()) );
+			GLog.i( Messages.get(Potion.class, "shatter") );
 			Sample.INSTANCE.play( Assets.SND_SHATTER );
 			splash( cell );
 		}
@@ -260,20 +260,16 @@ public class Potion extends Item {
 		return this;
 	}
 	
-	protected String color() {
-		return Messages.get(Potion.class, color);
-	}
-	
 	@Override
 	public String name() {
-		return isKnown() ? super.name() : Messages.get(Potion.class, "unknown_name", color());
+		return isKnown() ? super.name() : Messages.get(Potion.class, color);
 	}
 	
 	@Override
 	public String info() {
 		return isKnown() ?
 			desc() :
-			Messages.get(Potion.class, "unknown_desc", color());
+			Messages.get(Potion.class, "unknown_desc");
 	}
 
 	public Integer initials(){
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
index 22a9ad0f6..c5913a1c8 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
@@ -142,20 +142,16 @@ public class Ring extends KindofMisc {
 		
 		Badges.validateAllRingsIdentified();
 	}
-
-	public String gem() {
-		return Messages.get(Ring.class, gem);
-	}
 	
 	@Override
 	public String name() {
-		return isKnown() ? super.name() : Messages.get(this, "unknown_name", gem());
+		return isKnown() ? super.name() : Messages.get(Ring.class, gem);
 	}
 	
 	@Override
 	public String info() {
 
-		String desc = isKnown()? desc() : Messages.get(this, "unknown_desc", gem());
+		String desc = isKnown()? desc() : Messages.get(this, "unknown_desc");
 
 		if (cursed && isEquipped( Dungeon.hero )) {
 			
@@ -163,7 +159,7 @@ public class Ring extends KindofMisc {
 			
 		} else if (cursed && cursedKnown) {
 
-			desc += "\n\n" + Messages.get(Ring.class, "curse_known", name());
+			desc += "\n\n" + Messages.get(Ring.class, "curse_known");
 
 		}
 
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java
index b4d7f5199..fe0ade877 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java
@@ -171,21 +171,17 @@ public abstract class Scroll extends Item {
 		setKnown();
 		return super.identify();
 	}
-
-	public String rune() {
-		return Messages.get(Scroll.class, rune);
-	}
 	
 	@Override
 	public String name() {
-		return isKnown() ? name : Messages.get(this, "unknown_name", rune());
+		return isKnown() ? name : Messages.get(Scroll.class, rune);
 	}
 	
 	@Override
 	public String info() {
 		return isKnown() ?
 			desc() :
-			Messages.get(this, "unknown_desc", rune());
+			Messages.get(this, "unknown_desc");
 	}
 
 	public Integer initials(){
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties
index eabf39a55..bbb617df5 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties
@@ -389,27 +389,26 @@ items.keys.skeletonkey.desc=This key looks serious: its head is shaped like a sk
 
 ###potions
 items.potions.potion.ac_drink=DRINK
-items.potions.potion.turquoise=turquoise
-items.potions.potion.crimson=crimson
-items.potions.potion.azure=azure
-items.potions.potion.jade=jade
-items.potions.potion.golden=golden
-items.potions.potion.magenta=magenta
-items.potions.potion.charcoal=charcoal
-items.potions.potion.ivory=ivory
-items.potions.potion.amber=amber
-items.potions.potion.bistre=bistre
-items.potions.potion.indigo=indigo
-items.potions.potion.silver=silver
-items.potions.potion.unknown_name=%s potion
-items.potions.potion.unknown_desc=This flask contains a swirling %s liquid. Who knows what it will do when drunk or thrown?
+items.potions.potion.turquoise=turquoise potion
+items.potions.potion.crimson=crimson potion
+items.potions.potion.azure=azure potion
+items.potions.potion.jade=jade potion
+items.potions.potion.golden=golden potion
+items.potions.potion.magenta=magenta potion
+items.potions.potion.charcoal=charcoal potion
+items.potions.potion.ivory=ivory potion
+items.potions.potion.amber=amber potion
+items.potions.potion.bistre=bistre potion
+items.potions.potion.indigo=indigo potion
+items.potions.potion.silver=silver potion
+items.potions.potion.unknown_desc=This flask contains a swirling colorful liquid. Who knows what it will do when drunk or thrown?
 items.potions.potion.harmful=Harmful potion!
 items.potions.potion.beneficial=Beneficial potion
 items.potions.potion.yes=Yes, I know what I'm doing
 items.potions.potion.no=No, I changed my mind
 items.potions.potion.sure_drink=Are you sure you want to drink it? In most cases you should throw such potions at your enemies.
 items.potions.potion.sure_throw=Are you sure you want to throw it? In most cases it makes sense to drink it.
-items.potions.potion.shatter=The flask shatters and %s liquid splashes harmlessly
+items.potions.potion.shatter=The flask shatters and the liquid splashes harmlessly.
 
 items.potions.potionofexperience.name=potion of experience
 items.potions.potionofexperience.desc=The storied experiences of multitudes of battles reduced to liquid form, this draught will instantly raise your experience level.
@@ -487,26 +486,24 @@ items.quest.ratskull.desc=A surprisingly large rat skull. It would make a great
 
 
 ###rings
-items.rings.ring.diamond=diamond
-items.rings.ring.opal=opal
-items.rings.ring.garnet=garnet
-items.rings.ring.ruby=ruby
-items.rings.ring.amethyst=amethyst
-items.rings.ring.topaz=topaz
-items.rings.ring.onyx=onyx
-items.rings.ring.tourmaline=tourmaline
-items.rings.ring.emerald=emerald
-items.rings.ring.sapphire=sapphire
-items.rings.ring.quartz=quartz
-items.rings.ring.agate=agate
+items.rings.ring.diamond=diamond ring
+items.rings.ring.opal=opal ring
+items.rings.ring.garnet=garnet ring
+items.rings.ring.ruby=ruby ring
+items.rings.ring.amethyst=amethyst ring
+items.rings.ring.topaz=topaz ring
+items.rings.ring.onyx=onyx ring
+items.rings.ring.tourmaline=tourmaline ring
+items.rings.ring.emerald=emerald ring
+items.rings.ring.sapphire=sapphire ring
+items.rings.ring.quartz=quartz ring
+items.rings.ring.agate=agate ring
 items.rings.ring.cursed=The ring tightens around your finger painfully!
-items.rings.ring.unknown_name=%s ring
-items.rings.ring.unknown_desc=This metal band is adorned with a large %s gem that glitters in the darkness. Who knows what effect it has when worn?
+items.rings.ring.unknown_desc=This metal band is adorned with a large gem that glitters in the darkness. Who knows what effect it has when worn?
 items.rings.ring.known=This is a %s
 items.rings.ring.identify=You are now familiar enough with your ring to identify it. It is a %s.
-items.rings.ring.on_finger=The %s is on your finger.
 items.rings.ring.cursed_worn=Because this ring is cursed, you are powerless to remove it.
-items.rings.ring.curse_known=You can feel a malevolent magic lurking within the %s.
+items.rings.ring.curse_known=You can feel a malevolent magic lurking within this ring.
 
 items.rings.ringofaccuracy.name=ring of accuracy
 items.rings.ringofaccuracy.desc=This ring increases your focus, reducing your enemy's ability to dodge your attacks. A degraded ring will instead make it easier for enemies to evade your attacks.
@@ -547,20 +544,19 @@ items.rings.ringofwealth.desc=It's not clear what this ring does exactly, good l
 
 ###scrolls
 items.scrolls.scroll.ac_read=READ
-items.scrolls.scroll.kaunan=KAUNAN
-items.scrolls.scroll.sowilo=SOWILO
-items.scrolls.scroll.laguz=LAGUZ
-items.scrolls.scroll.yngvi=YNGVI
-items.scrolls.scroll.gyfu=GYFU
-items.scrolls.scroll.raido=RAIDO
-items.scrolls.scroll.isaz=ISAZ
-items.scrolls.scroll.mannaz=MANNAZ
-items.scrolls.scroll.naudiz=NAUDIZ
-items.scrolls.scroll.berkanan=BERKANAN
-items.scrolls.scroll.odal=ODAL
-items.scrolls.scroll.tiwaz=TIWAZ
-items.scrolls.scroll.unknown_name=scroll "%s"
-items.scrolls.scroll.unknown_desc=This parchment is covered with indecipherable writing, and bears a title of rune %s. Who knows what it will do when read aloud?
+items.scrolls.scroll.kaunan=scroll of KAUNAN
+items.scrolls.scroll.sowilo=scroll of SOWILO
+items.scrolls.scroll.laguz=scroll of LAGUZ
+items.scrolls.scroll.yngvi=scroll of YNGVI
+items.scrolls.scroll.gyfu=scroll of GYFU
+items.scrolls.scroll.raido=scroll of RAIDO
+items.scrolls.scroll.isaz=scroll of ISAZ
+items.scrolls.scroll.mannaz=scroll of MANNAZ
+items.scrolls.scroll.naudiz=scroll of NAUDIZ
+items.scrolls.scroll.berkanan=scroll of BERKANAN
+items.scrolls.scroll.odal=scroll of ODAL
+items.scrolls.scroll.tiwaz=scroll of TIWAZ
+items.scrolls.scroll.unknown_desc=An indecipherable magical rune is written on this parchment. Who knows what it will do when read aloud?
 items.scrolls.scroll.blinded=You can't read a scroll while blinded.
 items.scrolls.scroll.cursed=Your cursed spellbook prevents you from invoking this scroll's magic! A scroll of remove curse might be strong enough to still work though...