src/data/defaults.txt                              |    1 +

 .../kolmafia/request/MoonPhaseRequest.java         |   12 ++++++------

 .../sourceforge/kolmafia/session/MoodManager.java  |    8 ++++++++

 .../sourceforge/kolmafia/swingui/OptionsFrame.java |    1 +

 .../kolmafia/webui/BasementDecorator.java          |    2 +-

 .../kolmafia/webui/StationaryButtonDecorator.java  |    2 +-

 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/data/defaults.txt b/src/data/defaults.txt

index e10a099..b5a0bc8 100644

--- a/src/data/defaults.txt

+++ b/src/data/defaults.txt

@@ -363,6 +363,7 @@ user	louvreGoal	0

 user	louvreLayout

 user	louvreOverride

 user	luckySewerAdventure	stolen accordion

+user	manaBurnIgnoreBuffs	false

 user	manaBurnSummonThreshold	10

 user	manaBurningThreshold	-0.05

 user	mineLayout1

diff --git a/src/net/sourceforge/kolmafia/request/MoonPhaseRequest.java b/src/net/sourceforge/kolmafia/request/MoonPhaseRequest.java

index 092e0ab..6a9da2b 100644

--- a/src/net/sourceforge/kolmafia/request/MoonPhaseRequest.java

+++ b/src/net/sourceforge/kolmafia/request/MoonPhaseRequest.java

@@ -110,7 +110,7 @@ public class MoonPhaseRequest

 		// Mafiatize the function menu

 		StringBuffer functionMenu = new StringBuffer();

-		functionMenu.append( "<select name=\"loc\" onchange=\"goloc();\">" );

+		functionMenu.append( "<select class=tiny name=\"loc\" onchange=\"goloc();\">" );

 		functionMenu.append( "<option value=\"nothing\">- Select -</option>" );

 		for ( int i = 0; i < KoLConstants.FUNCTION_MENU.length; ++i )

@@ -136,7 +136,7 @@ public class MoonPhaseRequest

 		// Mafiatize the goto menu

 		StringBuffer gotoMenu = new StringBuffer();

-		gotoMenu.append( "<select name=location onchange='move();'>" );

+		gotoMenu.append( "<select class=tiny name=location onchange='move();'>" );

 		gotoMenu.append( "<option value=\"nothing\">- Select -</option>" );

 		for ( int i = 0; i < KoLConstants.GOTO_MENU.length; ++i )

@@ -182,8 +182,8 @@ public class MoonPhaseRequest

 		if ( Preferences.getBoolean( "relayAddsQuickScripts" ) )

 		{

 			StringBuffer selectBuffer = new StringBuffer();

-			selectBuffer.append( "<td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><form name=\"gcli\">" );

-			selectBuffer.append( "<select id=\"scriptbar\">" );

+			selectBuffer.append( "<td class=tiny>&nbsp;&nbsp;&nbsp;&nbsp;</td><td class=small><form name=\"gcli\">" );

+			selectBuffer.append( "<select class=tiny id=\"scriptbar\">" );

 			String[] scriptList = Preferences.getString( "scriptList" ).split( " \\| " );

 			for ( int i = 0; i < scriptList.length; ++i )

@@ -197,8 +197,8 @@ public class MoonPhaseRequest

 				selectBuffer.append( "</option>" );

 			}

-			selectBuffer.append( "</select></td><td>&nbsp;</td><td>" );

-			selectBuffer.append( "<input type=\"button\" class=\"button\" value=\"exec\" onClick=\"" );

+			selectBuffer.append( "</select></td><td class=tiny>&nbsp;</td><td class=small>" );

+			selectBuffer.append( "<input type=\"button\" class=\"tinybutton\" value=\"exec\" onClick=\"" );

 			selectBuffer.append( "var script = document.getElementById( 'scriptbar' ).value; " );

 			selectBuffer.append( "parent.charpane.location = '/KoLmafia/sideCommand?cmd=' + escape(script) + '&pwd=" );

diff --git a/src/net/sourceforge/kolmafia/session/MoodManager.java b/src/net/sourceforge/kolmafia/session/MoodManager.java

index 682f707..5977efc 100644

--- a/src/net/sourceforge/kolmafia/session/MoodManager.java

+++ b/src/net/sourceforge/kolmafia/session/MoodManager.java

@@ -504,6 +504,7 @@ public abstract class MoodManager

 		// Pre-calculate possible breakfast/libram skill

 		boolean onlyMood = !Preferences.getBoolean( "allowNonMoodBurning" );

+		boolean ignoreBuffs = KoLCharacter.canInteract() && Preferences.getBoolean( "manaBurnIgnoreBuffs" );

 		int summonThreshold = Preferences.getInteger( "manaBurnSummonThreshold" );

 		String breakfast = onlyMood ? null : MoodManager.considerBreakfastSkill( minimum );

 		int durationLimit = KoLCharacter.getAdventuresLeft() + 1000;

@@ -528,6 +529,13 @@ public abstract class MoodManager

 			int skillId = SkillDatabase.getSkillId( skillName );

+			// Only cast self-only buffs when out of Ronin

+

+			if ( ignoreBuffs && SkillDatabase.getSkillType( skillId ) == SkillDatabase.BUFF)

+			{

+				continue;

+			}

+

 			// Never recast ode when doing MP burning, because

 			// there's no need for it to have a long duration.

diff --git a/src/net/sourceforge/kolmafia/swingui/OptionsFrame.java b/src/net/sourceforge/kolmafia/swingui/OptionsFrame.java

index c292906..b1513bf 100644

--- a/src/net/sourceforge/kolmafia/swingui/OptionsFrame.java

+++ b/src/net/sourceforge/kolmafia/swingui/OptionsFrame.java

@@ -332,6 +332,7 @@ public class OptionsFrame

 			{ "removeMalignantEffects", "Auto-remove malignant status effects" },

 			{ "switchEquipmentForBuffs", "Allow equipment changing when casting buffs" },

 			{ "allowNonMoodBurning", "Cast buffs not defined in moods during buff balancing" },

+			{ "manaBurnIgnoreBuffs", "Only cast self-only buffs when out of Ronin" },

 			{},

diff --git a/src/net/sourceforge/kolmafia/webui/BasementDecorator.java b/src/net/sourceforge/kolmafia/webui/BasementDecorator.java

index 7f6f9b2..7f31268 100644

--- a/src/net/sourceforge/kolmafia/webui/BasementDecorator.java

+++ b/src/net/sourceforge/kolmafia/webui/BasementDecorator.java

@@ -217,7 +217,7 @@ public class BasementDecorator

 			changes.append( "<tr><td><select onchange=\"" );

 			changes.append( computeFunction );

-			changes.append( "\" id=\"potion\" style=\"width: auto\" multiple size=5>" );

+			changes.append( "\" id=\"potion\" style=\"width: auto\" multiple size=10>" );

 			if ( KoLCharacter.getCurrentHP() < KoLCharacter.getMaximumHP() )

 			{

diff --git a/src/net/sourceforge/kolmafia/webui/StationaryButtonDecorator.java b/src/net/sourceforge/kolmafia/webui/StationaryButtonDecorator.java

index 1309c72..9e872de 100644

--- a/src/net/sourceforge/kolmafia/webui/StationaryButtonDecorator.java

+++ b/src/net/sourceforge/kolmafia/webui/StationaryButtonDecorator.java

@@ -192,7 +192,7 @@ public class StationaryButtonDecorator

 		boolean forceFocus = action.equals( "attack" );

 		String name = StationaryButtonDecorator.getActionName( action );

-		buffer.append( "<input type=\"button\" onClick=\"document.location.href='" );

+		buffer.append( "<input class=button type=\"button\" onClick=\"document.location.href='" );

 		if ( urlString.startsWith( "choice.php" ) && response.indexOf( "choice.php" ) != -1 )

 		{