diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs
index 7aa9cd58..94d863cc 100644
--- a/PROMS/Volian.Controls.Library/StepRTB.cs
+++ b/PROMS/Volian.Controls.Library/StepRTB.cs
@@ -280,8 +280,9 @@ namespace Volian.Controls.Library
 						font = new Font(value, 10, FontStyle.Italic);
 					using (StepRTB srtb = new StepRTB())
 					{
-						if (srtb.FontIsFixed(font)) MySymbolFontName = "FreeMono"; // FreeMono is now used for the edit screen only.  VESymbFix and Consolas are used for printing
-						else MySymbolFontName = "Arial Unicode MS";
+                        if (srtb.FontIsFixed(font)) MySymbolFontName = "FreeMono"; // FreeMono is now used for the edit screen only.  VESymbFix and Consolas are used for printing
+                        //else MySymbolFontName = Volian.Base.Library.vlnFont.ProportionalSymbolFont; // "FreeSerif";
+                        else MySymbolFontName = "Arial Unicode MS";
 					}
 				}
 				else
@@ -927,6 +928,19 @@ namespace Volian.Controls.Library
 				HandleSelectionChange();
 				// save our context menu to add to the spell checker's context menu
 				ThisContextMenuStrip = this.ContextMenuStrip;
+                // B2017-231 force the right mouse click to bring up word list if on a mis-spelled word
+				if (e.Button == System.Windows.Forms.MouseButtons.Right && Parent is RTBItem) // right mouse click and we are not on a table cell
+				{
+					if (ThisContextMenuStrip != null)
+					{
+						(Parent as RTBItem).MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ClearContextMenu();
+						this.ContextMenuStrip.Show(this, e.X, e.Y);
+					}
+					else
+					{
+						(Parent as RTBItem).MyStepPanel.MyStepTabPanel.MyStepTabRibbon.OpenContextMenu(this.PointToScreen(e.Location), this);
+					}
+				}
 			}
 		}
 		#endregion
@@ -1235,9 +1249,10 @@ namespace Volian.Controls.Library
 				sbend.Insert(0, @"\i0");
 			}
 			selectedRtfSB.Append(@"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset2 " + myFont.FontFamily.Name + @";}"); //}\f0\fs" + this.Font.SizeInPoints * 2 + @" " + myDisplayTextElement.Text + @"}}";
-			if (!isFixed)
-				selectedRtfSB.Append(@"{\f1\fnil\fcharset0 Arial Unicode MS;}}{\colortbl ;\red255\green0\blue0;}");
-			else
+            if (!isFixed)
+                //selectedRtfSB.Append(@"{\f1\fnil\fcharset0 " + Volian.Base.Library.vlnFont.ProportionalSymbolFont + @";}}{\colortbl ;\red255\green0\blue0;}");
+                selectedRtfSB.Append(@"{\f1\fnil\fcharset0 Arial Unicode MS;}}{\colortbl ;\red255\green0\blue0;}");
+            else
 				selectedRtfSB.Append(@"{\f1\fnil\fcharset0 FreeMono;}}{\colortbl ;\red255\green0\blue0;}");  // FreeMono is now used for the edit screen only.  VESymbFix and Consolas are used for printing
 			selectedRtfSB.Append("\r\n");
 			// use styles to construct rtf commands to insert into next line (where \b, etc is)
@@ -1314,9 +1329,10 @@ namespace Volian.Controls.Library
 			{
 				StringBuilder sb = new StringBuilder();
 				sb.Append(@"{\fonttbl{\f0\fnil\fcharset2 " + this.Font.FontFamily.Name + @";}");
-				if (!FontIsFixed(this.Font))
-					sb.Append(@"{\f1\fnil\fcharset0 Arial Unicode MS;}}");
-				else
+                if (!FontIsFixed(this.Font))
+                    //sb.Append(@"{\f1\fnil\fcharset0 " + Volian.Base.Library.vlnFont.ProportionalSymbolFont + @";}}");
+                    sb.Append(@"{\f1\fnil\fcharset0 Arial Unicode MS;}}");
+                else
 					sb.Append(@"{\f1\fnil\fcharset0 FreeMono;}}"); // FreeMono is now used for the edit screen only.  VESymbFix and Consolas are used for printing
 				return sb.ToString();
 			}