r13996 by cbradney - More prefs variables renamed for ItemToolPrefs - colors, polygons etc

scribus-commit scribus-commit at lists.scribus.net
Thu Sep 17 23:16:39 CEST 2009


Revision: 13996
Author: cbradney
Date: 2009-09-17T21:13:47.760824Z
Commit message: More prefs variables renamed for ItemToolPrefs - colors, polygons etc

Changeset: 
M  /trunk/Scribus/scribus/ui/charselect.cpp
M  /trunk/Scribus/scribus/scribusXml.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
M  /trunk/Scribus/scribus/ui/reformdoc.cpp
M  /trunk/Scribus/scribus/scribusdoc.cpp
M  /trunk/Scribus/scribus/plugins/wmfimplugin/wmfimport.cpp
M  /trunk/Scribus/scribus/plugins/aiimplugin/importai.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
M  /trunk/Scribus/scribus/fileloader.cpp
M  /trunk/Scribus/scribus/scpreview.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
M  /trunk/Scribus/scribus/scribus.cpp
M  /trunk/Scribus/scribus/prefsmanager.cpp
M  /trunk/Scribus/scribus/plugins/xfigimplugin/importxfig.cpp
M  /trunk/Scribus/scribus/plugins/psimport/importps.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
M  /trunk/Scribus/scribus/plugins/cvgimplugin/importcvg.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/oodraw/oodrawimp.cpp
M  /trunk/Scribus/scribus/ui/modetoolbar.cpp
M  /trunk/Scribus/scribus/ui/smlinestyle.cpp
M  /trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
M  /trunk/Scribus/scribus/pageitem.cpp
M  /trunk/Scribus/scribus/ui/prefs.cpp
M  /trunk/Scribus/scribus/plugins/pctimplugin/importpct.cpp
M  /trunk/Scribus/scribus/canvasmode_drawbezier.cpp
M  /trunk/Scribus/scribus/sampleitem.cpp
M  /trunk/Scribus/scribus/plugins/fontpreview/fontpreview.cpp
M  /trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
M  /trunk/Scribus/scribus/canvasmode_create.cpp
M  /trunk/Scribus/scribus/plugins/svgimplugin/svgplugin.cpp
M  /trunk/Scribus/scribus/ui/tabtools.cpp
M  /trunk/Scribus/scribus/ui/storyeditor.cpp
M  /trunk/Scribus/scribus/canvasmode_legacy.cpp
M  /trunk/Scribus/scribus/scribusview.cpp
M  /trunk/Scribus/scribus/ui/polygonwidget.cpp
M  /trunk/Scribus/scribus/pageitem_textframe.cpp
M  /trunk/Scribus/scribus/plugins/wpgimplugin/importwpg.cpp
M  /trunk/Scribus/scribus/prefsstructs.h
M  /trunk/Scribus/scribus/ui/hruler.cpp
M  /trunk/Scribus/scribus/scfonts.cpp
M  /trunk/Scribus/scribus/stencilreader.cpp
M  /trunk/Scribus/scribus/ui/missing.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp

Diffs:
Index: scribus/fileloader.cpp
===================================================================
--- scribus/fileloader.cpp	(revision 13995)
+++ scribus/fileloader.cpp	(revision 13996)
@@ -229,8 +229,8 @@
 			if (!currDoc->UsedFonts.contains(itfsu.data()))
 			{
 //				QFont fo = prefsManager->appPrefs.AvailFonts[itfsu.data()]->Font;
-//				fo.setPointSize(qRound(ScMW->doc->toolSettings.defSize / 10.0));
-				currDoc->AddFont(itfsu.data(), qRound(currDoc->toolSettings.defSize / 10.0));
+//				fo.setPointSize(qRound(ScMW->doc->toolSettings.textSize / 10.0));
+				currDoc->AddFont(itfsu.data(), qRound(currDoc->toolSettings.textSize / 10.0));
 			}
 		}
 		if (prefsManager->appPrefs.askBeforeSubstituite)
@@ -260,12 +260,12 @@
 	currDoc->guidesSettings.colBordersShown = prefsManager->appPrefs.guidesPrefs.colBordersShown;
 	currDoc->guidesSettings.baselineGridShown = prefsManager->appPrefs.guidesPrefs.baselineGridShown;
 	currDoc->guidesSettings.linkShown = prefsManager->appPrefs.guidesPrefs.linkShown;
-	currDoc->itemToolPrefs.polyC = prefsManager->appPrefs.itemToolPrefs.polyC;
-	currDoc->itemToolPrefs.polyF = prefsManager->appPrefs.itemToolPrefs.polyF;
-	currDoc->itemToolPrefs.polyR = prefsManager->appPrefs.itemToolPrefs.polyR;
+	currDoc->itemToolPrefs.polyCorners = prefsManager->appPrefs.itemToolPrefs.polyCorners;
+	currDoc->itemToolPrefs.polyFactorValue2 = prefsManager->appPrefs.itemToolPrefs.polyFactorValue2;
+	currDoc->itemToolPrefs.polyRotation = prefsManager->appPrefs.itemToolPrefs.polyRotation;
 	currDoc->itemToolPrefs.polyCurvature = prefsManager->appPrefs.itemToolPrefs.polyCurvature;
-	currDoc->itemToolPrefs.polyFd = prefsManager->appPrefs.itemToolPrefs.polyFd;
-	currDoc->itemToolPrefs.polyS = prefsManager->appPrefs.itemToolPrefs.polyS;
+	currDoc->itemToolPrefs.polyFactorValue = prefsManager->appPrefs.itemToolPrefs.polyFactorValue;
+	currDoc->itemToolPrefs.polyUseFactor = prefsManager->appPrefs.itemToolPrefs.polyUseFactor;
 	currDoc->AutoSave = prefsManager->appPrefs.docSetupPrefs.AutoSave;
 	currDoc->AutoSaveTime = prefsManager->appPrefs.docSetupPrefs.AutoSaveTime;
 	ReplacedFonts = currDoc->AllFonts->getSubstitutions();
@@ -377,7 +377,7 @@
 	vg.setAlignment(static_cast<ParagraphStyle::AlignmentType>(pg.attribute("ALIGN").toInt()));
 	vg.setGapBefore(ScCLocale::toDoubleC(pg.attribute("VOR"), 0.0));
 	vg.setGapAfter(ScCLocale::toDoubleC(pg.attribute("NACH"), 0.0));
-	QString tmpf = pg.attribute("FONT", currDoc->itemToolPrefs.defFont);
+	QString tmpf = pg.attribute("FONT", currDoc->itemToolPrefs.textFont);
 	currDoc->AllFonts->findFont(tmpf, currDoc);
 		vg.charStyle().setFont((*currDoc->AllFonts)[tmpf]);
 		vg.charStyle().setFontSize(qRound(ScCLocale::toDoubleC(pg.attribute("FONTSIZE"), 12.0) * 10.0));
@@ -385,9 +385,9 @@
 		vg.setDropCapLines(pg.attribute("DROPLIN", "2").toInt());
 		vg.setDropCapOffset(ScCLocale::toDoubleC(pg.attribute("DROPDIST"), 0.0));
 		vg.charStyle().setFeatures(static_cast<StyleFlag>(pg.attribute("EFFECT", "0").toInt()).featureList());
-		vg.charStyle().setFillColor(pg.attribute("FCOLOR", currDoc->itemToolPrefs.dBrush));
+		vg.charStyle().setFillColor(pg.attribute("FCOLOR", currDoc->itemToolPrefs.shapeBrush));
 		vg.charStyle().setFillShade(pg.attribute("FSHADE", "100").toInt());
-		vg.charStyle().setStrokeColor(pg.attribute("SCOLOR", currDoc->itemToolPrefs.dPen));
+		vg.charStyle().setStrokeColor(pg.attribute("SCOLOR", currDoc->itemToolPrefs.shapePen));
 		vg.charStyle().setStrokeShade(pg.attribute("SSHADE", "100").toInt());
 		if (static_cast<bool>(pg.attribute("BASE", "0").toInt()))
 			vg.setLineSpacingMode(ParagraphStyle::BaselineGridLineSpacing);
@@ -575,8 +575,8 @@
 			if (!currDoc->UsedFonts.contains(itfsu.data()))
 			{
 //				QFont fo = prefsManager->appPrefs.AvailFonts[itfsu.data()]->Font;
-//				fo.setPointSize(qRound(ScMW->doc->toolSettings.defSize / 10.0));
-				currDoc->AddFont(itfsu.data(), qRound(currDoc->toolSettings.defSize / 10.0));
+//				fo.setPointSize(qRound(ScMW->doc->toolSettings.textSize / 10.0));
+				currDoc->AddFont(itfsu.data(), qRound(currDoc->toolSettings.textSize / 10.0));
 			}
 		}
 		if (prefsManager->appPrefs.askBeforeSubstituite)
Index: scribus/canvasmode_drawfreehand.cpp
===================================================================
--- scribus/canvasmode_drawfreehand.cpp	(revision 13995)
+++ scribus/canvasmode_drawfreehand.cpp	(revision 13996)
@@ -318,7 +318,7 @@
 		if (RecordP.size() > 1)
 		{
 			UndoTransaction createTransaction(UndoManager::instance()->beginTransaction());
-			uint z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, Mxp, Myp, 1, 1, m_doc->itemToolPrefs.dWidthLine, CommonStrings::None, m_doc->itemToolPrefs.dPenLine, true);
+			uint z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, Mxp, Myp, 1, 1, m_doc->itemToolPrefs.lineWidth, CommonStrings::None, m_doc->itemToolPrefs.lineColor, true);
 			currItem = m_doc->Items->at(z);
 			currItem->PoLine.resize(0);
 			if (m->modifiers() & Qt::ControlModifier)
Index: scribus/canvasmode_create.cpp
===================================================================
--- scribus/canvasmode_create.cpp	(revision 13995)
+++ scribus/canvasmode_create.cpp	(revision 13996)
@@ -104,7 +104,7 @@
 		}
 		else if (createObjectMode == modeDrawRegularPolygon)
 		{
-			QPainterPath path = RegularPolygon(localRect.width(), localRect.height(), m_doc->itemToolPrefs.polyC, m_doc->itemToolPrefs.polyS, m_doc->itemToolPrefs.polyF, m_doc->itemToolPrefs.polyR, m_doc->itemToolPrefs.polyCurvature);
+			QPainterPath path = RegularPolygon(localRect.width(), localRect.height(), m_doc->itemToolPrefs.polyCorners, m_doc->itemToolPrefs.polyUseFactor, m_doc->itemToolPrefs.polyFactorValue2, m_doc->itemToolPrefs.polyRotation, m_doc->itemToolPrefs.polyCurvature);
 			p->translate(localRect.left(), localRect.top());
 			p->drawPath(path);
 		}
@@ -461,8 +461,8 @@
 void CreateMode::SetupDrawNoResize(int nr)
 {
 	PageItem* currItem = m_doc->Items->at(nr);
-	//	currItem->setFont(Doc->toolSettings.defFont);
-	//	currItem->setFontSize(Doc->toolSettings.defSize);
+	//	currItem->setFont(Doc->toolSettings.textFont);
+	//	currItem->setFontSize(Doc->toolSettings.textSize);
 	m_doc->m_Selection->delaySignalsOn();
 	m_doc->m_Selection->clear();
 	m_doc->m_Selection->addItem(currItem);
@@ -586,33 +586,33 @@
 		case 0:
 			if (modifiers == Qt::ShiftModifier)
 			{
-				z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrush, m_doc->itemToolPrefs.dPen, true);
+				z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, true);
 				m_doc->Items->at(z)->FrameType = 0;
 			}
 			else
 			{
 				m_doc->ApplyGuides(&Rxp, &Ryp);
-				z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrush, m_doc->itemToolPrefs.dPen, true);
+				z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, true);
 				m_doc->Items->at(z)->FrameType = 0;
 			}
 			break;
 		case 1:
 			if (modifiers == Qt::ShiftModifier)
 			{
-				z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrush, m_doc->itemToolPrefs.dPen, true);
+				z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, true);
 				m_doc->Items->at(z)->FrameType = 1;
 			}
 			else
 			{
 				m_doc->ApplyGuides(&Rxp, &Ryp);
-				z = m_doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrush, m_doc->itemToolPrefs.dPen, true);
+				z = m_doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, true);
 				m_doc->Items->at(z)->FrameType = 1;
 			}
 			break;
 		default:
 			if (modifiers == Qt::ShiftModifier)
 			{
-				z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrush, m_doc->itemToolPrefs.dPen, true);
+				z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, true);
 				m_doc->Items->at(z)->SetFrameShape(m_doc->ValCount, m_doc->ShapeValues);
 				m_doc->AdjustItemSize(m_doc->Items->at(z));
 				m_doc->setRedrawBounding(m_doc->Items->at(z));
@@ -621,7 +621,7 @@
 			else
 			{
 				m_doc->ApplyGuides(&Rxp, &Ryp);
-				z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrush, m_doc->itemToolPrefs.dPen, true);
+				z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, true);
 				m_doc->Items->at(z)->SetFrameShape(m_doc->ValCount, m_doc->ShapeValues);
 				m_doc->AdjustItemSize(m_doc->Items->at(z));
 				m_doc->setRedrawBounding(m_doc->Items->at(z));
@@ -638,54 +638,54 @@
 		if (rot < 0.0) 
 			rot += 360;
 		len = qMax(0.01, distance(Rxpd, Rypd));
-		z = m_doc->itemAdd(PageItem::Line, PageItem::Unspecified, Rxp, Ryp, len, 1, m_doc->itemToolPrefs.dWidthLine, CommonStrings::None, m_doc->itemToolPrefs.dPenLine, true);
+		z = m_doc->itemAdd(PageItem::Line, PageItem::Unspecified, Rxp, Ryp, len, 1, m_doc->itemToolPrefs.lineWidth, CommonStrings::None, m_doc->itemToolPrefs.lineColor, true);
 		m_doc->Items->at(z)->setRotation(rot);
 		m_doc->Items->at(z)->setRedrawBounding();
 		break;
 	case modeDrawLatex:
 		if (modifiers == Qt::ShiftModifier)
 		{
-			z = m_doc->itemAddArea(PageItem::LatexFrame, PageItem::Unspecified, Rxp, Ryp, 1, m_doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+			z = m_doc->itemAddArea(PageItem::LatexFrame, PageItem::Unspecified, Rxp, Ryp, 1, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 		}
 		else
 		{
 			m_doc->ApplyGuides(&Rxp, &Ryp);
-			z = m_doc->itemAdd(PageItem::LatexFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+			z = m_doc->itemAdd(PageItem::LatexFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 		}
 		break;
 	case modeDrawImage:
 		if (modifiers == Qt::ShiftModifier)
 		{
-			z = m_doc->itemAddArea(PageItem::ImageFrame, PageItem::Unspecified, Rxp, Ryp, 1, m_doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+			z = m_doc->itemAddArea(PageItem::ImageFrame, PageItem::Unspecified, Rxp, Ryp, 1, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 		}
 		else
 		{
 			m_doc->ApplyGuides(&Rxp, &Ryp);
-			z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+			z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 		}
 		break;
 	case modeDrawText:
 		if (modifiers == Qt::ShiftModifier)
 		{
-			z = m_doc->itemAddArea(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.dWidth, CommonStrings::None, m_doc->itemToolPrefs.dPenText, true);
+			z = m_doc->itemAddArea(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.textFont, true);
 		}	
 		else
 		{
 			m_doc->ApplyGuides(&Rxp, &Ryp);
-			z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.dWidth, CommonStrings::None, m_doc->itemToolPrefs.dPenText, true);
+			z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.textFont, true);
 		}
 		break;
 	case modeDrawRegularPolygon:
 		{
 			if (modifiers == Qt::ShiftModifier)
-				z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrush, m_doc->itemToolPrefs.dPen, true);
+				z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.lineColor, true);
 			else
 			{
 				m_doc->ApplyGuides(&Rxp, &Ryp);
-				z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrush, m_doc->itemToolPrefs.dPen, true);
+				z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.lineColor, true);
 			}
 			currItem = m_doc->Items->at(z);
-			QPainterPath path = RegularPolygon(currItem->width(), currItem->height(), m_doc->itemToolPrefs.polyC, m_doc->itemToolPrefs.polyS, m_doc->itemToolPrefs.polyF, m_doc->itemToolPrefs.polyR, m_doc->itemToolPrefs.polyCurvature);
+			QPainterPath path = RegularPolygon(currItem->width(), currItem->height(), m_doc->itemToolPrefs.polyCorners, m_doc->itemToolPrefs.polyUseFactor, m_doc->itemToolPrefs.polyFactorValue2, m_doc->itemToolPrefs.polyRotation, m_doc->itemToolPrefs.polyCurvature);
 			currItem->PoLine.fromQPainterPath(path);
 			m_doc->AdjustItemSize(currItem);
 			currItem->Clip = FlattenPath(currItem->PoLine, currItem->Segments);
@@ -718,7 +718,7 @@
 	case modeInsertPDFTextAnnotation:
 	case modeInsertPDFLinkAnnotation:
 		m_doc->ApplyGuides(&Rxp, &Ryp);
-		z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.dWidth, CommonStrings::None, m_doc->itemToolPrefs.dPenText, true);
+		z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, true);
 		currItem = m_doc->Items->at(z);
 		currItem->setIsAnnotation(true);
 		currItem->AutoName = false;
@@ -819,7 +819,7 @@
 			{
 				for (int cc = 0; cc < Cols; ++cc)
 				{
-					z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Tx + offX, Ty + offY, deltaX, deltaY, m_doc->itemToolPrefs.dWidth, CommonStrings::None, m_doc->itemToolPrefs.dPenText, true);
+					z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Tx + offX, Ty + offY, deltaX, deltaY, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, true);
 					currItem = m_doc->Items->at(z);
 					currItem->isTableItem = true;
 					currItem->setTextFlowMode(PageItem::TextFlowUsesBoundingBox);
@@ -865,12 +865,12 @@
 	case modeInsertPDF3DAnnotation:
 		if (modifiers == Qt::ShiftModifier)
 		{
-			z = m_doc->itemAddArea(PageItem::OSGFrame, PageItem::Unspecified, Rxp, Ryp, 1, m_doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+			z = m_doc->itemAddArea(PageItem::OSGFrame, PageItem::Unspecified, Rxp, Ryp, 1, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 		}
 		else
 		{
 			m_doc->ApplyGuides(&Rxp, &Ryp);
-			z = m_doc->itemAdd(PageItem::OSGFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+			z = m_doc->itemAdd(PageItem::OSGFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 		}
 		currItem = m_doc->Items->at(z);
 		currItem->setIsAnnotation(true);
Index: scribus/canvasmode_legacy.cpp
===================================================================
--- scribus/canvasmode_legacy.cpp	(revision 13995)
+++ scribus/canvasmode_legacy.cpp	(revision 13996)
@@ -1587,14 +1587,14 @@
 			case 0:
 				if (m->modifiers() == Qt::ShiftModifier)
 				{
-					z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrush, m_doc->itemToolPrefs.dPen, !m_canvas->m_viewMode.m_MouseButtonPressed);
+					z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, !m_canvas->m_viewMode.m_MouseButtonPressed);
 					m_doc->Items->at(z)->FrameType = 0;
 					SetupDrawNoResize(z);
 				}
 				else
 				{
 					m_doc->ApplyGuides(&Rxp, &Ryp);
-					z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrush, m_doc->itemToolPrefs.dPen, !m_canvas->m_viewMode.m_MouseButtonPressed);
+					z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, !m_canvas->m_viewMode.m_MouseButtonPressed);
 					m_doc->Items->at(z)->FrameType = 0;
 					SetupDraw(z);
 				}
@@ -1602,14 +1602,14 @@
 			case 1:
 				if (m->modifiers() == Qt::ShiftModifier)
 				{
-					z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrush, m_doc->itemToolPrefs.dPen, !m_canvas->m_viewMode.m_MouseButtonPressed);
+					z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, !m_canvas->m_viewMode.m_MouseButtonPressed);
 					m_doc->Items->at(z)->FrameType = 1;
 					SetupDrawNoResize(z);
 				}
 				else
 				{
 					m_doc->ApplyGuides(&Rxp, &Ryp);
-					z = m_doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrush, m_doc->itemToolPrefs.dPen, !m_canvas->m_viewMode.m_MouseButtonPressed);
+					z = m_doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, !m_canvas->m_viewMode.m_MouseButtonPressed);
 					m_doc->Items->at(z)->FrameType = 1;
 					SetupDraw(z);
 				}
@@ -1617,7 +1617,7 @@
 			default:
 				if (m->modifiers() == Qt::ShiftModifier)
 				{
-					z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrush, m_doc->itemToolPrefs.dPen, !m_canvas->m_viewMode.m_MouseButtonPressed);
+					z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, !m_canvas->m_viewMode.m_MouseButtonPressed);
 					m_doc->Items->at(z)->SetFrameShape(m_doc->ValCount, m_doc->ShapeValues);
 					m_doc->setRedrawBounding(m_doc->Items->at(z));
 					m_doc->Items->at(z)->FrameType = m_doc->SubMode+2;
@@ -1626,7 +1626,7 @@
 				else
 				{
 					m_doc->ApplyGuides(&Rxp, &Ryp);
-					z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrush, m_doc->itemToolPrefs.dPen, !m_canvas->m_viewMode.m_MouseButtonPressed);
+					z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, !m_canvas->m_viewMode.m_MouseButtonPressed);
 					m_doc->Items->at(z)->SetFrameShape(m_doc->ValCount, m_doc->ShapeValues);
 					m_doc->setRedrawBounding(m_doc->Items->at(z));
 					m_doc->Items->at(z)->FrameType = m_doc->SubMode+2;
@@ -1641,13 +1641,13 @@
 			selectPage(m);
 			if (m->modifiers() == Qt::ShiftModifier)
 			{
-				z = m_doc->itemAddArea(PageItem::LatexFrame, PageItem::Unspecified, Rxp, Ryp, 1, m_doc->itemToolPrefs.dBrushPict, CommonStrings::None, !m_canvas->m_viewMode.m_MouseButtonPressed);
+				z = m_doc->itemAddArea(PageItem::LatexFrame, PageItem::Unspecified, Rxp, Ryp, 1, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, !m_canvas->m_viewMode.m_MouseButtonPressed);
 				SetupDrawNoResize(z);
 			}
 			else
 			{
 				m_doc->ApplyGuides(&Rxp, &Ryp);
-				z = m_doc->itemAdd(PageItem::LatexFrame, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrushPict, CommonStrings::None, !m_canvas->m_viewMode.m_MouseButtonPressed);
+				z = m_doc->itemAdd(PageItem::LatexFrame, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, !m_canvas->m_viewMode.m_MouseButtonPressed);
 				SetupDraw(z);
 			}
 			break;
@@ -1657,13 +1657,13 @@
 			selectPage(m);
 			if (m->modifiers() == Qt::ShiftModifier)
 			{
-				z = m_doc->itemAddArea(PageItem::ImageFrame, PageItem::Unspecified, Rxp, Ryp, 1, m_doc->itemToolPrefs.dBrushPict, CommonStrings::None, !m_canvas->m_viewMode.m_MouseButtonPressed);
+				z = m_doc->itemAddArea(PageItem::ImageFrame, PageItem::Unspecified, Rxp, Ryp, 1, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, !m_canvas->m_viewMode.m_MouseButtonPressed);
 				SetupDrawNoResize(z);
 			}
 			else
 			{
 				m_doc->ApplyGuides(&Rxp, &Ryp);
-				z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrushPict, CommonStrings::None, !m_canvas->m_viewMode.m_MouseButtonPressed);
+				z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, !m_canvas->m_viewMode.m_MouseButtonPressed);
 				SetupDraw(z);
 			}
 			break;
@@ -1673,13 +1673,13 @@
 			selectPage(m);
 			if (m->modifiers() == Qt::ShiftModifier)
 			{
-				z = m_doc->itemAddArea(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.dWidth, CommonStrings::None, m_doc->itemToolPrefs.dPenText, !m_canvas->m_viewMode.m_MouseButtonPressed);
+				z = m_doc->itemAddArea(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
 				SetupDrawNoResize(z);
 			}	
 			else
 			{
 				m_doc->ApplyGuides(&Rxp, &Ryp);
-				z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.dWidth, CommonStrings::None, m_doc->itemToolPrefs.dPenText, !m_canvas->m_viewMode.m_MouseButtonPressed);
+				z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
 				SetupDraw(z);
 			}
 			break;
@@ -1851,7 +1851,7 @@
 				break;
 			selectPage(m);
 			m_doc->ApplyGuides(&Rxp, &Ryp);
-			z = m_doc->itemAdd(PageItem::Line, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, Rypd, m_doc->itemToolPrefs.dWidthLine, CommonStrings::None, m_doc->itemToolPrefs.dPenLine, !m_canvas->m_viewMode.m_MouseButtonPressed);
+			z = m_doc->itemAdd(PageItem::Line, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, Rypd, m_doc->itemToolPrefs.lineWidth, CommonStrings::None, m_doc->itemToolPrefs.lineColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
 			currItem = m_doc->Items->at(z);
 			qApp->changeOverrideCursor(QCursor(Qt::SizeFDiagCursor));
 			m_doc->m_Selection->delaySignalsOn();
@@ -2004,14 +2004,14 @@
 					break;
 				selectPage(m);
 				if (m->modifiers() == Qt::ShiftModifier)
-					z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrush, m_doc->itemToolPrefs.dPen, !m_canvas->m_viewMode.m_MouseButtonPressed);
+					z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, !m_canvas->m_viewMode.m_MouseButtonPressed);
 				else
 				{
 					m_doc->ApplyGuides(&Rxp, &Ryp);
-					z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dBrush, m_doc->itemToolPrefs.dPen, !m_canvas->m_viewMode.m_MouseButtonPressed);
+					z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, !m_canvas->m_viewMode.m_MouseButtonPressed);
 				}
 				currItem = m_doc->Items->at(z);
-				QPainterPath path = RegularPolygon(currItem->width(), currItem->height(), m_doc->itemToolPrefs.polyC, m_doc->itemToolPrefs.polyS, m_doc->itemToolPrefs.polyF, m_doc->itemToolPrefs.polyR, m_doc->itemToolPrefs.polyCurvature);
+				QPainterPath path = RegularPolygon(currItem->width(), currItem->height(), m_doc->itemToolPrefs.polyCorners, m_doc->itemToolPrefs.polyUseFactor, m_doc->itemToolPrefs.polyFactorValue2, m_doc->itemToolPrefs.polyRotation, m_doc->itemToolPrefs.polyCurvature);
 				currItem->PoLine.fromQPainterPath(path);
 				currItem->Clip = FlattenPath(currItem->PoLine, currItem->Segments);
 				qApp->changeOverrideCursor(QCursor(Qt::SizeFDiagCursor));
@@ -2043,7 +2043,7 @@
 			if (FirstPoly)
 			{
 				selectPage(m);
-				z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.dWidthLine, CommonStrings::None, m_doc->itemToolPrefs.dPenLine, !m_canvas->m_viewMode.m_MouseButtonPressed);
+				z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.lineWidth, CommonStrings::None, m_doc->itemToolPrefs.lineColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
 				currItem = m_doc->Items->at(z);
 				m_doc->m_Selection->clear();
 				m_doc->m_Selection->addItem(currItem);
@@ -2082,7 +2082,7 @@
 				break;
 			selectPage(m);
 			m_doc->ApplyGuides(&Rxp, &Ryp);
-			z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.dWidth, CommonStrings::None, m_doc->itemToolPrefs.dPenText, !m_canvas->m_viewMode.m_MouseButtonPressed);
+			z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
 			currItem = m_doc->Items->at(z);
 			currItem->setIsAnnotation(true);
 			currItem->AutoName = false;
@@ -2647,8 +2647,8 @@
 			{
 				for (int cc = 0; cc < Cols; ++cc)
 				{
-					//z = PaintText(Tx + offX, Ty + offY, deltaX, deltaY, m_doc->itemToolPrefs.dWidth, m_doc->itemToolPrefs.dPenText);
-					z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Tx + offX, Ty + offY, deltaX, deltaY, m_doc->itemToolPrefs.dWidth, CommonStrings::None, m_doc->itemToolPrefs.dPenText, !m_canvas->m_viewMode.m_MouseButtonPressed);
+					//z = PaintText(Tx + offX, Ty + offY, deltaX, deltaY, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.textColor);
+					z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Tx + offX, Ty + offY, deltaX, deltaY, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
 					currItem = m_doc->Items->at(z);
 					currItem->isTableItem = true;
 					//currItem->setTextFlowsAroundFrame(true);
@@ -2707,7 +2707,7 @@
 	{
 		if (RecordP.size() > 1)
 		{
-			uint z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, Mxp, Myp, 1, 1, m_doc->itemToolPrefs.dWidth, CommonStrings::None, m_doc->itemToolPrefs.dPenLine, !m_canvas->m_viewMode.m_MouseButtonPressed);
+			uint z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, Mxp, Myp, 1, 1, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.lineColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
 			currItem = m_doc->Items->at(z);
 			currItem->PoLine.resize(0);
 			currItem->PoLine.addPoint(RecordP.point(0));
@@ -4832,8 +4832,8 @@
 void LegacyMode::SetupDraw(int nr)
 {
 	PageItem* currItem = m_doc->Items->at(nr);
-	//	currItem->setFont(Doc->itemToolPrefs.defFont);
-	//	currItem->setFontSize(Doc->itemToolPrefs.defSize);
+	//	currItem->setFont(Doc->itemToolPrefs.textFont);
+	//	currItem->setFontSize(Doc->itemToolPrefs.textSize);
 	m_canvas->m_viewMode.operItemResizing = true;
 	frameResizeHandle = 1;
 	qApp->changeOverrideCursor(QCursor(Qt::SizeFDiagCursor));
@@ -4854,8 +4854,8 @@
 void LegacyMode::SetupDrawNoResize(int nr)
 {
 	PageItem* currItem = m_doc->Items->at(nr);
-	//	currItem->setFont(Doc->itemToolPrefs.defFont);
-	//	currItem->setFontSize(Doc->itemToolPrefs.defSize);
+	//	currItem->setFont(Doc->itemToolPrefs.textFont);
+	//	currItem->setFontSize(Doc->itemToolPrefs.textSize);
 	m_doc->m_Selection->delaySignalsOn();
 	m_doc->m_Selection->clear();
 	m_doc->m_Selection->addItem(currItem);
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp	(revision 13995)
+++ scribus/scribusdoc.cpp	(revision 13996)
@@ -389,38 +389,38 @@
 	PDF_Options.Intent = CMSSettings.DefaultIntentColors;
 	PDF_Options.Intent2 = CMSSettings.DefaultIntentImages;
 
-	AddFont(prefsData.itemToolPrefs.defFont);//, prefsData.AvailFonts[prefsData.itemToolPrefs.defFont]->Font);
-	itemToolPrefs.defFont = prefsData.itemToolPrefs.defFont;
-	itemToolPrefs.defSize = prefsData.itemToolPrefs.defSize;
-	itemToolPrefs.tabFillChar = prefsData.itemToolPrefs.tabFillChar;
+	AddFont(prefsData.itemToolPrefs.textFont);//, prefsData.AvailFonts[prefsData.itemToolPrefs.textFont]->Font);
+	itemToolPrefs.textFont = prefsData.itemToolPrefs.textFont;
+	itemToolPrefs.textSize = prefsData.itemToolPrefs.textSize;
+	itemToolPrefs.textTabFillChar = prefsData.itemToolPrefs.textTabFillChar;
 	opToolPrefs.dispX = prefsData.opToolPrefs.dispX;
 	opToolPrefs.dispY = prefsData.opToolPrefs.dispY;
 	opToolPrefs.constrain = prefsData.opToolPrefs.constrain;
 
 	PageColors.ensureBlackAndWhite();
-	if (prefsData.itemToolPrefs.dPen != CommonStrings::None)
-		PageColors.insert(prefsData.itemToolPrefs.dPen, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.dPen]);
-	itemToolPrefs.dPen = prefsData.itemToolPrefs.dPen;
-	if (prefsData.itemToolPrefs.dPenLine != CommonStrings::None)
-		PageColors.insert(prefsData.itemToolPrefs.dPenLine, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.dPenLine]);
-	itemToolPrefs.dPenLine = prefsData.itemToolPrefs.dPenLine;
-	if (prefsData.itemToolPrefs.dPenText != CommonStrings::None)
-		PageColors.insert(prefsData.itemToolPrefs.dPenText, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.dPenText]);
-	itemToolPrefs.dPenText = prefsData.itemToolPrefs.dPenText;
-	if (prefsData.itemToolPrefs.dStrokeText != CommonStrings::None)
-		PageColors.insert(prefsData.itemToolPrefs.dStrokeText, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.dStrokeText]);
-	itemToolPrefs.dStrokeText = prefsData.itemToolPrefs.dStrokeText;
-	if (prefsData.itemToolPrefs.dBrush != CommonStrings::None)
-		PageColors.insert(prefsData.itemToolPrefs.dBrush, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.dBrush]);
-	itemToolPrefs.dBrush = prefsData.itemToolPrefs.dBrush;
-	if (prefsData.itemToolPrefs.dBrushPict != CommonStrings::None)
-		PageColors.insert(prefsData.itemToolPrefs.dBrushPict, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.dBrushPict]);
-	itemToolPrefs.dBrushPict = prefsData.itemToolPrefs.dBrushPict;
-	if (prefsData.itemToolPrefs.dTextBackGround != CommonStrings::None)
-		PageColors.insert(prefsData.itemToolPrefs.dTextBackGround, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.dTextBackGround]);
-	itemToolPrefs.dTextBackGround = prefsData.itemToolPrefs.dTextBackGround;
-	if (prefsData.itemToolPrefs.dTextLineColor != CommonStrings::None)
-		PageColors.insert(prefsData.itemToolPrefs.dTextLineColor, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.dTextLineColor]);
+	if (prefsData.itemToolPrefs.shapePen != CommonStrings::None)
+		PageColors.insert(prefsData.itemToolPrefs.shapePen, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.shapePen]);
+	itemToolPrefs.shapePen = prefsData.itemToolPrefs.shapePen;
+	if (prefsData.itemToolPrefs.lineColor != CommonStrings::None)
+		PageColors.insert(prefsData.itemToolPrefs.lineColor, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.lineColor]);
+	itemToolPrefs.lineColor = prefsData.itemToolPrefs.lineColor;
+	if (prefsData.itemToolPrefs.textColor != CommonStrings::None)
+		PageColors.insert(prefsData.itemToolPrefs.textColor, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.textColor]);
+	itemToolPrefs.textColor = prefsData.itemToolPrefs.textColor;
+	if (prefsData.itemToolPrefs.textStrokeColor != CommonStrings::None)
+		PageColors.insert(prefsData.itemToolPrefs.textStrokeColor, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.textStrokeColor]);
+	itemToolPrefs.textStrokeColor = prefsData.itemToolPrefs.textStrokeColor;
+	if (prefsData.itemToolPrefs.shapeBrush != CommonStrings::None)
+		PageColors.insert(prefsData.itemToolPrefs.shapeBrush, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.shapeBrush]);
+	itemToolPrefs.shapeBrush = prefsData.itemToolPrefs.shapeBrush;
+	if (prefsData.itemToolPrefs.imageFillColor != CommonStrings::None)
+		PageColors.insert(prefsData.itemToolPrefs.imageFillColor, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.imageFillColor]);
+	itemToolPrefs.imageFillColor = prefsData.itemToolPrefs.imageFillColor;
+	if (prefsData.itemToolPrefs.textBackground != CommonStrings::None)
+		PageColors.insert(prefsData.itemToolPrefs.textBackground, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.textBackground]);
+	itemToolPrefs.textBackground = prefsData.itemToolPrefs.textBackground;
+	if (prefsData.itemToolPrefs.textLineColor != CommonStrings::None)
+		PageColors.insert(prefsData.itemToolPrefs.textLineColor, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.textLineColor]);
 
 	
 	ParagraphStyle pstyle;
@@ -442,13 +442,13 @@
 	CharStyle cstyle;
 	cstyle.setDefaultStyle(true);
 	cstyle.setName(CommonStrings::DefaultCharacterStyle);
-	cstyle.setFont(prefsData.fontPrefs.AvailFonts[itemToolPrefs.defFont]);
-	cstyle.setFontSize(itemToolPrefs.defSize);
+	cstyle.setFont(prefsData.fontPrefs.AvailFonts[itemToolPrefs.textFont]);
+	cstyle.setFontSize(itemToolPrefs.textSize);
 	cstyle.setFeatures(QStringList(CharStyle::INHERIT));
-	cstyle.setFillColor(itemToolPrefs.dPenText);
-	cstyle.setFillShade(itemToolPrefs.dTextPenShade);
-	cstyle.setStrokeColor(itemToolPrefs.dStrokeText);
-	cstyle.setStrokeShade(itemToolPrefs.dTextStrokeShade);
+	cstyle.setFillColor(itemToolPrefs.textColor);
+	cstyle.setFillShade(itemToolPrefs.textShade);
+	cstyle.setStrokeColor(itemToolPrefs.textStrokeColor);
+	cstyle.setStrokeShade(itemToolPrefs.textStrokeShade);
 	cstyle.setBaselineOffset(0);
 	cstyle.setShadowXOffset(50);
 	cstyle.setShadowYOffset(-50);
@@ -1893,7 +1893,7 @@
 		                     addToPage->Margins.Left+addToPage->xOffset(),
 		                     addToPage->Margins.Top+addToPage->yOffset(), pageWidth-addToPage->Margins.Right-addToPage->Margins.Left,
 		                     pageHeight-addToPage->Margins.Bottom-addToPage->Margins.Top,
-							 1, CommonStrings::None, itemToolPrefs.dPen, true);
+							 1, CommonStrings::None, itemToolPrefs.shapePen, true);
 		Items->at(z)->isAutoText = true;
 		Items->at(z)->Cols = qRound(PageSp);
 		Items->at(z)->ColGap = PageSpa;
@@ -2613,8 +2613,8 @@
 	{
 		found = false;
 		// Tool preferences colors
-		if ((it.key() == itemToolPrefs.dBrush) || (it.key() == itemToolPrefs.dPen) || (it.key() == itemToolPrefs.dBrushPict)
-				|| (it.key() == itemToolPrefs.dPenLine) || (it.key() == itemToolPrefs.dPenText))
+		if ((it.key() == itemToolPrefs.shapeBrush) || (it.key() == itemToolPrefs.shapePen) || (it.key() == itemToolPrefs.imageFillColor)
+				|| (it.key() == itemToolPrefs.lineColor) || (it.key() == itemToolPrefs.textColor))
 		{
 			if (spot)
 			{
@@ -2865,8 +2865,8 @@
 		}
 	}
 	PrefsManager* prefsManager=PrefsManager::instance();
-	AddFont(prefsManager->appPrefs.itemToolPrefs.defFont);//, prefsManager->appPrefs.AvailFonts[prefsManager->appPrefs.itemToolPrefs.defFont]->Font);
-	AddFont(itemToolPrefs.defFont);//, prefsManager->appPrefs.AvailFonts[itemToolPrefs.defFont]->Font);
+	AddFont(prefsManager->appPrefs.itemToolPrefs.textFont);//, prefsManager->appPrefs.AvailFonts[prefsManager->appPrefs.itemToolPrefs.textFont]->Font);
+	AddFont(itemToolPrefs.textFont);//, prefsManager->appPrefs.AvailFonts[itemToolPrefs.textFont]->Font);
 //	qDebug( "Time elapsed: %d ms", t.elapsed() );
 	return Really;
 }
@@ -3545,7 +3545,7 @@
 		//Q_ASSERTs here will warn on creation issues when a coder specifies the frameType incorrectly
 		//for items that do not have/need a frameType for creation.
 		case PageItem::ImageFrame:
-			newItem = new PageItem_ImageFrame(this, x, y, b, h, w, itemToolPrefs.dBrushPict, CommonStrings::None);
+			newItem = new PageItem_ImageFrame(this, x, y, b, h, w, itemToolPrefs.imageFillColor, CommonStrings::None);
 			Q_ASSERT(frameType==PageItem::Rectangle || frameType==PageItem::Unspecified);
 			break;
 		case PageItem::TextFrame:
@@ -3574,12 +3574,12 @@
 			Q_ASSERT(frameType==PageItem::Unspecified);
 			break;
 		case PageItem::LatexFrame:
-			newItem = new PageItem_LatexFrame(this, x, y, b, h, w, itemToolPrefs.dBrushPict, CommonStrings::None);
+			newItem = new PageItem_LatexFrame(this, x, y, b, h, w, itemToolPrefs.imageFillColor, CommonStrings::None);
 			Q_ASSERT(frameType==PageItem::Rectangle || frameType==PageItem::Unspecified);
 			break;
 #ifdef HAVE_OSG
 		case PageItem::OSGFrame:
-			newItem = new PageItem_OSGFrame(this, x, y, b, h, w, itemToolPrefs.dBrushPict, CommonStrings::None);
+			newItem = new PageItem_OSGFrame(this, x, y, b, h, w, itemToolPrefs.imageFillColor, CommonStrings::None);
 			Q_ASSERT(frameType==PageItem::Rectangle || frameType==PageItem::Unspecified);
 			break;
 #endif
@@ -3704,7 +3704,7 @@
 			w1=iafData.width;
 			h1=iafData.height;
 		}
-		z=itemAdd(iafData.frameType, PageItem::Unspecified, x1, y1, w1, h1, itemToolPrefs.dWidth, CommonStrings::None, itemToolPrefs.dPenText, true);
+		z=itemAdd(iafData.frameType, PageItem::Unspecified, x1, y1, w1, h1, itemToolPrefs.shapeWidth, CommonStrings::None, itemToolPrefs.textColor, true);
 		if (z!=-1)
 		{
 			PageItem* currItem=Items->at(z);
@@ -3773,30 +3773,30 @@
 	switch( itemType )
 	{
 		case PageItem::ImageFrame:
-			newItem->setImageXYScale(itemToolPrefs.scaleX, itemToolPrefs.scaleY);
-			newItem->ScaleType = itemToolPrefs.scaleType;
-			newItem->AspectRatio = itemToolPrefs.aspectRatio;
+			newItem->setImageXYScale(itemToolPrefs.imageScaleX, itemToolPrefs.imageScaleY);
+			newItem->ScaleType = itemToolPrefs.imageScaleType;
+			newItem->AspectRatio = itemToolPrefs.imageAspectRatio;
 			newItem->IProfile = CMSSettings.DefaultImageRGBProfile;
 			newItem->IRender = CMSSettings.DefaultIntentImages;
-			newItem->setFillShade(itemToolPrefs.shadePict);
+			newItem->setFillShade(itemToolPrefs.imageFillShade);
 			break;
 		case PageItem::LatexFrame:
 #ifdef HAVE_OSG
 		case PageItem::OSGFrame:
 #endif
-			newItem->setFillShade(itemToolPrefs.shadePict);
+			newItem->setFillShade(itemToolPrefs.imageFillShade);
 			break;
 		case PageItem::TextFrame:
-//			newItem->setFontFillShade(itemToolPrefs.dTextPenShade);
-//			newItem->setFontStrokeShade(itemToolPrefs.dTextStrokeShade);
-			newItem->setFillColor(itemToolPrefs.dTextBackGround);
-			newItem->setFillShade(itemToolPrefs.dTextBackGroundShade);
-			newItem->setLineColor(itemToolPrefs.dTextLineColor);
-			newItem->setLineShade(itemToolPrefs.dTextLineShade);
+//			newItem->setFontFillShade(itemToolPrefs.textShade);
+//			newItem->setFontStrokeShade(itemToolPrefs.textStrokeShade);
+			newItem->setFillColor(itemToolPrefs.textBackground);
+			newItem->setFillShade(itemToolPrefs.textBackgroundShade);
+			newItem->setLineColor(itemToolPrefs.textLineColor);
+			newItem->setLineShade(itemToolPrefs.textLineShade);
 			break;
 		case PageItem::Line:
-			newItem->PLineArt = Qt::PenStyle(itemToolPrefs.dLstyleLine);
-			newItem->setLineShade(itemToolPrefs.dShadeLine);
+			newItem->PLineArt = Qt::PenStyle(itemToolPrefs.lineStyle);
+			newItem->setLineShade(itemToolPrefs.lineShade);
 			break;
 		case PageItem::Polygon:
 			if(frameType!=PageItem::Rectangle && frameType!=PageItem::Ellipse)
@@ -3836,9 +3836,9 @@
 	//ItemType Polygon
 	if (itemType==PageItem::Polygon || itemType==PageItem::PolyLine)
 	{
-		newItem->PLineArt = Qt::PenStyle(itemToolPrefs.dLineArt);
-		newItem->setFillShade(itemToolPrefs.dShade);
-		newItem->setLineShade(itemToolPrefs.dShade2);
+		newItem->PLineArt = Qt::PenStyle(itemToolPrefs.shapeLineArt);
+		newItem->setFillShade(itemToolPrefs.shapeShade);
+		newItem->setLineShade(itemToolPrefs.shapeShade2);
 		if (itemType == PageItem::Polygon)
 			newItem->ContourLine = newItem->PoLine.copy();
 	}
@@ -5646,15 +5646,15 @@
 							{
 								case PageItem::ImageFrame:
 								case PageItem::LatexFrame:
-									currItem->setFillColor(itemToolPrefs.dBrushPict);
+									currItem->setFillColor(itemToolPrefs.imageFillColor);
 								case PageItem::TextFrame:
 								case PageItem::PathText:
-									currItem->setFillColor(itemToolPrefs.dTextBackGround);
+									currItem->setFillColor(itemToolPrefs.textBackground);
 									break;
 								case PageItem::Line:
 								case PageItem::PolyLine:
 								case PageItem::Polygon:
-									currItem->setFillColor(itemToolPrefs.dBrush);
+									currItem->setFillColor(itemToolPrefs.shapeBrush);
 									break;
 								default:
 									break;
@@ -5729,7 +5729,7 @@
 	}
 }
 
-void ScribusDoc::itemSelection_SetItemPatternProps(double scaleX, double scaleY, double offsetX, double offsetY, double rotation)
+void ScribusDoc::itemSelection_SetItemPatternProps(double imageScaleX, double imageScaleY, double offsetX, double offsetY, double rotation)
 {
 	uint selectedItemCount=m_Selection->count();
 	if (selectedItemCount != 0)
@@ -5739,7 +5739,7 @@
 		for (uint a = 0; a < selectedItemCount; ++a)
 		{
 			currItem = m_Selection->itemAt(a);
-			currItem->setPatternTransform(scaleX, scaleY, offsetX, offsetY, rotation);
+			currItem->setPatternTransform(imageScaleX, imageScaleY, offsetX, offsetY, rotation);
 			currItem->update();
 		}
 		m_updateManager.setUpdatesEnabled();
@@ -6691,7 +6691,7 @@
 			bool fho = currItem->imageFlippedH();
 			bool fvo = currItem->imageFlippedV();
 			if (applyNewRes)
-				currItem->pixm.imgInfo.lowResType = itemToolPrefs.lowResType;
+				currItem->pixm.imgInfo.lowResType = itemToolPrefs.imageLowResType;
 			loadPict(currItem->Pfile, currItem, true);
 			currItem->setImageFlippedH(fho);
 			currItem->setImageFlippedV(fvo);
@@ -6710,7 +6710,7 @@
 			bool fho = currItem->imageFlippedH();
 			bool fvo = currItem->imageFlippedV();
 			if (applyNewRes)
-				currItem->pixm.imgInfo.lowResType = itemToolPrefs.lowResType;
+				currItem->pixm.imgInfo.lowResType = itemToolPrefs.imageLowResType;
 			loadPict(currItem->Pfile, currItem, true);
 			currItem->setImageFlippedH(fho);
 			currItem->setImageFlippedV(fvo);
@@ -6729,7 +6729,7 @@
 			bool fho = currItem->imageFlippedH();
 			bool fvo = currItem->imageFlippedV();
 			if (applyNewRes)
-				currItem->pixm.imgInfo.lowResType = itemToolPrefs.lowResType;
+				currItem->pixm.imgInfo.lowResType = itemToolPrefs.imageLowResType;
 			loadPict(currItem->Pfile, currItem, true);
 			currItem->setImageFlippedH(fho);
 			currItem->setImageFlippedV(fvo);
@@ -6751,7 +6751,7 @@
 				bool fho = currItem->imageFlippedH();
 				bool fvo = currItem->imageFlippedV();
 				if (applyNewRes)
-					currItem->pixm.imgInfo.lowResType = itemToolPrefs.lowResType;
+					currItem->pixm.imgInfo.lowResType = itemToolPrefs.imageLowResType;
 				loadPict(currItem->Pfile, currItem, true);
 				currItem->setImageFlippedH(fho);
 				currItem->setImageFlippedV(fvo);
@@ -10266,7 +10266,7 @@
 		double gh = maxy - miny;
 		PageItem *high = Items->at(highestItem);
 		undoManager->setUndoEnabled(false);
-		int z = itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, itemToolPrefs.dBrush, itemToolPrefs.dPen, true);
+		int z = itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, itemToolPrefs.shapeBrush, itemToolPrefs.shapePen, true);
 		PageItem *neu = Items->takeAt(z);
 		Items->insert(lowestItem, neu);
 		neu->setItemName( tr("Group%1").arg(GroupCounter));
Index: scribus/prefsmanager.cpp
===================================================================
--- scribus/prefsmanager.cpp	(revision 13995)
+++ scribus/prefsmanager.cpp	(revision 13996)
@@ -125,14 +125,14 @@
 	{
 		if ((itf.currentKey() == "Arial Regular") || (itf.currentKey() == "Times New Roman Regular"))
 		{
-			appPrefs.itemToolPrefs.defFont = itf.currentKey();
+			appPrefs.itemToolPrefs.textFont = itf.currentKey();
 			goodFont = true;
 			break;
 		}
 	}
 	if (!goodFont)
-		appPrefs.itemToolPrefs.defFont = it.currentKey();
-	appPrefs.itemToolPrefs.defSize = 120;
+		appPrefs.itemToolPrefs.textFont = it.currentKey();
+	appPrefs.itemToolPrefs.textSize = 120;
 
 	/** Default colours **/
 	appPrefs.colorPrefs.DColors.clear();
@@ -237,23 +237,23 @@
 	//FIXME
 	//Black here causes issues when a colour set is loaded without "Black" in it.
 	//"Black" is created with wrong values. Eg SVG colour set
-	appPrefs.itemToolPrefs.dPen = "Black";
-	appPrefs.itemToolPrefs.dBrush = "Black";
-	appPrefs.itemToolPrefs.dShade = 100;
-	appPrefs.itemToolPrefs.dShade2 = 100;
-	appPrefs.itemToolPrefs.dLineArt = Qt::SolidLine;
-	appPrefs.itemToolPrefs.dWidth = 0;
-	appPrefs.itemToolPrefs.dPenLine = "Black";
-	appPrefs.itemToolPrefs.dPenText = "Black";
-	appPrefs.itemToolPrefs.dStrokeText = "Black";
-	appPrefs.itemToolPrefs.dTextBackGround = CommonStrings::None;
-	appPrefs.itemToolPrefs.dTextLineColor = CommonStrings::None;
-	appPrefs.itemToolPrefs.dTextBackGroundShade = 100;
-	appPrefs.itemToolPrefs.dTextLineShade = 100;
-	appPrefs.itemToolPrefs.dTextPenShade = 100;
-	appPrefs.itemToolPrefs.dTextStrokeShade = 100;
-	appPrefs.itemToolPrefs.tabFillChar = "";
-	appPrefs.itemToolPrefs.dTabWidth = 36.0;
+	appPrefs.itemToolPrefs.shapePen = "Black";
+	appPrefs.itemToolPrefs.shapeBrush = "Black";
+	appPrefs.itemToolPrefs.shapeShade = 100;
+	appPrefs.itemToolPrefs.shapeShade2 = 100;
+	appPrefs.itemToolPrefs.shapeLineArt = Qt::SolidLine;
+	appPrefs.itemToolPrefs.shapeWidth = 0;
+	appPrefs.itemToolPrefs.lineColor = "Black";
+	appPrefs.itemToolPrefs.textColor = "Black";
+	appPrefs.itemToolPrefs.textStrokeColor = "Black";
+	appPrefs.itemToolPrefs.textBackground = CommonStrings::None;
+	appPrefs.itemToolPrefs.textLineColor = CommonStrings::None;
+	appPrefs.itemToolPrefs.textBackgroundShade = 100;
+	appPrefs.itemToolPrefs.textLineShade = 100;
+	appPrefs.itemToolPrefs.textShade = 100;
+	appPrefs.itemToolPrefs.textStrokeShade = 100;
+	appPrefs.itemToolPrefs.textTabFillChar = "";
+	appPrefs.itemToolPrefs.textTabWidth = 36.0;
 	appPrefs.opToolPrefs.dispX = 10.0;
 	appPrefs.opToolPrefs.dispY = 10.0;
 	appPrefs.opToolPrefs.constrain = 15.0;
@@ -267,27 +267,27 @@
 	appPrefs.displayPrefs.frameAnnotationColor = QColor(Qt::blue);
 	appPrefs.displayPrefs.pageBorderColor = QColor(Qt::red);
 	appPrefs.displayPrefs.controlCharColor = QColor(Qt::darkRed);
-	appPrefs.itemToolPrefs.dCols = 1;
-	appPrefs.itemToolPrefs.dGap = 0.0;
-	appPrefs.itemToolPrefs.dShadeLine = 100;
-	appPrefs.itemToolPrefs.dLstyleLine = Qt::SolidLine;
-	appPrefs.itemToolPrefs.dWidthLine = 1;
-	appPrefs.itemToolPrefs.dStartArrow = 0;
-	appPrefs.itemToolPrefs.dEndArrow = 0;
+	appPrefs.itemToolPrefs.textColumns = 1;
+	appPrefs.itemToolPrefs.textColumnGap = 0.0;
+	appPrefs.itemToolPrefs.lineShade = 100;
+	appPrefs.itemToolPrefs.lineStyle = Qt::SolidLine;
+	appPrefs.itemToolPrefs.lineWidth = 1;
+	appPrefs.itemToolPrefs.lineStartArrow = 0;
+	appPrefs.itemToolPrefs.lineEndArrow = 0;
 	appPrefs.opToolPrefs.magMin = 10;
 	appPrefs.opToolPrefs.magMax = 3200;
 	appPrefs.opToolPrefs.magStep = 200;
-	appPrefs.itemToolPrefs.dBrushPict = CommonStrings::None;
-	appPrefs.itemToolPrefs.shadePict = 100;
-	appPrefs.itemToolPrefs.scaleX = 1;
-	appPrefs.itemToolPrefs.scaleY = 1;
+	appPrefs.itemToolPrefs.imageFillColor = CommonStrings::None;
+	appPrefs.itemToolPrefs.imageFillShade = 100;
+	appPrefs.itemToolPrefs.imageScaleX = 1;
+	appPrefs.itemToolPrefs.imageScaleY = 1;
 	appPrefs.guidesPrefs.guidePlacement = true;
 	appPrefs.docSetupPrefs.docUnitIndex = 0;
-	appPrefs.itemToolPrefs.polyC = 4;
-	appPrefs.itemToolPrefs.polyF = 0.5;
-	appPrefs.itemToolPrefs.polyS = false;
-	appPrefs.itemToolPrefs.polyFd = 0;
-	appPrefs.itemToolPrefs.polyR = 0.0;
+	appPrefs.itemToolPrefs.polyCorners = 4;
+	appPrefs.itemToolPrefs.polyFactorValue2 = 0.5;
+	appPrefs.itemToolPrefs.polyUseFactor = false;
+	appPrefs.itemToolPrefs.polyFactorValue = 0;
+	appPrefs.itemToolPrefs.polyRotation = 0.0;
 	appPrefs.itemToolPrefs.polyCurvature = 0.0;
 //	appPrefs.PSize = 40;
 	appPrefs.printerPrefs.ClipMargin = false;
@@ -313,10 +313,10 @@
 	appPrefs.docSetupPrefs.bleeds.Left = 0;
 	appPrefs.docSetupPrefs.bleeds.Right = 0;
 	appPrefs.docSetupPrefs.bleeds.Bottom = 0;
-	appPrefs.itemToolPrefs.scaleType = true;
-	appPrefs.itemToolPrefs.aspectRatio = true;
-	appPrefs.itemToolPrefs.lowResType = 1;
-	appPrefs.itemToolPrefs.useEmbeddedPath = false;
+	appPrefs.itemToolPrefs.imageScaleType = true;
+	appPrefs.itemToolPrefs.imageAspectRatio = true;
+	appPrefs.itemToolPrefs.imageLowResType = 1;
+	appPrefs.itemToolPrefs.imageUseEmbeddedPath = false;
 	appPrefs.hyphPrefs.MinWordLen = 3;
 	appPrefs.hyphPrefs.HyCount = 2;
 	appPrefs.hyphPrefs.Language = "";
@@ -360,7 +360,7 @@
 	appPrefs.extToolPrefs.gs_AntiAliasText = true;
 	appPrefs.extToolPrefs.gs_exe = getGSDefaultExeName();
 	appPrefs.extToolPrefs.gs_Resolution = 72;
-	appPrefs.storyEditorPrefs.STEcolor = QColor(Qt::white);
+	appPrefs.storyEditorPrefs.guiFontColor = QColor(Qt::white);
 	appPrefs.colorPrefs.DCMSset.DefaultMonitorProfile = "";
 	appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile = "";
 	appPrefs.colorPrefs.DCMSset.DefaultImageRGBProfile = "";
@@ -517,7 +517,7 @@
 void PrefsManager::initDefaultGUIFont(const QFont& guiFont)
 {
 	appPrefs.uiPrefs.applicationFontSize = guiFont.pointSize();
-	appPrefs.storyEditorPrefs.STEfont = guiFont.toString();
+	appPrefs.storyEditorPrefs.guiFont = guiFont.toString();
 	appPrefs.uiPrefs.paletteFontSize = appPrefs.uiPrefs.applicationFontSize;
 }
 
@@ -1060,21 +1060,21 @@
 
 bool PrefsManager::isToolColor(const struct ItemToolPrefs& settings, const QString& name)
 {
-	if (settings.dPenText == name)
+	if (settings.textColor == name)
 		return true;
-	if (settings.dStrokeText == name)
+	if (settings.textStrokeColor == name)
 		return true;
-	if (settings.dTextBackGround == name)
+	if (settings.textBackground == name)
 		return true;
-	if (settings.dTextLineColor == name)
+	if (settings.textLineColor == name)
 		return true;
-	if (settings.dPen == name)
+	if (settings.shapePen == name)
 		return true;
-	if (settings.dBrush == name)
+	if (settings.shapeBrush == name)
 		return true;
-	if (settings.dPenLine == name)
+	if (settings.lineColor == name)
 		return true;
-	if (settings.dBrushPict == name)
+	if (settings.imageFillColor == name)
 		return true;
 	return false;
 }
@@ -1087,21 +1087,21 @@
 QStringList PrefsManager::toolColorNames(const struct ItemToolPrefs& settings)
 {
 	QStringList names;
-	names.append(settings.dPenText);
-	if (!names.contains(settings.dStrokeText))
-		names.append(settings.dStrokeText);
-	if (!names.contains(settings.dTextBackGround))
-		names.append(settings.dTextBackGround);
-	if (!names.contains(settings.dTextLineColor))
-		names.append(settings.dTextLineColor);
-	if (!names.contains(settings.dPen))
-		names.append(settings.dPen);
-	if (!names.contains(settings.dBrush))
-		names.append(settings.dBrush);
-	if (!names.contains(settings.dPenLine))
-		names.append(settings.dPenLine);
-	if (!names.contains(settings.dBrushPict))
-		names.append(settings.dBrushPict);
+	names.append(settings.textColor);
+	if (!names.contains(settings.textStrokeColor))
+		names.append(settings.textStrokeColor);
+	if (!names.contains(settings.textBackground))
+		names.append(settings.textBackground);
+	if (!names.contains(settings.textLineColor))
+		names.append(settings.textLineColor);
+	if (!names.contains(settings.shapePen))
+		names.append(settings.shapePen);
+	if (!names.contains(settings.shapeBrush))
+		names.append(settings.shapeBrush);
+	if (!names.contains(settings.lineColor))
+		names.append(settings.lineColor);
+	if (!names.contains(settings.imageFillColor))
+		names.append(settings.imageFillColor);
 	return names;
 }
 
@@ -1112,50 +1112,50 @@
 
 void PrefsManager::replaceToolColors(struct ItemToolPrefs& settings, const QMap<QString, QString> replaceMap)
 {
-	if (replaceMap.contains(settings.dPenText))
-		settings.dPenText = replaceMap[settings.dPenText];
-	if (replaceMap.contains(settings.dStrokeText))
-		settings.dStrokeText = replaceMap[settings.dStrokeText];
-	if (replaceMap.contains(settings.dTextBackGround))
-		settings.dTextBackGround = replaceMap[settings.dTextBackGround];
-	if (replaceMap.contains(settings.dTextLineColor))
-		settings.dTextLineColor = replaceMap[settings.dTextLineColor];
-	if (replaceMap.contains(settings.dPen))
-		settings.dPen = replaceMap[settings.dPen];
-	if (replaceMap.contains(settings.dBrush))
-		settings.dBrush = replaceMap[settings.dBrush];
-	if (replaceMap.contains(settings.dPenLine))
-		settings.dPenLine = replaceMap[settings.dPenLine];
-	if (replaceMap.contains(settings.dBrushPict))
-		settings.dBrushPict = replaceMap[settings.dBrushPict];
+	if (replaceMap.contains(settings.textColor))
+		settings.textColor = replaceMap[settings.textColor];
+	if (replaceMap.contains(settings.textStrokeColor))
+		settings.textStrokeColor = replaceMap[settings.textStrokeColor];
+	if (replaceMap.contains(settings.textBackground))
+		settings.textBackground = replaceMap[settings.textBackground];
+	if (replaceMap.contains(settings.textLineColor))
+		settings.textLineColor = replaceMap[settings.textLineColor];
+	if (replaceMap.contains(settings.shapePen))
+		settings.shapePen = replaceMap[settings.shapePen];
+	if (replaceMap.contains(settings.shapeBrush))
+		settings.shapeBrush = replaceMap[settings.shapeBrush];
+	if (replaceMap.contains(settings.lineColor))
+		settings.lineColor = replaceMap[settings.lineColor];
+	if (replaceMap.contains(settings.imageFillColor))
+		settings.imageFillColor = replaceMap[settings.imageFillColor];
 }
 
 void PrefsManager::setColorSet(const ColorList& colorSet)
 {
 	// Color set may have changed and tools color not be present in the new color set
 	ColorList tmpSet = colorSet;
-	QString penText = appPrefs.itemToolPrefs.dPenText;
+	QString penText = appPrefs.itemToolPrefs.textColor;
 	if (!tmpSet.contains(penText) && penText != CommonStrings::None)
 		tmpSet[penText] = appPrefs.colorPrefs.DColors[penText];
-	QString strokeText = appPrefs.itemToolPrefs.dStrokeText;
+	QString strokeText = appPrefs.itemToolPrefs.textStrokeColor;
 	if (!tmpSet.contains(strokeText) && strokeText != CommonStrings::None)
 		tmpSet[strokeText] = appPrefs.colorPrefs.DColors[strokeText];
-	QString textBackGround = appPrefs.itemToolPrefs.dTextBackGround;
+	QString textBackGround = appPrefs.itemToolPrefs.textBackground;
 	if (!tmpSet.contains(textBackGround) && textBackGround != CommonStrings::None)
 		tmpSet[textBackGround] = appPrefs.colorPrefs.DColors[textBackGround];
-	QString textLineColor = appPrefs.itemToolPrefs.dTextLineColor;
+	QString textLineColor = appPrefs.itemToolPrefs.textLineColor;
 	if (!tmpSet.contains(textLineColor) && textLineColor != CommonStrings::None)
 		tmpSet[textLineColor] = appPrefs.colorPrefs.DColors[textLineColor];
-	QString pen = appPrefs.itemToolPrefs.dPen;
+	QString pen = appPrefs.itemToolPrefs.shapePen;
 	if (!tmpSet.contains(pen) && pen != CommonStrings::None)
 		tmpSet[pen] = appPrefs.colorPrefs.DColors[pen];
-	QString brush = appPrefs.itemToolPrefs.dBrush;
+	QString brush = appPrefs.itemToolPrefs.shapeBrush;
 	if (!tmpSet.contains(brush) && brush != CommonStrings::None)
 		tmpSet[brush] = appPrefs.colorPrefs.DColors[brush];
-	QString penLine = appPrefs.itemToolPrefs.dPenLine;
+	QString penLine = appPrefs.itemToolPrefs.lineColor;
 	if (!tmpSet.contains(penLine) && penLine != CommonStrings::None)
 		tmpSet[penLine] = appPrefs.colorPrefs.DColors[penLine];
-	QString brushPict = appPrefs.itemToolPrefs.dBrushPict;
+	QString brushPict = appPrefs.itemToolPrefs.imageFillColor;
 	if (!tmpSet.contains(brushPict) && brushPict != CommonStrings::None)
 		tmpSet[brushPict] = appPrefs.colorPrefs.DColors[brushPict];
 	appPrefs.colorPrefs.DColors = tmpSet;
@@ -1258,8 +1258,8 @@
 	dc.setAttribute("ScratchTop", appPrefs.displayPrefs.scratch.Top);
 	dc.setAttribute("GapHorizontal", ScCLocale::toQStringC(appPrefs.displayPrefs.pageGapHorizontal));
 	dc.setAttribute("GapVertical", ScCLocale::toQStringC(appPrefs.displayPrefs.pageGapVertical));
-	dc.setAttribute("STECOLOR", appPrefs.storyEditorPrefs.STEcolor.name());
-	dc.setAttribute("STEFONT", appPrefs.storyEditorPrefs.STEfont);
+	dc.setAttribute("STECOLOR", appPrefs.storyEditorPrefs.guiFontColor.name());
+	dc.setAttribute("STEFONT", appPrefs.storyEditorPrefs.guiFont);
 	dc.setAttribute("STYLEPREVIEW", static_cast<int>(appPrefs.miscPrefs.haveStylePreview));
 	dc.setAttribute("UI_SHOWSTARTUPDIALOG", static_cast<int>(appPrefs.uiPrefs.showStartupDialog));
 	dc.setAttribute("UI_USESMALLWIDGETS", static_cast<int>(appPrefs.uiPrefs.useSmallWidgets));
@@ -1294,8 +1294,8 @@
 	dc1a.setAttribute("DScale", ScCLocale::toQStringC(appPrefs.displayPrefs.displayScale));
 	elem.appendChild(dc1a);
 	QDomElement dc2=docu.createElement("FONTS");
-	dc2.setAttribute("FACE",appPrefs.itemToolPrefs.defFont);
-	dc2.setAttribute("SIZE",appPrefs.itemToolPrefs.defSize / 10.0);
+	dc2.setAttribute("FACE",appPrefs.itemToolPrefs.textFont);
+	dc2.setAttribute("SIZE",appPrefs.itemToolPrefs.textSize / 10.0);
 	dc2.setAttribute("AutomaticSubst", static_cast<int>(appPrefs.fontPrefs.askBeforeSubstitute));
 	elem.appendChild(dc2);
 	QDomElement dc3=docu.createElement("TYPO");
@@ -1325,47 +1325,47 @@
 		dc3.setAttribute("StrikeThruWidth", appPrefs.typoPrefs.valueStrikeThruWidth / 10.0);
 	elem.appendChild(dc3);
 	QDomElement dc9=docu.createElement("TOOLS");
-	dc9.setAttribute("PEN",appPrefs.itemToolPrefs.dPen);
-	dc9.setAttribute("BRUSH",appPrefs.itemToolPrefs.dBrush);
-	dc9.setAttribute("PENLINE",appPrefs.itemToolPrefs.dPenLine);
-	dc9.setAttribute("PENTEXT",appPrefs.itemToolPrefs.dPenText);
-	dc9.setAttribute("StrokeText",appPrefs.itemToolPrefs.dStrokeText);
-	dc9.setAttribute("TextBackGround", appPrefs.itemToolPrefs.dTextBackGround);
-	dc9.setAttribute("TextLineColor", appPrefs.itemToolPrefs.dTextLineColor);
-	dc9.setAttribute("TextBackGroundShade", appPrefs.itemToolPrefs.dTextBackGroundShade);
-	dc9.setAttribute("TextLineShade", appPrefs.itemToolPrefs.dTextLineShade);
-	dc9.setAttribute("TextPenShade", appPrefs.itemToolPrefs.dTextPenShade);
-	dc9.setAttribute("TextStrokeShade", appPrefs.itemToolPrefs.dTextStrokeShade);
-	dc9.setAttribute("TEXTCOL",appPrefs.itemToolPrefs.dCols);
-	dc9.setAttribute("TEXTGAP",ScCLocale::toQStringC(appPrefs.itemToolPrefs.dGap));
-	dc9.setAttribute("TabWidth",ScCLocale::toQStringC(appPrefs.itemToolPrefs.dTabWidth));
-	dc9.setAttribute("TabFill",appPrefs.itemToolPrefs.tabFillChar);
-	dc9.setAttribute("STIL",appPrefs.itemToolPrefs.dLineArt);
-	dc9.setAttribute("STILLINE",appPrefs.itemToolPrefs.dLstyleLine);
-	dc9.setAttribute("WIDTH",ScCLocale::toQStringC(appPrefs.itemToolPrefs.dWidth));
-	dc9.setAttribute("WIDTHLINE",ScCLocale::toQStringC(appPrefs.itemToolPrefs.dWidthLine));
-	dc9.setAttribute("PENSHADE",appPrefs.itemToolPrefs.dShade2);
-	dc9.setAttribute("LINESHADE",appPrefs.itemToolPrefs.dShadeLine);
-	dc9.setAttribute("BRUSHSHADE",appPrefs.itemToolPrefs.dShade);
+	dc9.setAttribute("PEN",appPrefs.itemToolPrefs.shapePen);
+	dc9.setAttribute("BRUSH",appPrefs.itemToolPrefs.shapeBrush);
+	dc9.setAttribute("PENLINE",appPrefs.itemToolPrefs.lineColor);
+	dc9.setAttribute("PENTEXT",appPrefs.itemToolPrefs.textColor);
+	dc9.setAttribute("StrokeText",appPrefs.itemToolPrefs.textStrokeColor);
+	dc9.setAttribute("TextBackGround", appPrefs.itemToolPrefs.textBackground);
+	dc9.setAttribute("TextLineColor", appPrefs.itemToolPrefs.textLineColor);
+	dc9.setAttribute("TextBackGroundShade", appPrefs.itemToolPrefs.textBackgroundShade);
+	dc9.setAttribute("TextLineShade", appPrefs.itemToolPrefs.textLineShade);
+	dc9.setAttribute("TextPenShade", appPrefs.itemToolPrefs.textShade);
+	dc9.setAttribute("TextStrokeShade", appPrefs.itemToolPrefs.textStrokeShade);
+	dc9.setAttribute("TEXTCOL",appPrefs.itemToolPrefs.textColumns);
+	dc9.setAttribute("TEXTGAP",ScCLocale::toQStringC(appPrefs.itemToolPrefs.textColumnGap));
+	dc9.setAttribute("TabWidth",ScCLocale::toQStringC(appPrefs.itemToolPrefs.textTabWidth));
+	dc9.setAttribute("TabFill",appPrefs.itemToolPrefs.textTabFillChar);
+	dc9.setAttribute("STIL",appPrefs.itemToolPrefs.shapeLineArt);
+	dc9.setAttribute("STILLINE",appPrefs.itemToolPrefs.lineStyle);
+	dc9.setAttribute("WIDTH",ScCLocale::toQStringC(appPrefs.itemToolPrefs.shapeWidth));
+	dc9.setAttribute("WIDTHLINE",ScCLocale::toQStringC(appPrefs.itemToolPrefs.lineWidth));
+	dc9.setAttribute("PENSHADE",appPrefs.itemToolPrefs.shapeShade2);
+	dc9.setAttribute("LINESHADE",appPrefs.itemToolPrefs.lineShade);
+	dc9.setAttribute("BRUSHSHADE",appPrefs.itemToolPrefs.shapeShade);
 	dc9.setAttribute("MAGMIN",appPrefs.opToolPrefs.magMin);
 	dc9.setAttribute("MAGMAX",appPrefs.opToolPrefs.magMax);
 	dc9.setAttribute("MAGSTEP",appPrefs.opToolPrefs.magStep);
-	dc9.setAttribute("CPICT",appPrefs.itemToolPrefs.dBrushPict);
-	dc9.setAttribute("PICTSHADE",appPrefs.itemToolPrefs.shadePict);
-	dc9.setAttribute("PICTSCX",ScCLocale::toQStringC(appPrefs.itemToolPrefs.scaleX));
-	dc9.setAttribute("PICTSCY",ScCLocale::toQStringC(appPrefs.itemToolPrefs.scaleY));
-	dc9.setAttribute("POLYC", appPrefs.itemToolPrefs.polyC);
-	dc9.setAttribute("POLYF", ScCLocale::toQStringC(appPrefs.itemToolPrefs.polyF));
-	dc9.setAttribute("POLYR", ScCLocale::toQStringC(appPrefs.itemToolPrefs.polyR));
-	dc9.setAttribute("POLYFD", appPrefs.itemToolPrefs.polyFd);
+	dc9.setAttribute("CPICT",appPrefs.itemToolPrefs.imageFillColor);
+	dc9.setAttribute("PICTSHADE",appPrefs.itemToolPrefs.imageFillShade);
+	dc9.setAttribute("PICTSCX",ScCLocale::toQStringC(appPrefs.itemToolPrefs.imageScaleX));
+	dc9.setAttribute("PICTSCY",ScCLocale::toQStringC(appPrefs.itemToolPrefs.imageScaleY));
+	dc9.setAttribute("POLYC", appPrefs.itemToolPrefs.polyCorners);
+	dc9.setAttribute("POLYF", ScCLocale::toQStringC(appPrefs.itemToolPrefs.polyFactorValue2));
+	dc9.setAttribute("POLYR", ScCLocale::toQStringC(appPrefs.itemToolPrefs.polyRotation));
+	dc9.setAttribute("POLYFD", appPrefs.itemToolPrefs.polyFactorValue);
 	dc9.setAttribute("POLYCUR", ScCLocale::toQStringC(appPrefs.itemToolPrefs.polyCurvature));
-	dc9.setAttribute("POLYS", static_cast<int>(appPrefs.itemToolPrefs.polyS));
-	dc9.setAttribute("PSCALE", static_cast<int>(appPrefs.itemToolPrefs.scaleType));
-	dc9.setAttribute("PASPECT", static_cast<int>(appPrefs.itemToolPrefs.aspectRatio));
-	dc9.setAttribute("EmbeddedPath", static_cast<int>(appPrefs.itemToolPrefs.useEmbeddedPath));
-	dc9.setAttribute("HalfRes", appPrefs.itemToolPrefs.lowResType);
-	dc9.setAttribute("StartArrow", appPrefs.itemToolPrefs.dStartArrow);
-	dc9.setAttribute("EndArrow", appPrefs.itemToolPrefs.dEndArrow);
+	dc9.setAttribute("POLYS", static_cast<int>(appPrefs.itemToolPrefs.polyUseFactor));
+	dc9.setAttribute("PSCALE", static_cast<int>(appPrefs.itemToolPrefs.imageScaleType));
+	dc9.setAttribute("PASPECT", static_cast<int>(appPrefs.itemToolPrefs.imageAspectRatio));
+	dc9.setAttribute("EmbeddedPath", static_cast<int>(appPrefs.itemToolPrefs.imageUseEmbeddedPath));
+	dc9.setAttribute("HalfRes", appPrefs.itemToolPrefs.imageLowResType);
+	dc9.setAttribute("StartArrow", appPrefs.itemToolPrefs.lineStartArrow);
+	dc9.setAttribute("EndArrow", appPrefs.itemToolPrefs.lineEndArrow);
 	dc9.setAttribute("dispX", ScCLocale::toQStringC(appPrefs.opToolPrefs.dispX));
 	dc9.setAttribute("dispY", ScCLocale::toQStringC(appPrefs.opToolPrefs.dispY));
 	dc9.setAttribute("constrain", ScCLocale::toQStringC(appPrefs.opToolPrefs.constrain));
@@ -1818,9 +1818,9 @@
 			appPrefs.displayPrefs.pageGapHorizontal  = ScCLocale::toDoubleC(dc.attribute("GapHorizontal"), 0.0);
 			appPrefs.displayPrefs.pageGapVertical    = ScCLocale::toDoubleC(dc.attribute("GapVertical"), 40.0);
 			if (dc.hasAttribute("STECOLOR"))
-				appPrefs.storyEditorPrefs.STEcolor = QColor(dc.attribute("STECOLOR"));
+				appPrefs.storyEditorPrefs.guiFontColor = QColor(dc.attribute("STECOLOR"));
 			if (dc.hasAttribute("STEFONT"))
-				appPrefs.storyEditorPrefs.STEfont = dc.attribute("STEFONT");
+				appPrefs.storyEditorPrefs.guiFont = dc.attribute("STEFONT");
 			appPrefs.displayPrefs.showToolTips = static_cast<bool>(dc.attribute("ToolTips", "1").toInt());
 			appPrefs.displayPrefs.showMouseCoordinates = static_cast<bool>(dc.attribute("showMouseCoordinates", "1").toInt());
 			appPrefs.uiPrefs.stickyTools = static_cast<bool>(dc.attribute("stickyTools", "0").toInt());
@@ -1889,50 +1889,50 @@
 		}
 		if (dc.tagName()=="TOOLS")
 		{
-			appPrefs.itemToolPrefs.dPen = dc.attribute("PEN");
-			appPrefs.itemToolPrefs.dBrush = dc.attribute("BRUSH");
-			appPrefs.itemToolPrefs.dPenLine = dc.attribute("PENLINE");
-			appPrefs.itemToolPrefs.dPenText = dc.attribute("PENTEXT");
-			appPrefs.itemToolPrefs.dStrokeText = dc.attribute("StrokeText", appPrefs.itemToolPrefs.dPenText);
-			appPrefs.itemToolPrefs.dTextBackGround = dc.attribute("TextBackGround", CommonStrings::None);
-			appPrefs.itemToolPrefs.dTextLineColor = dc.attribute("TextLineColor", CommonStrings::None);
-			appPrefs.itemToolPrefs.dTextBackGroundShade = dc.attribute("TextBackGroundShade", "100").toInt();
-			appPrefs.itemToolPrefs.dTextLineShade = dc.attribute("TextLineShade", "100").toInt();
-			appPrefs.itemToolPrefs.dTextPenShade = dc.attribute("TextPenShade", "100").toInt();
-			appPrefs.itemToolPrefs.dTextStrokeShade = dc.attribute("TextStrokeShade", "100").toInt();
-			appPrefs.itemToolPrefs.dCols = dc.attribute("TEXTCOL", "1").toInt();
-			appPrefs.itemToolPrefs.dGap  = ScCLocale::toDoubleC(dc.attribute("TEXTGAP"), 0.0);
-			appPrefs.itemToolPrefs.tabFillChar = dc.attribute("TabFill", "");
-			appPrefs.itemToolPrefs.dTabWidth   = ScCLocale::toDoubleC(dc.attribute("TabWidth"), 36.0);
-			appPrefs.itemToolPrefs.dLineArt = dc.attribute("STIL").toInt();
-			appPrefs.itemToolPrefs.dLstyleLine = dc.attribute("STILLINE").toInt();
-			appPrefs.itemToolPrefs.dWidth     = ScCLocale::toDoubleC(dc.attribute("WIDTH"), 0.0);
-			appPrefs.itemToolPrefs.dWidthLine = ScCLocale::toDoubleC(dc.attribute("WIDTHLINE"), 1.0);
-			appPrefs.itemToolPrefs.dShade2 = dc.attribute("PENSHADE").toInt();
-			appPrefs.itemToolPrefs.dShadeLine = dc.attribute("LINESHADE").toInt();
-			appPrefs.itemToolPrefs.dShade  = dc.attribute("BRUSHSHADE").toInt();
+			appPrefs.itemToolPrefs.shapePen = dc.attribute("PEN");
+			appPrefs.itemToolPrefs.shapeBrush = dc.attribute("BRUSH");
+			appPrefs.itemToolPrefs.lineColor = dc.attribute("PENLINE");
+			appPrefs.itemToolPrefs.textColor = dc.attribute("PENTEXT");
+			appPrefs.itemToolPrefs.textStrokeColor = dc.attribute("StrokeText", appPrefs.itemToolPrefs.textColor);
+			appPrefs.itemToolPrefs.textBackground = dc.attribute("TextBackGround", CommonStrings::None);
+			appPrefs.itemToolPrefs.textLineColor = dc.attribute("TextLineColor", CommonStrings::None);
+			appPrefs.itemToolPrefs.textBackgroundShade = dc.attribute("TextBackGroundShade", "100").toInt();
+			appPrefs.itemToolPrefs.textLineShade = dc.attribute("TextLineShade", "100").toInt();
+			appPrefs.itemToolPrefs.textShade = dc.attribute("TextPenShade", "100").toInt();
+			appPrefs.itemToolPrefs.textStrokeShade = dc.attribute("TextStrokeShade", "100").toInt();
+			appPrefs.itemToolPrefs.textColumns = dc.attribute("TEXTCOL", "1").toInt();
+			appPrefs.itemToolPrefs.textColumnGap  = ScCLocale::toDoubleC(dc.attribute("TEXTGAP"), 0.0);
+			appPrefs.itemToolPrefs.textTabFillChar = dc.attribute("TabFill", "");
+			appPrefs.itemToolPrefs.textTabWidth   = ScCLocale::toDoubleC(dc.attribute("TabWidth"), 36.0);
+			appPrefs.itemToolPrefs.shapeLineArt = dc.attribute("STIL").toInt();
+			appPrefs.itemToolPrefs.lineStyle = dc.attribute("STILLINE").toInt();
+			appPrefs.itemToolPrefs.shapeWidth     = ScCLocale::toDoubleC(dc.attribute("WIDTH"), 0.0);
+			appPrefs.itemToolPrefs.lineWidth = ScCLocale::toDoubleC(dc.attribute("WIDTHLINE"), 1.0);
+			appPrefs.itemToolPrefs.shapeShade2 = dc.attribute("PENSHADE").toInt();
+			appPrefs.itemToolPrefs.lineShade = dc.attribute("LINESHADE").toInt();
+			appPrefs.itemToolPrefs.shapeShade  = dc.attribute("BRUSHSHADE").toInt();
 			appPrefs.opToolPrefs.magMin  = dc.attribute("MAGMIN", "10").toInt();
 			appPrefs.opToolPrefs.magMax  = dc.attribute("MAGMAX", "3200").toInt();
 			appPrefs.opToolPrefs.magStep = dc.attribute("MAGSTEP", "200").toInt();
 			//CB Reset prefs zoom step value to 200% instead of old values.
 			if (appPrefs.opToolPrefs.magStep<100)
 				appPrefs.opToolPrefs.magStep=200;
-			appPrefs.itemToolPrefs.dBrushPict = dc.attribute("CPICT", CommonStrings::None);
-			appPrefs.itemToolPrefs.shadePict = dc.attribute("PICTSHADE", "100").toInt();
-			appPrefs.itemToolPrefs.scaleX = ScCLocale::toDoubleC(dc.attribute("PICTSCX"), 1.0);
-			appPrefs.itemToolPrefs.scaleY = ScCLocale::toDoubleC(dc.attribute("PICTSCY"), 1.0);
-			appPrefs.itemToolPrefs.scaleType = static_cast<bool>(dc.attribute("PSCALE", "1").toInt());
-			appPrefs.itemToolPrefs.aspectRatio = static_cast<bool>(dc.attribute("PASPECT", "0").toInt());
-			appPrefs.itemToolPrefs.useEmbeddedPath = static_cast<bool>(dc.attribute("EmbeddedPath", "0").toInt());
-			appPrefs.itemToolPrefs.lowResType = dc.attribute("HalfRes", "1").toInt();
-			appPrefs.itemToolPrefs.polyC = dc.attribute("POLYC", "4").toInt();
-			appPrefs.itemToolPrefs.polyF = ScCLocale::toDoubleC(dc.attribute("POLYF"), 0.5);
-			appPrefs.itemToolPrefs.polyR = ScCLocale::toDoubleC(dc.attribute("POLYR"), 0.0);
+			appPrefs.itemToolPrefs.imageFillColor = dc.attribute("CPICT", CommonStrings::None);
+			appPrefs.itemToolPrefs.imageFillShade = dc.attribute("PICTSHADE", "100").toInt();
+			appPrefs.itemToolPrefs.imageScaleX = ScCLocale::toDoubleC(dc.attribute("PICTSCX"), 1.0);
+			appPrefs.itemToolPrefs.imageScaleY = ScCLocale::toDoubleC(dc.attribute("PICTSCY"), 1.0);
+			appPrefs.itemToolPrefs.imageScaleType = static_cast<bool>(dc.attribute("PSCALE", "1").toInt());
+			appPrefs.itemToolPrefs.imageAspectRatio = static_cast<bool>(dc.attribute("PASPECT", "0").toInt());
+			appPrefs.itemToolPrefs.imageUseEmbeddedPath = static_cast<bool>(dc.attribute("EmbeddedPath", "0").toInt());
+			appPrefs.itemToolPrefs.imageLowResType = dc.attribute("HalfRes", "1").toInt();
+			appPrefs.itemToolPrefs.polyCorners = dc.attribute("POLYC", "4").toInt();
+			appPrefs.itemToolPrefs.polyFactorValue2 = ScCLocale::toDoubleC(dc.attribute("POLYF"), 0.5);
+			appPrefs.itemToolPrefs.polyRotation = ScCLocale::toDoubleC(dc.attribute("POLYR"), 0.0);
 			appPrefs.itemToolPrefs.polyCurvature = ScCLocale::toDoubleC(dc.attribute("POLYCUR"), 0.0);
-			appPrefs.itemToolPrefs.polyFd = dc.attribute("POLYFD", "0").toInt();
-			appPrefs.itemToolPrefs.polyS  = static_cast<bool>(dc.attribute("POLYS", "0").toInt());
-			appPrefs.itemToolPrefs.dStartArrow = dc.attribute("StartArrow", "0").toInt();
-			appPrefs.itemToolPrefs.dEndArrow   = dc.attribute("EndArrow", "0").toInt();
+			appPrefs.itemToolPrefs.polyFactorValue = dc.attribute("POLYFD", "0").toInt();
+			appPrefs.itemToolPrefs.polyUseFactor  = static_cast<bool>(dc.attribute("POLYS", "0").toInt());
+			appPrefs.itemToolPrefs.lineStartArrow = dc.attribute("StartArrow", "0").toInt();
+			appPrefs.itemToolPrefs.lineEndArrow   = dc.attribute("EndArrow", "0").toInt();
 			appPrefs.opToolPrefs.dispX = ScCLocale::toDoubleC(dc.attribute("dispX"), 10.0);
 			appPrefs.opToolPrefs.dispY = ScCLocale::toDoubleC(dc.attribute("dispY"), 10.0);
 			appPrefs.opToolPrefs.constrain = ScCLocale::toDoubleC(dc.attribute("constrain"), 15.0);
@@ -2217,8 +2217,8 @@
 				else
 					newFont = tmpf;
 				if (!newFont.isEmpty())
-					appPrefs.itemToolPrefs.defFont = newFont;
-				appPrefs.itemToolPrefs.defSize = qRound( ScCLocale::toDoubleC(dc.attribute("SIZE"), 12.0) * 10.0 );
+					appPrefs.itemToolPrefs.textFont = newFont;
+				appPrefs.itemToolPrefs.textSize = qRound( ScCLocale::toDoubleC(dc.attribute("SIZE"), 12.0) * 10.0 );
 				appPrefs.fontPrefs.askBeforeSubstitute = static_cast<bool>(dc.attribute("AutomaticSubst", "1").toInt());
 			}
 		}
Index: scribus/sampleitem.cpp
===================================================================
--- scribus/sampleitem.cpp	(revision 13995)
+++ scribus/sampleitem.cpp	(revision 13996)
@@ -56,17 +56,17 @@
 	bgShade = 100;
 	tmpStyle.setName("(preview temporary)");
 	tmpStyle.setLineSpacingMode(ParagraphStyle::FixedLineSpacing);
-	tmpStyle.setLineSpacing((m_Doc->itemToolPrefs.defSize / 10.0)
+	tmpStyle.setLineSpacing((m_Doc->itemToolPrefs.textSize / 10.0)
 		* static_cast<double>(m_Doc->typographicSettings.autoLineSpacing) / 100
-		+ (m_Doc->itemToolPrefs.defSize / 10.0));
+		+ (m_Doc->itemToolPrefs.textSize / 10.0));
 	tmpStyle.setAlignment(ParagraphStyle::Leftaligned);
 	tmpStyle.setLeftMargin(0);
 	tmpStyle.setFirstIndent(0);
 	tmpStyle.setRightMargin(0);
 	tmpStyle.setGapBefore(0);
 	tmpStyle.setGapAfter(0);
-	tmpStyle.charStyle().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[m_Doc->itemToolPrefs.defFont]);
-	tmpStyle.charStyle().setFontSize(m_Doc->itemToolPrefs.defSize);
+	tmpStyle.charStyle().setFont(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts[m_Doc->itemToolPrefs.textFont]);
+	tmpStyle.charStyle().setFontSize(m_Doc->itemToolPrefs.textSize);
 //	tmpStyle.tabValues().clear();
 	tmpStyle.setHasDropCap(false);
 	tmpStyle.setDropCapLines(0);//2;
@@ -331,7 +331,7 @@
 	if (m_Doc->UsedFonts.contains(tmpStyle.charStyle().font().scName()))
 		previouslyUsedFont = true;
 
-	m_Doc->AddFont(tmpStyle.charStyle().font().scName(), qRound(m_Doc->itemToolPrefs.defSize / 10.0));
+	m_Doc->AddFont(tmpStyle.charStyle().font().scName(), qRound(m_Doc->itemToolPrefs.textSize / 10.0));
 //	m_Doc->docParagraphStyles.create(tmpStyle);
 //	int tmpIndex = m_Doc->docParagraphStyles.count() - 1;
 
Index: scribus/stencilreader.cpp
===================================================================
--- scribus/stencilreader.cpp	(revision 13995)
+++ scribus/stencilreader.cpp	(revision 13996)
@@ -1330,8 +1330,8 @@
 	ob.setAttribute("RADRECT", 0);
 	ob.setAttribute("FRTYPE",  3);
 	ob.setAttribute("CLIPEDIT", 1);
-	ob.setAttribute("TXTFILL", prefsManager->appPrefs.itemToolPrefs.dPenText);
-	ob.setAttribute("TXTSTROKE", prefsManager->appPrefs.itemToolPrefs.dStrokeText);
+	ob.setAttribute("TXTFILL", prefsManager->appPrefs.itemToolPrefs.textColor);
+	ob.setAttribute("TXTSTROKE", prefsManager->appPrefs.itemToolPrefs.textStrokeColor);
 	ob.setAttribute("TXTSTRSH", 100);
 	ob.setAttribute("TXTFILLSH", 100);
 	ob.setAttribute("TXTSCALE", 100);
@@ -1364,8 +1364,8 @@
 	ob.setAttribute("BASEOF", 0);
 	ob.setAttribute("FLIPPEDH", 0);
 	ob.setAttribute("FLIPPEDV", 0);
-	ob.setAttribute("IFONT", prefsManager->appPrefs.itemToolPrefs.defFont);
-	ob.setAttribute("ISIZE", prefsManager->appPrefs.itemToolPrefs.defSize / 10.0);
+	ob.setAttribute("IFONT", prefsManager->appPrefs.itemToolPrefs.textFont);
+	ob.setAttribute("ISIZE", prefsManager->appPrefs.itemToolPrefs.textSize / 10.0);
 	ob.setAttribute("SCALETYPE", 1);
 	ob.setAttribute("RATIO", 0);
 	ob.setAttribute("PRINTABLE", 1);
Index: scribus/scribusXml.cpp
===================================================================
--- scribus/scribusXml.cpp	(revision 13995)
+++ scribus/scribusXml.cpp	(revision 13996)
@@ -784,9 +784,9 @@
 	vg.setDropCapLines ( attrAsInt(attrs, "DROPLIN", 2) );
 	vg.setDropCapOffset( attrAsDbl(attrs, "DROPDIST", 0.0) );
 
-	tmpf = attrAsString(attrs, "FONT", doc->itemToolPrefs.defFont);
+	tmpf = attrAsString(attrs, "FONT", doc->itemToolPrefs.textFont);
 	if (tmpf.isEmpty())
-		tmpf = doc->itemToolPrefs.defFont;
+		tmpf = doc->itemToolPrefs.textFont;
 	tmf = tmpf;
 	if (!DoFonts.contains(tmpf))
 		tmpf = AskForFont(prefsManager->appPrefs.fontPrefs.AvailFonts, tmpf, doc);
@@ -796,9 +796,9 @@
 	vg.charStyle().setFont(prefsManager->appPrefs.fontPrefs.AvailFonts[tmpf]);
 	vg.charStyle().setFontSize(qRound(attrAsDbl(attrs, "FONTSIZE", 12.0) * 10.0));
 	vg.charStyle().setFeatures(static_cast<StyleFlag>(attrAsInt(attrs, "EFFECT", 0)).featureList());
-	vg.charStyle().setFillColor(attrAsString(attrs, "FCOLOR", doc->itemToolPrefs.dBrush));
+	vg.charStyle().setFillColor(attrAsString(attrs, "FCOLOR", doc->itemToolPrefs.shapeBrush));
 	vg.charStyle().setFillShade(attrAsInt(attrs, "FSHADE", 100));
-	vg.charStyle().setStrokeColor(attrAsString(attrs, "SCOLOR", doc->itemToolPrefs.dPen));
+	vg.charStyle().setStrokeColor(attrAsString(attrs, "SCOLOR", doc->itemToolPrefs.shapePen));
 	vg.charStyle().setStrokeShade(attrAsInt(attrs, "SSHADE", 100));
 	vg.charStyle().setShadowXOffset(qRound(attrAsDbl(attrs, "TXTSHX", 5.0) * 10));
 	vg.charStyle().setShadowYOffset(qRound(attrAsDbl(attrs, "TXTSHY", -5.0) * 10));
@@ -1039,7 +1039,7 @@
 		return false;
 
 	DoFonts.clear();
-	DoFonts[doc->itemToolPrefs.defFont] = doc->itemToolPrefs.defFont;
+	DoFonts[doc->itemToolPrefs.textFont] = doc->itemToolPrefs.textFont;
 	DoVorl.clear();
 	DoVorl[0] = "0";
 	DoVorl[1] = "1";
@@ -1216,11 +1216,11 @@
 				OB.NamedLStyle = "";
 			OB.itemText        = "";
 			OB.textAlignment   = attrAsInt(attrs, "ALIGN", 0);
-			tmf = attrAsString(attrs, "IFONT", doc->itemToolPrefs.defFont);
+			tmf = attrAsString(attrs, "IFONT", doc->itemToolPrefs.textFont);
 			if (tmf.isEmpty())
-				tmf = doc->itemToolPrefs.defFont;
+				tmf = doc->itemToolPrefs.textFont;
 			if (DoFonts[tmf].isEmpty())
-				OB.IFont = doc->itemToolPrefs.defFont;
+				OB.IFont = doc->itemToolPrefs.textFont;
 			else
 				OB.IFont = DoFonts[tmf];
 			// #7725
@@ -1461,7 +1461,7 @@
 			Neu->pixm.imgInfo.isRequest    = (loadRequests.count() > 0);
 			Neu->pixm.imgInfo.lowResType = lowResType;
 			Neu->pixm.imgInfo.actualPageNumber = actualPageNumber;
-			if ((Neu->effectsInUse.count() != 0) || (Neu->pixm.imgInfo.RequestProps.count() != 0) || (doc->itemToolPrefs.lowResType != lowResType))
+			if ((Neu->effectsInUse.count() != 0) || (Neu->pixm.imgInfo.RequestProps.count() != 0) || (doc->itemToolPrefs.imageLowResType != lowResType))
 				doc->LoadPict(Neu->Pfile, Neu->ItemNr, true);
 			if (Neu->pixm.imgInfo.PDSpathData.contains(itemClip))
 			{
@@ -1610,11 +1610,11 @@
 				OB.NamedLStyle = "";
 			OB.itemText        = "";
 			OB.textAlignment   = attrAsInt(attrs1, "ALIGN");
-			tmf = attrAsString(attrs1, "IFONT", doc->itemToolPrefs.defFont);
+			tmf = attrAsString(attrs1, "IFONT", doc->itemToolPrefs.textFont);
 			if (tmf.isEmpty())
-				tmf = doc->itemToolPrefs.defFont;
+				tmf = doc->itemToolPrefs.textFont;
 			if (DoFonts[tmf].isEmpty())
-				OB.IFont = doc->itemToolPrefs.defFont;
+				OB.IFont = doc->itemToolPrefs.textFont;
 			else
 				OB.IFont = DoFonts[tmf];
 			OB.LayerID  = attrAsInt(attrs1, "LAYER");
@@ -1759,7 +1759,7 @@
 			Neu->pixm.imgInfo.isRequest    = (loadRequests.count() > 0);
 			Neu->pixm.imgInfo.lowResType = lowResType;
 			Neu->pixm.imgInfo.actualPageNumber = actualPageNumber;
-			if ((Neu->effectsInUse.count() != 0) || (Neu->pixm.imgInfo.RequestProps.count() != 0) || (doc->itemToolPrefs.lowResType != lowResType))
+			if ((Neu->effectsInUse.count() != 0) || (Neu->pixm.imgInfo.RequestProps.count() != 0) || (doc->itemToolPrefs.imageLowResType != lowResType))
 				doc->LoadPict(Neu->Pfile, Neu->ItemNr, true);
 			if (Neu->pixm.imgInfo.PDSpathData.contains(patClipPath))
 			{
@@ -2567,7 +2567,7 @@
 void ScriXmlDoc::ReadLegacyCStyle (const QXmlStreamAttributes& attrs, CharStyle& newStyle, ScribusDoc* doc)
 {
 	bool hasFont = attrHasValue(attrs, "CFONT");
-	QString tmpf = attrAsString(attrs, "CFONT", doc->itemToolPrefs.defFont);
+	QString tmpf = attrAsString(attrs, "CFONT", doc->itemToolPrefs.textFont);
 	bool unknown = false;
 
 	ScFace dummy = ScFace::none();
@@ -2593,7 +2593,7 @@
 		if ((!appPrefs.fontPrefs.GFontSub.contains(tmpf)) || (!appPrefs.fontPrefs.AvailFonts[appPrefs.fontPrefs.GFontSub[tmpf]].usable()))
 		{
 			newReplacement = true;
-			ReplacedFonts.insert(tmpf, appPrefs.itemToolPrefs.defFont);
+			ReplacedFonts.insert(tmpf, appPrefs.itemToolPrefs.textFont);
 		}
 		else
 			ReplacedFonts.insert(tmpf, appPrefs.fontPrefs.GFontSub[tmpf]);
@@ -2688,7 +2688,7 @@
 		newStyle.setParent(attrAsString(attrs, "CPARENT", ""));
 	
 	if ( attrHasValue(attrs, "FONT"))
-		newStyle.setFont(doc->AllFonts->findFont(attrAsString(attrs, "FONT", doc->itemToolPrefs.defFont),doc));
+		newStyle.setFont(doc->AllFonts->findFont(attrAsString(attrs, "FONT", doc->itemToolPrefs.textFont),doc));
 	
 	if ( attrHasValue(attrs, "FONTSIZE"))
 		newStyle.setFontSize(qRound(attrAsDbl(attrs, "FONTSIZE", 12) * 10));
Index: scribus/canvasmode_drawbezier.cpp
===================================================================
--- scribus/canvasmode_drawbezier.cpp	(revision 13995)
+++ scribus/canvasmode_drawbezier.cpp	(revision 13996)
@@ -322,7 +322,7 @@
 	{
 		selectPage(m);
 		m_createTransaction = new UndoTransaction(UndoManager::instance()->beginTransaction());
-		z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.dWidthLine, CommonStrings::None, m_doc->itemToolPrefs.dPenLine, true);
+		z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.lineWidth, CommonStrings::None, m_doc->itemToolPrefs.lineColor, true);
 		currItem = m_doc->Items->at(z);
 		m_doc->m_Selection->clear();
 		m_doc->m_Selection->addItem(currItem);
Index: scribus/prefsstructs.h
===================================================================
--- scribus/prefsstructs.h	(revision 13995)
+++ scribus/prefsstructs.h	(revision 13996)
@@ -150,50 +150,50 @@
 struct ItemToolPrefs
 {
 	/* Texttool */
-	QString defFont;
-	int defSize;
-	QString dPenText;
-	int dTextPenShade;
-	QString dStrokeText;
-	int dTextStrokeShade;
-	QString dTextBackGround;
-	QString dTextLineColor;
-	int dTextBackGroundShade;
-	int dTextLineShade;
-	int dCols;
-	double dGap;
-	QString tabFillChar;
-	double dTabWidth;
+	QString textFont;
+	int textSize;
+	QString textColor;
+	int textShade;
+	QString textStrokeColor;
+	int textStrokeShade;
+	QString textBackground;
+	QString textLineColor;
+	int textBackgroundShade;
+	int textLineShade;
+	int textColumns;
+	double textColumnGap;
+	QString textTabFillChar;
+	double textTabWidth;
 	/* ShapeTool */
-	QString dPen;
-	QString dBrush;
-	int dShade;
-	int dShade2;
-	int dLineArt;
-	double dWidth;
+	QString shapePen;
+	QString shapeBrush;
+	int shapeShade;
+	int shapeShade2;
+	int shapeLineArt;
+	double shapeWidth;
 	/* Line Tool */
-	QString dPenLine;
-	int dShadeLine;
-	double dWidthLine;
-	int dLstyleLine;
-	int dStartArrow;
-	int dEndArrow;
+	QString lineColor;
+	int lineShade;
+	double lineWidth;
+	int lineStyle;
+	int lineStartArrow;
+	int lineEndArrow;
 	/* Regular Polygon Tool */
-	int polyC;
-	int polyFd;
-	double polyF;
-	bool polyS;
-	double polyR;
-	double polyCurvature;
-	/* Picture Tool */
-	QString dBrushPict;
-	int shadePict;
-	double scaleX;
-	double scaleY;
-	bool scaleType;
-	bool aspectRatio;
-	int lowResType;
-	bool useEmbeddedPath;
+	int polyCorners;  //! Number of corners for a polygon
+	int polyFactorValue; //! Factor as an integer????
+	double polyFactorValue2; //! Convex/Concave factor as a double
+	bool polyUseFactor; //! Whether to use a factor for shaping
+	double polyRotation; //! Rotation of a polygon
+	double polyCurvature; //! Curvature of polygon
+	/* Image Tool */
+	QString imageFillColor;
+	int imageFillShade;
+	double imageScaleX;
+	double imageScaleY;
+	bool imageScaleType;
+	bool imageAspectRatio;
+	int imageLowResType;
+	bool imageUseEmbeddedPath;
 };
 
 struct OperatorToolPrefs
@@ -294,30 +294,30 @@
 	bool gs_AntiAliasText; //! Tell Ghostscript to antialias text or not
 	bool gs_AntiAliasGraphics; //! Tell Ghostscript to antialias graphics or not
 	int gs_Resolution; //! Resolution of Ghostscript rendered graphics
-	QString imageEditorExecutable;
-	QString extBrowserExecutable;
-	QString uniconvExecutable;
+	QString imageEditorExecutable; //! Editor for graphics, defaults to Gimp
+	QString extBrowserExecutable; //! External browser for launching URLs in
+	QString uniconvExecutable; //! Uniconverter executable location
 	QStringList latexConfigs;
 	QMap<QString, QString> latexCommands;
-	QString latexEditorExecutable;
-	int latexResolution;
+	QString latexEditorExecutable; //! LaTeX executable location
+	int latexResolution; //! LaTeX export resolution
 	bool latexForceDpi;
 	bool latexStartWithEmptyFrames;
 };
 
 struct MiscellaneousPrefs
 {
-	bool haveStylePreview;
+	bool haveStylePreview; //! Show previews in the Style setup areas like Style Manager
 
 	// lorem ipsum
-	bool useStandardLI;
-	int paragraphsLI;
+	bool useStandardLI; //! Use the standard Lorem Ipsum text
+	int paragraphsLI; //! Number of paragraphs to insert with Lorem Ipsum text
 };
 
 struct StoryEditorPrefs
 {
-	QColor STEcolor;
-	QString STEfont;
+	QColor guiFontColor; //! Color of the text used in the Story Editor window
+	QString guiFont; //! Font of the text used in the Story Editor window
 };
 
 struct PrintPreviewPrefs
Index: scribus/scfonts.cpp
===================================================================
--- scribus/scfonts.cpp	(revision 13995)
+++ scribus/scfonts.cpp	(revision 13996)
@@ -587,7 +587,7 @@
 		QString replFont;
 		if ((!prefsManager->appPrefs.fontPrefs.GFontSub.contains(fontname)) || (!(*this)[prefsManager->appPrefs.fontPrefs.GFontSub[fontname]].usable()))
 		{
-			replFont = doc ? doc->itemToolPrefs.defFont : prefsManager->appPrefs.itemToolPrefs.defFont;
+			replFont = doc ? doc->itemToolPrefs.textFont : prefsManager->appPrefs.itemToolPrefs.textFont;
 		}
 		else
 			replFont = prefsManager->appPrefs.fontPrefs.GFontSub[fontname];
@@ -596,7 +596,7 @@
 	}
 	else if ( doc && !doc->UsedFonts.contains(fontname) )
 	{
-		doc->AddFont(fontname, qRound(doc->itemToolPrefs.defSize / 10.0));
+		doc->AddFont(fontname, qRound(doc->itemToolPrefs.textSize / 10.0));
 	}
 	return (*this)[fontname];	
 }
Index: scribus/pageitem.cpp
===================================================================
--- scribus/pageitem.cpp	(revision 13995)
+++ scribus/pageitem.cpp	(revision 13996)
@@ -317,7 +317,7 @@
 	patternRotation = 0;
 	m_lineWidth = w2;
 	Oldm_lineWidth = w2;
-	PLineArt = Qt::PenStyle(m_Doc->itemToolPrefs.dLineArt);
+	PLineArt = Qt::PenStyle(m_Doc->itemToolPrefs.shapeLineArt);
 	PLineEnd = Qt::FlatCap;
 	PLineJoin = Qt::MiterJoin;
 	Select = false;
@@ -334,7 +334,7 @@
 	MaxChars = 0;
 	Pfile = "";
 	pixm = ScImage();
-	pixm.imgInfo.lowResType = m_Doc->itemToolPrefs.lowResType;
+	pixm.imgInfo.lowResType = m_Doc->itemToolPrefs.imageLowResType;
 	Pfile2 = "";
 	Pfile3 = "";
 	oldLocalScX = LocalScX = 1;
@@ -451,12 +451,12 @@
 	}
 	else
 	{
-		if (m_Doc->itemToolPrefs.dBrush != CommonStrings::None)
+		if (m_Doc->itemToolPrefs.shapeBrush != CommonStrings::None)
 		{
-			const ScColor& col = m_Doc->PageColors[m_Doc->itemToolPrefs.dBrush];
+			const ScColor& col = m_Doc->PageColors[m_Doc->itemToolPrefs.shapeBrush];
 			QColor qcol = ScColorEngine::getRGBColor(col, m_Doc);
-			fill_gradient.addStop(qcol, 0.0, 0.5, 1.0, m_Doc->itemToolPrefs.dBrush, 100);
-			fill_gradient.addStop(qcol, 1.0, 0.5, 1.0, m_Doc->itemToolPrefs.dBrush, 100);
+			fill_gradient.addStop(qcol, 0.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapeBrush, 100);
+			fill_gradient.addStop(qcol, 1.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapeBrush, 100);
 		}
 		else
 		{
@@ -469,12 +469,12 @@
 			}
 			else
 			{
-				if (m_Doc->itemToolPrefs.dPen != CommonStrings::None)
+				if (m_Doc->itemToolPrefs.shapePen != CommonStrings::None)
 				{
-					const ScColor& col = m_Doc->PageColors[m_Doc->itemToolPrefs.dPen];
+					const ScColor& col = m_Doc->PageColors[m_Doc->itemToolPrefs.shapePen];
 					QColor qcol = ScColorEngine::getRGBColor(col, m_Doc);
-					fill_gradient.addStop(qcol, 0.0, 0.5, 1.0, m_Doc->itemToolPrefs.dPen, 100);
-					fill_gradient.addStop(qcol, 1.0, 0.5, 1.0, m_Doc->itemToolPrefs.dPen, 100);
+					fill_gradient.addStop(qcol, 0.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapePen, 100);
+					fill_gradient.addStop(qcol, 1.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapePen, 100);
 				}
 				else if (m_Doc->PageColors.contains("Black"))
 				{
@@ -487,8 +487,8 @@
 		}
 	}
 	firstLineOffsetP = FLOPRealGlyphHeight;
-	Cols = m_Doc->itemToolPrefs.dCols;
-	ColGap = m_Doc->itemToolPrefs.dGap;
+	Cols = m_Doc->itemToolPrefs.textColumns;
+	ColGap = m_Doc->itemToolPrefs.textColumnGap;
 	LeftLink = 0;
 	RightLink = 0;
 	TopLink = 0;
@@ -510,8 +510,8 @@
 	ChangedMasterItem = false;
 	isEmbedded = false;
 	OnMasterPage = m_Doc->currentPage() ? m_Doc->currentPage()->pageName() : QString();
-	m_startArrowIndex = m_Doc->itemToolPrefs.dStartArrow;
-	m_endArrowIndex = m_Doc->itemToolPrefs.dEndArrow;
+	m_startArrowIndex = m_Doc->itemToolPrefs.lineStartArrow;
+	m_endArrowIndex = m_Doc->itemToolPrefs.lineEndArrow;
 	effectsInUse.clear();
 	//Page Item Attributes
 	pageItemAttributes.clear();
@@ -2278,15 +2278,15 @@
 				case ImageFrame:
 				case LatexFrame:
 				case OSGFrame:
-					tmp = m_Doc->itemToolPrefs.dBrushPict;
+					tmp = m_Doc->itemToolPrefs.imageFillColor;
 				case TextFrame:
 				case PathText:
-					tmp = m_Doc->itemToolPrefs.dTextBackGround;
+					tmp = m_Doc->itemToolPrefs.textBackground;
 					break;
 				case Line:
 				case PolyLine:
 				case Polygon:
-					tmp = m_Doc->itemToolPrefs.dBrush;
+					tmp = m_Doc->itemToolPrefs.shapeBrush;
 					break;
 				default:
 					break;
@@ -2381,17 +2381,17 @@
 			{
 				case TextFrame:
 				case PathText:
-					tmp = m_Doc->itemToolPrefs.dTextLineColor;
+					tmp = m_Doc->itemToolPrefs.textLineColor;
 					break;
 				case Line:
-					tmp = m_Doc->itemToolPrefs.dPenLine;
+					tmp = m_Doc->itemToolPrefs.lineColor;
 					break;
 				case PolyLine:
 				case Polygon:
 				case ImageFrame:
 				case LatexFrame:
 				case OSGFrame:
-					tmp = m_Doc->itemToolPrefs.dPen;
+					tmp = m_Doc->itemToolPrefs.shapePen;
 					break;
 				default:
 					break;
@@ -2450,24 +2450,24 @@
 			{
 				case TextFrame:
 				case PathText:
-					lineColorVal = m_Doc->itemToolPrefs.dTextLineColor;
+					lineColorVal = m_Doc->itemToolPrefs.textLineColor;
 					break;
 				case Line:
-					lineColorVal = m_Doc->itemToolPrefs.dPenLine;
+					lineColorVal = m_Doc->itemToolPrefs.lineColor;
 					break;
 				case PolyLine:
 				case Polygon:
 				case ImageFrame:
 				case LatexFrame:
 				case OSGFrame:
-					lineColorVal = m_Doc->itemToolPrefs.dPen;
+					lineColorVal = m_Doc->itemToolPrefs.shapePen;
 					break;
 				default:
 					break;
 			}
 		}
 		if (!m_Doc->PageColors.contains(lineColorVal))
-			lineColorVal = m_Doc->itemToolPrefs.dPen;
+			lineColorVal = m_Doc->itemToolPrefs.shapePen;
 		const ScColor& col = m_Doc->PageColors[lineColorVal];
 		strokeQColor = ScColorEngine::getShadeColorProof(col, m_Doc, lineShadeVal);
 	}
@@ -2489,15 +2489,15 @@
 				case ImageFrame:
 				case LatexFrame:
 				case OSGFrame:
-					fillColorVal = m_Doc->itemToolPrefs.dBrushPict;
+					fillColorVal = m_Doc->itemToolPrefs.imageFillColor;
 				case TextFrame:
 				case PathText:
-					fillColorVal = m_Doc->itemToolPrefs.dTextBackGround;
+					fillColorVal = m_Doc->itemToolPrefs.textBackground;
 					break;
 				case Line:
 				case PolyLine:
 				case Polygon:
-					fillColorVal = m_Doc->itemToolPrefs.dBrush;
+					fillColorVal = m_Doc->itemToolPrefs.shapeBrush;
 					break;
 				default:
 					break;
@@ -4693,7 +4693,7 @@
 			oldLocalX = LocalX = 0;
 			oldLocalY = LocalY = 0;
 			
-			if ((m_Doc->itemToolPrefs.useEmbeddedPath) && (!pixm.imgInfo.clipPath.isEmpty()))
+			if ((m_Doc->itemToolPrefs.imageUseEmbeddedPath) && (!pixm.imgInfo.clipPath.isEmpty()))
 			{
 				pixm.imgInfo.usedPath = pixm.imgInfo.clipPath;
 				clPath = pixm.imgInfo.clipPath;
Index: scribus/scribusview.cpp
===================================================================
--- scribus/scribusview.cpp	(revision 13995)
+++ scribus/scribusview.cpp	(revision 13996)
@@ -211,7 +211,7 @@
 	previewQualitySwitcher->addItem(tr("Normal"));
 	previewQualitySwitcher->addItem(tr("Low"));
 // 	setCurrentComboItem(previewQualitySwitcher, tr("Normal"));
-	previewQualitySwitcher->setCurrentIndex(Prefs->itemToolPrefs.lowResType);
+	previewQualitySwitcher->setCurrentIndex(Prefs->itemToolPrefs.imageLowResType);
 
 	zoomSpinBox = new ScrSpinBox( 10, 3200, this, 6 );
 	zoomSpinBox->setTabAdvance(false);
@@ -978,7 +978,7 @@
 		//SeleItemPos is from 1.2.x. Needs reenabling for dragging *TO* a frame
 		if ((fi.exists()) && (img) && !selectedItemByDrag && !vectorFile)// && (!SeleItemPos(e->pos())))
 		{
-			int z = Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, dropPosDoc.x(), dropPosDoc.y(), 1, 1, Doc->itemToolPrefs.dWidth, Doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+			int z = Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, dropPosDoc.x(), dropPosDoc.y(), 1, 1, Doc->itemToolPrefs.shapeWidth, Doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 			PageItem *b = Doc->Items->at(z);
 			b->LayerID = Doc->activeLayer();
 			Doc->LoadPict(url.toLocalFile(), b->ItemNr);
@@ -3444,7 +3444,7 @@
 		break;
 	//
 	case PageItem::ImageFrame:
-		z = Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, x, y, w, h, 1, Doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+		z = Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, x, y, w, h, 1, Doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 		undoManager->setUndoEnabled(false);
 		Doc->Items->at(z)->setImageXYScale(Buffer->LocalScX, Buffer->LocalScY);
 		Doc->Items->at(z)->setImageXYOffset(Buffer->LocalX, Buffer->LocalY);
@@ -3575,7 +3575,7 @@
 			if (Doc->AllFonts->contains(Buffer->IFont))
 				pstyle.charStyle().setFont((*Doc->AllFonts)[Buffer->IFont]);
 			else
-				pstyle.charStyle().setFont((*Doc->AllFonts)[Doc->itemToolPrefs.defFont]);
+				pstyle.charStyle().setFont((*Doc->AllFonts)[Doc->itemToolPrefs.textFont]);
 			pstyle.charStyle().setFontSize(Buffer->ISize);
 			pstyle.charStyle().setFillColor(Buffer->TxtFill);
 			pstyle.charStyle().setStrokeColor(Buffer->TxtStroke);
@@ -3611,7 +3611,7 @@
 		break;
 	case PageItem::LatexFrame:
 		{
-		z = Doc->itemAdd(PageItem::LatexFrame, PageItem::Unspecified, x, y, w, h, 1, Doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+		z = Doc->itemAdd(PageItem::LatexFrame, PageItem::Unspecified, x, y, w, h, 1, Doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 		undoManager->setUndoEnabled(false);
 		Doc->Items->at(z)->setImageXYScale(Buffer->LocalScX, Buffer->LocalScY);
 		Doc->Items->at(z)->setImageXYOffset(Buffer->LocalX, Buffer->LocalY);
@@ -3634,7 +3634,7 @@
 		}
 	case PageItem::OSGFrame:
 #ifdef HAVE_OSG
-		z = Doc->itemAdd(PageItem::OSGFrame, PageItem::Unspecified, x, y, w, h, 1, Doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+		z = Doc->itemAdd(PageItem::OSGFrame, PageItem::Unspecified, x, y, w, h, 1, Doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 		undoManager->setUndoEnabled(false);
 		Doc->Items->at(z)->setImageXYScale(Buffer->LocalScX, Buffer->LocalScY);
 		Doc->Items->at(z)->setImageXYOffset(Buffer->LocalX, Buffer->LocalY);
@@ -3815,7 +3815,7 @@
 	if (currItem->asImageFrame())
 		currItem->AdjustPictScale();
 //	if (!(currItem->asTextFrame()) && !(currItem->asPathText()))
-//		currItem->setFont(Doc->toolSettings.defFont);
+//		currItem->setFont(Doc->toolSettings.textFont);
 	if (currItem->asPathText())
 	{
 		currItem->ClipEdited = true;
Index: scribus/plugins/wmfimplugin/wmfimport.cpp
===================================================================
--- scribus/plugins/wmfimplugin/wmfimport.cpp	(revision 13995)
+++ scribus/plugins/wmfimplugin/wmfimport.cpp	(revision 13996)
@@ -576,7 +576,7 @@
 	m_Doc->view()->updatesOn(false);
 	m_Doc->scMW()->ScriptRunning = true;
 	qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
-	//gc->Family = m_Doc->toolSettings.defFont;
+	//gc->Family = m_Doc->toolSettings.textFont;
 	m_Doc->PageColors.ensureBlackAndWhite();
 	//m_gc.push( gc );
 	QList<PageItem*> Elements = parseWmfCommands();
@@ -640,7 +640,7 @@
 			double gw = maxx - minx;
 			double gh = maxy - miny;
 			PageItem *high = m_Doc->Items->at(highestItem);
-			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.dBrush, m_Doc->itemToolPrefs.dPen, true);
+			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
 			PageItem *neu = m_Doc->Items->takeAt(z);
 			m_Doc->Items->insert(lowestItem, neu);
 			neu->Groups.push(m_Doc->GroupCounter);
Index: scribus/plugins/aiimplugin/importai.cpp
===================================================================
--- scribus/plugins/aiimplugin/importai.cpp	(revision 13995)
+++ scribus/plugins/aiimplugin/importai.cpp	(revision 13996)
@@ -258,7 +258,7 @@
 				double gw = maxx - minx;
 				double gh = maxy - miny;
 				PageItem *high = m_Doc->Items->at(highestItem);
-				int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.dBrush, m_Doc->itemToolPrefs.dPen, true);
+				int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
 				PageItem *neu = m_Doc->Items->takeAt(z);
 				m_Doc->Items->insert(lowestItem, neu);
 				neu->Groups.push(m_Doc->GroupCounter);
@@ -1819,7 +1819,7 @@
 			QString family = textFont;
 			QString ret = "";
 			family.replace( QRegExp( "'" ) , QChar( ' ' ) );
-			textFont = m_Doc->itemToolPrefs.defFont;
+			textFont = m_Doc->itemToolPrefs.textFont;
 			bool found = false;
 			SCFontsIterator it(PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts);
 			for ( ; it.hasNext(); it.next())
Index: scribus/plugins/xfigimplugin/importxfig.cpp
===================================================================
--- scribus/plugins/xfigimplugin/importxfig.cpp	(revision 13995)
+++ scribus/plugins/xfigimplugin/importxfig.cpp	(revision 13996)
@@ -276,7 +276,7 @@
 				double gw = maxx - minx;
 				double gh = maxy - miny;
 				PageItem *high = m_Doc->Items->at(highestItem);
-				int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.dBrush, m_Doc->itemToolPrefs.dPen, true);
+				int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
 				PageItem *neu = m_Doc->Items->takeAt(z);
 				m_Doc->Items->insert(lowestItem, neu);
 				neu->Groups.push(m_Doc->GroupCounter);
@@ -1213,7 +1213,7 @@
 	text = cleanText(text);
 	FPointArray textPath;
 	QPainterPath painterPath;
-	QString TFont = m_Doc->itemToolPrefs.defFont;
+	QString TFont = m_Doc->itemToolPrefs.textFont;
 	QFont::Weight weight = QFont::Normal;
 	bool isItalic = false;
 	if (font_flags & 4)
@@ -1370,7 +1370,7 @@
 				weight = QFont::Normal;
 				break;
 			default:
-				TFont = m_Doc->itemToolPrefs.defFont;
+				TFont = m_Doc->itemToolPrefs.textFont;
 				weight = QFont::Normal;
 				break;
 		}
@@ -1401,7 +1401,7 @@
 				weight = QFont::Normal;
 				break;
 			default:
-				TFont = m_Doc->itemToolPrefs.defFont;
+				TFont = m_Doc->itemToolPrefs.textFont;
 				weight = QFont::Normal;
 				break;
 		}
Index: scribus/plugins/wpgimplugin/importwpg.cpp
===================================================================
--- scribus/plugins/wpgimplugin/importwpg.cpp	(revision 13995)
+++ scribus/plugins/wpgimplugin/importwpg.cpp	(revision 13996)
@@ -441,7 +441,7 @@
 	}
 	double w = (bitmap.rect.x2 - bitmap.rect.x1) * 72.0;
 	double h = (bitmap.rect.y2 - bitmap.rect.y1) * 72.0;
-	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, bitmap.rect.x1 * 72 + baseX, bitmap.rect.y1 * 72 + baseY, w, h, 1, m_Doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, bitmap.rect.x1 * 72 + baseX, bitmap.rect.y1 * 72 + baseY, w, h, 1, m_Doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 	PageItem *ite = m_Doc->Items->at(z);
 	ite->tempImageFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_wpg_XXXXXX.png");
 	ite->tempImageFile->open();
@@ -615,7 +615,7 @@
 				double gw = maxx - minx;
 				double gh = maxy - miny;
 				PageItem *high = m_Doc->Items->at(highestItem);
-				int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.dBrush, m_Doc->itemToolPrefs.dPen, true);
+				int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
 				PageItem *neu = m_Doc->Items->takeAt(z);
 				m_Doc->Items->insert(lowestItem, neu);
 				neu->Groups.push(m_Doc->GroupCounter);
Index: scribus/plugins/svgimplugin/svgplugin.cpp
===================================================================
--- scribus/plugins/svgimplugin/svgplugin.cpp	(revision 13995)
+++ scribus/plugins/svgimplugin/svgplugin.cpp	(revision 13996)
@@ -307,7 +307,7 @@
 	m_Doc->view()->updatesOn(false);
 	m_Doc->scMW()->ScriptRunning = true;
 	qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
-	gc->FontFamily = m_Doc->itemToolPrefs.defFont;
+	gc->FontFamily = m_Doc->itemToolPrefs.textFont;
 	if (!m_Doc->PageColors.contains("Black"))
 		m_Doc->PageColors.insert("Black", ScColor(0, 0, 0, 255));
 	m_gc.push( gc );
@@ -403,7 +403,7 @@
 			double gw = maxx - minx;
 			double gh = maxy - miny;
 			PageItem *high = m_Doc->Items->at(highestItem);
-			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.dBrush, m_Doc->itemToolPrefs.dPen, true);
+			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
 			PageItem *neu = m_Doc->Items->takeAt(z);
 			m_Doc->Items->insert(lowestItem, neu);
 			neu->Groups.push(m_Doc->GroupCounter);
@@ -1217,7 +1217,7 @@
 	double h = e.attribute( "height" ).isEmpty() ? 1.0 : parseUnit( e.attribute( "height" ) );
 	setupNode(e);
 	parseClipPathAttr(e, clipPath);
-	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, x+BaseX, y+BaseY, w, h, 1, m_Doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+	int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, x+BaseX, y+BaseY, w, h, 1, m_Doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 	PageItem* ite = m_Doc->Items->at(z);
 	if (!fname.isEmpty())
 	{
Index: scribus/plugins/fileloader/scribus12format/scribus12format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus12format/scribus12format.cpp	(revision 13995)
+++ scribus/plugins/fileloader/scribus12format/scribus12format.cpp	(revision 13996)
@@ -295,13 +295,13 @@
 		m_Doc->guidesSettings.showPic = true;
 		m_Doc->guidesSettings.showControls = false;
 // 		DoFonts.clear();
-		m_Doc->itemToolPrefs.defSize=qRound(ScCLocale::toDoubleC(dc.attribute("DSIZE")) * 10);
+		m_Doc->itemToolPrefs.textSize=qRound(ScCLocale::toDoubleC(dc.attribute("DSIZE")) * 10);
 		Defont=dc.attribute("DFONT");
-		m_Doc->itemToolPrefs.defFont = prefsManager->appPrefs.itemToolPrefs.defFont;
+		m_Doc->itemToolPrefs.textFont = prefsManager->appPrefs.itemToolPrefs.textFont;
 		m_AvailableFonts->findFont(Defont, m_Doc);
-		m_Doc->itemToolPrefs.defFont = Defont;
-		m_Doc->itemToolPrefs.dCols=dc.attribute("DCOL", "1").toInt();
-		m_Doc->itemToolPrefs.dGap=ScCLocale::toDoubleC(dc.attribute("DGAP"), 0.0);
+		m_Doc->itemToolPrefs.textFont = Defont;
+		m_Doc->itemToolPrefs.textColumns=dc.attribute("DCOL", "1").toInt();
+		m_Doc->itemToolPrefs.textColumnGap=ScCLocale::toDoubleC(dc.attribute("DGAP"), 0.0);
 		m_Doc->documentInfo.setAuthor(dc.attribute("AUTHOR"));
 		m_Doc->documentInfo.setComments(dc.attribute("COMMENTS"));
 		m_Doc->documentInfo.setKeywords(dc.attribute("KEYWORDS",""));
@@ -353,8 +353,8 @@
 		m_Doc->useRaster = static_cast<bool>(dc.attribute("SnapToGrid", "0").toInt());
 		m_Doc->guidesSettings.minorGridSpacing = ScCLocale::toDoubleC(dc.attribute("MINGRID"), prefsManager->appPrefs.guidesPrefs.minorGridSpacing);
 		m_Doc->guidesSettings.majorGridSpacing = ScCLocale::toDoubleC(dc.attribute("MAJGRID"), prefsManager->appPrefs.guidesPrefs.majorGridSpacing);
-		m_Doc->itemToolPrefs.dStartArrow = 0;
-		m_Doc->itemToolPrefs.dEndArrow = 0;
+		m_Doc->itemToolPrefs.lineStartArrow = 0;
+		m_Doc->itemToolPrefs.lineEndArrow = 0;
 		m_Doc->LastAuto = 0;
 		QDomNode PAGE=DOC.firstChild();
 		counter = 0;
@@ -492,7 +492,7 @@
 					OB.textAlignment = obj.attribute("ALIGN", "0").toInt();
 					OB.startArrowIndex =  0;
 					OB.endArrowIndex =  0;
-					tmpf = obj.attribute("IFONT", m_Doc->itemToolPrefs.defFont);
+					tmpf = obj.attribute("IFONT", m_Doc->itemToolPrefs.textFont);
 					m_AvailableFonts->findFont(tmpf, m_Doc);
 					OB.IFont = tmpf;
 					OB.LayerID = obj.attribute("LAYER", "0").toInt();
@@ -1056,7 +1056,7 @@
 	tmp2.replace(QRegExp("\t"), QChar(4));
 	tmp2.replace(SpecialChars::OLD_NBHYPHEN, SpecialChars::NBHYPHEN);
 	tmp2.replace(SpecialChars::OLD_NBSPACE, SpecialChars::NBSPACE);
-	tmpf = it->attribute("CFONT", doc->itemToolPrefs.defFont);
+	tmpf = it->attribute("CFONT", doc->itemToolPrefs.textFont);
 	doc->AllFonts->findFont(tmpf, doc);
 	int size = qRound(ScCLocale::toDoubleC(it->attribute("CSIZE")) * 10);
 	QString fcolor = it->attribute("CCOLOR");
@@ -1345,9 +1345,9 @@
 					if ((OB.isBookmark) && (m_Doc->BookMarks.count() == 0))
 						m_Doc->OldBM = true;
 					OB.textAlignment = obj.attribute("ALIGN", "0").toInt();
-					tmpf = obj.attribute("IFONT", m_Doc->itemToolPrefs.defFont);
+					tmpf = obj.attribute("IFONT", m_Doc->itemToolPrefs.textFont);
 					if (tmpf.isEmpty())
-						tmpf = m_Doc->itemToolPrefs.defFont;
+						tmpf = m_Doc->itemToolPrefs.textFont;
 					m_AvailableFonts->findFont(tmpf, m_Doc);
 					OB.IFont = tmpf;
 					OB.LayerID = layerTrans[obj.attribute("LAYER", "0").toInt()];
@@ -1518,9 +1518,9 @@
 	vg->setAlignment(static_cast<ParagraphStyle::AlignmentType>(pg->attribute("ALIGN").toInt()));
 	vg->setGapBefore(ScCLocale::toDoubleC(pg->attribute("VOR"), 0.0));
 	vg->setGapAfter(ScCLocale::toDoubleC(pg->attribute("NACH"), 0.0));
-	tmpf = pg->attribute("FONT", doc->itemToolPrefs.defFont);
+	tmpf = pg->attribute("FONT", doc->itemToolPrefs.textFont);
 	if (tmpf.isEmpty())
-		tmpf = doc->itemToolPrefs.defFont;
+		tmpf = doc->itemToolPrefs.textFont;
 	PrefsManager *prefsManager=PrefsManager::instance();
 	prefsManager->appPrefs.fontPrefs.AvailFonts.findFont(tmpf, doc);
 	vg->charStyle().setFont(prefsManager->appPrefs.fontPrefs.AvailFonts[tmpf]);
@@ -1529,10 +1529,10 @@
 	vg->setDropCapLines(pg->attribute("DROPLIN", "2").toInt());
 	vg->setDropCapOffset(ScCLocale::toDoubleC(pg->attribute("DROPDIST"), 0.0));
 	vg->charStyle().setFeatures(static_cast<StyleFlag>((pg->attribute("EFFECT", "0").toInt())).featureList());
-	fColor = pg->attribute("FCOLOR", doc->itemToolPrefs.dBrush);
+	fColor = pg->attribute("FCOLOR", doc->itemToolPrefs.shapeBrush);
 	fShade = pg->attribute("FSHADE", "100").toInt();
 	handleOldColorShade(doc, fColor, fShade);
-	sColor = pg->attribute("SCOLOR", doc->itemToolPrefs.dPen);
+	sColor = pg->attribute("SCOLOR", doc->itemToolPrefs.shapePen);
 	sShade = pg->attribute("SSHADE", "100").toInt();
 	handleOldColorShade(doc, sColor, sShade);
 	vg->charStyle().setFillColor(fColor);
Index: scribus/plugins/fileloader/scribus13format/scribus13format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 13995)
+++ scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 13996)
@@ -260,14 +260,14 @@
 		m_Doc->PageSp = dc.attribute("AUTOSPALTEN").toInt();
 		m_Doc->PageSpa= ScCLocale::toDoubleC(dc.attribute("ABSTSPALTEN"));
 		m_Doc->setUnitIndex(dc.attribute("UNITS", "0").toInt());
-		m_Doc->itemToolPrefs.defSize=qRound(ScCLocale::toDoubleC(dc.attribute("DSIZE")) * 10);
+		m_Doc->itemToolPrefs.textSize=qRound(ScCLocale::toDoubleC(dc.attribute("DSIZE")) * 10);
 		Defont=dc.attribute("DFONT");
 		//findFont will use that if it doesnt find the font:
-		m_Doc->itemToolPrefs.defFont = prefsManager->appPrefs.itemToolPrefs.defFont;
+		m_Doc->itemToolPrefs.textFont = prefsManager->appPrefs.itemToolPrefs.textFont;
 		m_AvailableFonts->findFont(Defont, m_Doc);
-		m_Doc->itemToolPrefs.defFont = Defont;
-		m_Doc->itemToolPrefs.dCols= dc.attribute("DCOL", "1").toInt();
-		m_Doc->itemToolPrefs.dGap = ScCLocale::toDoubleC(dc.attribute("DGAP"), 0.0);
+		m_Doc->itemToolPrefs.textFont = Defont;
+		m_Doc->itemToolPrefs.textColumns= dc.attribute("DCOL", "1").toInt();
+		m_Doc->itemToolPrefs.textColumnGap = ScCLocale::toDoubleC(dc.attribute("DGAP"), 0.0);
 		m_Doc->documentInfo.setAuthor(dc.attribute("AUTHOR"));
 		m_Doc->documentInfo.setComments(dc.attribute("COMMENTS"));
 		m_Doc->documentInfo.setKeywords(dc.attribute("KEYWORDS",""));
@@ -350,12 +350,12 @@
 		m_Doc->rulerYoffset = ScCLocale::toDoubleC(dc.attribute("rulerYoffset"), 0.0);
 		m_Doc->SnapGuides = static_cast<bool>(dc.attribute("SnapToGuides", "0").toInt());
 		m_Doc->useRaster = static_cast<bool>(dc.attribute("SnapToGrid", "0").toInt());
-		m_Doc->itemToolPrefs.polyC = dc.attribute("POLYC", "4").toInt();
-		m_Doc->itemToolPrefs.polyF = ScCLocale::toDoubleC(dc.attribute("POLYF"), 0.5);
-		m_Doc->itemToolPrefs.polyR = ScCLocale::toDoubleC(dc.attribute("POLYR"), 0.0);
+		m_Doc->itemToolPrefs.polyCorners = dc.attribute("POLYC", "4").toInt();
+		m_Doc->itemToolPrefs.polyFactorValue2 = ScCLocale::toDoubleC(dc.attribute("POLYF"), 0.5);
+		m_Doc->itemToolPrefs.polyRotation = ScCLocale::toDoubleC(dc.attribute("POLYR"), 0.0);
 		m_Doc->itemToolPrefs.polyCurvature = 0.0;
-		m_Doc->itemToolPrefs.polyFd = dc.attribute("POLYFD", "0").toInt();
-		m_Doc->itemToolPrefs.polyS = static_cast<bool>(dc.attribute("POLYS", "0").toInt());
+		m_Doc->itemToolPrefs.polyFactorValue = dc.attribute("POLYFD", "0").toInt();
+		m_Doc->itemToolPrefs.polyUseFactor = static_cast<bool>(dc.attribute("POLYS", "0").toInt());
 		m_Doc->AutoSave = static_cast<bool>(dc.attribute("AutoSave", "0").toInt());
 		m_Doc->AutoSaveTime = dc.attribute("AutoSaveTime", "600000").toInt();
 		m_Doc->scratch.Bottom = ScCLocale::toDoubleC(dc.attribute("ScratchBottom"), 20.0);
@@ -367,48 +367,48 @@
 			m_Doc->scratch.Left = ScCLocale::toDoubleC(dc.attribute("ScratchLeft"), 100.0);
 		m_Doc->scratch.Right = ScCLocale::toDoubleC(dc.attribute("ScratchRight"), 100.0);
 		m_Doc->scratch.Top   = ScCLocale::toDoubleC(dc.attribute("ScratchTop"), 20.0);
-		m_Doc->itemToolPrefs.dStartArrow = dc.attribute("StartArrow", "0").toInt();
-		m_Doc->itemToolPrefs.dEndArrow = dc.attribute("EndArrow", "0").toInt();
-		m_Doc->itemToolPrefs.scaleX = ScCLocale::toDoubleC(dc.attribute("PICTSCX"), 1.0);
-		m_Doc->itemToolPrefs.scaleY = ScCLocale::toDoubleC(dc.attribute("PICTSCY"), 1.0);
-		m_Doc->itemToolPrefs.scaleType = static_cast<bool>(dc.attribute("PSCALE", "1").toInt());
-		m_Doc->itemToolPrefs.aspectRatio = static_cast<bool>(dc.attribute("PASPECT", "0").toInt());
-		m_Doc->itemToolPrefs.lowResType = dc.attribute("HalfRes", "1").toInt();
-		m_Doc->itemToolPrefs.useEmbeddedPath = static_cast<bool>(dc.attribute("EmbeddedPath", "0").toInt());
+		m_Doc->itemToolPrefs.lineStartArrow = dc.attribute("StartArrow", "0").toInt();
+		m_Doc->itemToolPrefs.lineEndArrow = dc.attribute("EndArrow", "0").toInt();
+		m_Doc->itemToolPrefs.imageScaleX = ScCLocale::toDoubleC(dc.attribute("PICTSCX"), 1.0);
+		m_Doc->itemToolPrefs.imageScaleY = ScCLocale::toDoubleC(dc.attribute("PICTSCY"), 1.0);
+		m_Doc->itemToolPrefs.imageScaleType = static_cast<bool>(dc.attribute("PSCALE", "1").toInt());
+		m_Doc->itemToolPrefs.imageAspectRatio = static_cast<bool>(dc.attribute("PASPECT", "0").toInt());
+		m_Doc->itemToolPrefs.imageLowResType = dc.attribute("HalfRes", "1").toInt();
+		m_Doc->itemToolPrefs.imageUseEmbeddedPath = static_cast<bool>(dc.attribute("EmbeddedPath", "0").toInt());
 		if (dc.hasAttribute("PEN"))
-			m_Doc->itemToolPrefs.dPen = dc.attribute("PEN");
+			m_Doc->itemToolPrefs.shapePen = dc.attribute("PEN");
 		if (dc.hasAttribute("BRUSH"))
-			m_Doc->itemToolPrefs.dBrush = dc.attribute("BRUSH");
+			m_Doc->itemToolPrefs.shapeBrush = dc.attribute("BRUSH");
 		if (dc.hasAttribute("PENLINE"))
-			m_Doc->itemToolPrefs.dPenLine = dc.attribute("PENLINE");
+			m_Doc->itemToolPrefs.lineColor = dc.attribute("PENLINE");
 		if (dc.hasAttribute("PENTEXT"))
-			m_Doc->itemToolPrefs.dPenText = dc.attribute("PENTEXT");
+			m_Doc->itemToolPrefs.textColor = dc.attribute("PENTEXT");
 		if (dc.hasAttribute("StrokeText"))
-			m_Doc->itemToolPrefs.dStrokeText = dc.attribute("StrokeText");
-		m_Doc->itemToolPrefs.dTextBackGround = dc.attribute("TextBackGround", CommonStrings::None);
-		m_Doc->itemToolPrefs.dTextLineColor = dc.attribute("TextLineColor", CommonStrings::None);
-		m_Doc->itemToolPrefs.dTextBackGroundShade = dc.attribute("TextBackGroundShade", "100").toInt();
-		m_Doc->itemToolPrefs.dTextLineShade = dc.attribute("TextLineShade", "100").toInt();
-		m_Doc->itemToolPrefs.dTextPenShade = dc.attribute("TextPenShade", "100").toInt();
-		m_Doc->itemToolPrefs.dTextStrokeShade = dc.attribute("TextStrokeShade", "100").toInt();
-		m_Doc->itemToolPrefs.dLineArt = static_cast<Qt::PenStyle>(dc.attribute("STIL").toInt());
-		m_Doc->itemToolPrefs.dLstyleLine = static_cast<Qt::PenStyle>(dc.attribute("STILLINE").toInt());
-		m_Doc->itemToolPrefs.dWidth     = ScCLocale::toDoubleC(dc.attribute("WIDTH"), 1.0);
-		m_Doc->itemToolPrefs.dWidthLine = ScCLocale::toDoubleC(dc.attribute("WIDTHLINE"), 1.0);
-		m_Doc->itemToolPrefs.dShade2    = dc.attribute("PENSHADE", "100").toInt();
-		m_Doc->itemToolPrefs.dShadeLine = dc.attribute("LINESHADE", "100").toInt();
-		m_Doc->itemToolPrefs.dShade     = dc.attribute("BRUSHSHADE", "100").toInt();
+			m_Doc->itemToolPrefs.textStrokeColor = dc.attribute("StrokeText");
+		m_Doc->itemToolPrefs.textBackground = dc.attribute("TextBackGround", CommonStrings::None);
+		m_Doc->itemToolPrefs.textLineColor = dc.attribute("TextLineColor", CommonStrings::None);
+		m_Doc->itemToolPrefs.textBackgroundShade = dc.attribute("TextBackGroundShade", "100").toInt();
+		m_Doc->itemToolPrefs.textLineShade = dc.attribute("TextLineShade", "100").toInt();
+		m_Doc->itemToolPrefs.textShade = dc.attribute("TextPenShade", "100").toInt();
+		m_Doc->itemToolPrefs.textStrokeShade = dc.attribute("TextStrokeShade", "100").toInt();
+		m_Doc->itemToolPrefs.shapeLineArt = static_cast<Qt::PenStyle>(dc.attribute("STIL").toInt());
+		m_Doc->itemToolPrefs.lineStyle = static_cast<Qt::PenStyle>(dc.attribute("STILLINE").toInt());
+		m_Doc->itemToolPrefs.shapeWidth     = ScCLocale::toDoubleC(dc.attribute("WIDTH"), 1.0);
+		m_Doc->itemToolPrefs.lineWidth = ScCLocale::toDoubleC(dc.attribute("WIDTHLINE"), 1.0);
+		m_Doc->itemToolPrefs.shapeShade2    = dc.attribute("PENSHADE", "100").toInt();
+		m_Doc->itemToolPrefs.lineShade = dc.attribute("LINESHADE", "100").toInt();
+		m_Doc->itemToolPrefs.shapeShade     = dc.attribute("BRUSHSHADE", "100").toInt();
 		m_Doc->opToolPrefs.magMin     = dc.attribute("MAGMIN", "10").toInt();
 		m_Doc->opToolPrefs.magMax     = dc.attribute("MAGMAX", "3200").toInt();
 		m_Doc->opToolPrefs.magStep    = dc.attribute("MAGSTEP", "200").toInt();
 		//CB Reset doc zoom step value to 200% instead of old values.
 		if (m_Doc->opToolPrefs.magStep<100)
 			m_Doc->opToolPrefs.magStep=200;
-		m_Doc->itemToolPrefs.tabFillChar = dc.attribute("TabFill","");
-		m_Doc->itemToolPrefs.dTabWidth   = ScCLocale::toDoubleC(dc.attribute("TabWidth"), 36.0);
+		m_Doc->itemToolPrefs.textTabFillChar = dc.attribute("TabFill","");
+		m_Doc->itemToolPrefs.textTabWidth   = ScCLocale::toDoubleC(dc.attribute("TabWidth"), 36.0);
 		if (dc.hasAttribute("CPICT"))
-			m_Doc->itemToolPrefs.dBrushPict = dc.attribute("CPICT");
-		m_Doc->itemToolPrefs.shadePict = ScCLocale::toDoubleC(dc.attribute("PICTSHADE"), 100.0);
+			m_Doc->itemToolPrefs.imageFillColor = dc.attribute("CPICT");
+		m_Doc->itemToolPrefs.imageFillShade = ScCLocale::toDoubleC(dc.attribute("PICTSHADE"), 100.0);
 		if (dc.hasAttribute("PAGEC"))
 			m_Doc->papColor = QColor(dc.attribute("PAGEC"));
 		if (dc.hasAttribute("MARGC"))
@@ -956,10 +956,10 @@
 				delete last;
 				if (Neu->fill_gradient.Stops() == 0)
 				{
-					const ScColor& col1 = m_Doc->PageColors[m_Doc->itemToolPrefs.dBrush];
-					const ScColor& col2 = m_Doc->PageColors[m_Doc->itemToolPrefs.dPen];
-					Neu->fill_gradient.addStop(ScColorEngine::getRGBColor(col1, m_Doc), 0.0, 0.5, 1.0, m_Doc->itemToolPrefs.dBrush, 100);
-					Neu->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, m_Doc), 1.0, 0.5, 1.0, m_Doc->itemToolPrefs.dPen, 100);
+					const ScColor& col1 = m_Doc->PageColors[m_Doc->itemToolPrefs.shapeBrush];
+					const ScColor& col2 = m_Doc->PageColors[m_Doc->itemToolPrefs.shapePen];
+					Neu->fill_gradient.addStop(ScColorEngine::getRGBColor(col1, m_Doc), 0.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapeBrush, 100);
+					Neu->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, m_Doc), 1.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapePen, 100);
 				}
 //				Neu->Language = ScMW->GetLang(pg.attribute("LANGUAGE", m_Doc->Language));
 				Neu->isAutoText = static_cast<bool>(pg.attribute("AUTOTEXT").toInt());
@@ -1192,12 +1192,12 @@
 	dc.setAttribute("AUTOSPALTEN",m_Doc->PageSp);
 	dc.setAttribute("ABSTSPALTEN",m_Doc->PageSpa);
 	dc.setAttribute("UNITS",m_Doc->unitIndex());
-	dc.setAttribute("DFONT",m_Doc->itemToolPrefs.defFont);
-	dc.setAttribute("DSIZE",m_Doc->itemToolPrefs.defSize / 10.0);
-	dc.setAttribute("DCOL",m_Doc->itemToolPrefs.dCols);
-	dc.setAttribute("DGAP",m_Doc->itemToolPrefs.dGap);
-	dc.setAttribute("TabFill",m_Doc->itemToolPrefs.tabFillChar);
-	dc.setAttribute("TabWidth",m_Doc->itemToolPrefs.dTabWidth);
+	dc.setAttribute("DFONT",m_Doc->itemToolPrefs.textFont);
+	dc.setAttribute("DSIZE",m_Doc->itemToolPrefs.textSize / 10.0);
+	dc.setAttribute("DCOL",m_Doc->itemToolPrefs.textColumns);
+	dc.setAttribute("DGAP",m_Doc->itemToolPrefs.textColumnGap);
+	dc.setAttribute("TabFill",m_Doc->itemToolPrefs.textTabFillChar);
+	dc.setAttribute("TabWidth",m_Doc->itemToolPrefs.textTabWidth);
 	dc.setAttribute("AUTHOR",m_Doc->documentInfo.getAuthor());
 	dc.setAttribute("COMMENTS",m_Doc->documentInfo.getComments());
 	dc.setAttribute("KEYWORDS",m_Doc->documentInfo.getKeywords());
@@ -1267,48 +1267,48 @@
 	dc.setAttribute("rulerYoffset", m_Doc->rulerYoffset);
 	dc.setAttribute("GuideRad", m_Doc->guidesSettings.guideRad);
 	dc.setAttribute("GRAB",m_Doc->guidesSettings.grabRadius);
-	dc.setAttribute("POLYC", m_Doc->itemToolPrefs.polyC);
-	dc.setAttribute("POLYF", m_Doc->itemToolPrefs.polyF);
-	dc.setAttribute("POLYR", m_Doc->itemToolPrefs.polyR);
-	dc.setAttribute("POLYFD", m_Doc->itemToolPrefs.polyFd);
-	dc.setAttribute("POLYS", static_cast<int>(m_Doc->itemToolPrefs.polyS));
+	dc.setAttribute("POLYC", m_Doc->itemToolPrefs.polyCorners);
+	dc.setAttribute("POLYF", m_Doc->itemToolPrefs.polyFactorValue2);
+	dc.setAttribute("POLYR", m_Doc->itemToolPrefs.polyRotation);
+	dc.setAttribute("POLYFD", m_Doc->itemToolPrefs.polyFactorValue);
+	dc.setAttribute("POLYS", static_cast<int>(m_Doc->itemToolPrefs.polyUseFactor));
 	dc.setAttribute("AutoSave", static_cast<int>(m_Doc->AutoSave));
 	dc.setAttribute("AutoSaveTime", m_Doc->AutoSaveTime);
 	dc.setAttribute("ScratchBottom", m_Doc->scratch.Bottom);
 	dc.setAttribute("ScratchLeft", m_Doc->scratch.Left);
 	dc.setAttribute("ScratchRight", m_Doc->scratch.Right);
 	dc.setAttribute("ScratchTop", m_Doc->scratch.Top);
-	dc.setAttribute("StartArrow", m_Doc->itemToolPrefs.dStartArrow);
-	dc.setAttribute("EndArrow", m_Doc->itemToolPrefs.dEndArrow);
-	dc.setAttribute("PEN",m_Doc->itemToolPrefs.dPen);
-	dc.setAttribute("BRUSH",m_Doc->itemToolPrefs.dBrush);
-	dc.setAttribute("PENLINE",m_Doc->itemToolPrefs.dPenLine);
-	dc.setAttribute("PENTEXT",m_Doc->itemToolPrefs.dPenText);
-	dc.setAttribute("StrokeText",m_Doc->itemToolPrefs.dStrokeText);
-	dc.setAttribute("TextBackGround", m_Doc->itemToolPrefs.dTextBackGround);
-	dc.setAttribute("TextLineColor", m_Doc->itemToolPrefs.dTextLineColor);
-	dc.setAttribute("TextBackGroundShade", m_Doc->itemToolPrefs.dTextBackGroundShade);
-	dc.setAttribute("TextLineShade", m_Doc->itemToolPrefs.dTextLineShade);
-	dc.setAttribute("TextPenShade", m_Doc->itemToolPrefs.dTextPenShade);
-	dc.setAttribute("TextStrokeShade", m_Doc->itemToolPrefs.dTextStrokeShade);
-	dc.setAttribute("STIL",m_Doc->itemToolPrefs.dLineArt);
-	dc.setAttribute("STILLINE",m_Doc->itemToolPrefs.dLstyleLine);
-	dc.setAttribute("WIDTH",m_Doc->itemToolPrefs.dWidth);
-	dc.setAttribute("WIDTHLINE",m_Doc->itemToolPrefs.dWidthLine);
-	dc.setAttribute("PENSHADE",m_Doc->itemToolPrefs.dShade2);
-	dc.setAttribute("LINESHADE",m_Doc->itemToolPrefs.dShadeLine);
-	dc.setAttribute("BRUSHSHADE",m_Doc->itemToolPrefs.dShade);
+	dc.setAttribute("StartArrow", m_Doc->itemToolPrefs.lineStartArrow);
+	dc.setAttribute("EndArrow", m_Doc->itemToolPrefs.lineEndArrow);
+	dc.setAttribute("PEN",m_Doc->itemToolPrefs.shapePen);
+	dc.setAttribute("BRUSH",m_Doc->itemToolPrefs.shapeBrush);
+	dc.setAttribute("PENLINE",m_Doc->itemToolPrefs.lineColor);
+	dc.setAttribute("PENTEXT",m_Doc->itemToolPrefs.textColor);
+	dc.setAttribute("StrokeText",m_Doc->itemToolPrefs.textStrokeColor);
+	dc.setAttribute("TextBackGround", m_Doc->itemToolPrefs.textBackground);
+	dc.setAttribute("TextLineColor", m_Doc->itemToolPrefs.textLineColor);
+	dc.setAttribute("TextBackGroundShade", m_Doc->itemToolPrefs.textBackgroundShade);
+	dc.setAttribute("TextLineShade", m_Doc->itemToolPrefs.textLineShade);
+	dc.setAttribute("TextPenShade", m_Doc->itemToolPrefs.textShade);
+	dc.setAttribute("TextStrokeShade", m_Doc->itemToolPrefs.textStrokeShade);
+	dc.setAttribute("STIL",m_Doc->itemToolPrefs.shapeLineArt);
+	dc.setAttribute("STILLINE",m_Doc->itemToolPrefs.lineStyle);
+	dc.setAttribute("WIDTH",m_Doc->itemToolPrefs.shapeWidth);
+	dc.setAttribute("WIDTHLINE",m_Doc->itemToolPrefs.lineWidth);
+	dc.setAttribute("PENSHADE",m_Doc->itemToolPrefs.shapeShade2);
+	dc.setAttribute("LINESHADE",m_Doc->itemToolPrefs.lineShade);
+	dc.setAttribute("BRUSHSHADE",m_Doc->itemToolPrefs.shapeShade);
 	dc.setAttribute("MAGMIN",m_Doc->opToolPrefs.magMin);
 	dc.setAttribute("MAGMAX",m_Doc->opToolPrefs.magMax);
 	dc.setAttribute("MAGSTEP",m_Doc->opToolPrefs.magStep);
-	dc.setAttribute("CPICT",m_Doc->itemToolPrefs.dBrushPict);
-	dc.setAttribute("PICTSHADE",m_Doc->itemToolPrefs.shadePict);
-	dc.setAttribute("PICTSCX",m_Doc->itemToolPrefs.scaleX);
-	dc.setAttribute("PICTSCY",m_Doc->itemToolPrefs.scaleY);
-	dc.setAttribute("PSCALE", static_cast<int>(m_Doc->itemToolPrefs.scaleType));
-	dc.setAttribute("PASPECT", static_cast<int>(m_Doc->itemToolPrefs.aspectRatio));
-	dc.setAttribute("EmbeddedPath", static_cast<int>(m_Doc->itemToolPrefs.useEmbeddedPath));
-	dc.setAttribute("HalfRes", m_Doc->itemToolPrefs.lowResType);
+	dc.setAttribute("CPICT",m_Doc->itemToolPrefs.imageFillColor);
+	dc.setAttribute("PICTSHADE",m_Doc->itemToolPrefs.imageFillShade);
+	dc.setAttribute("PICTSCX",m_Doc->itemToolPrefs.imageScaleX);
+	dc.setAttribute("PICTSCY",m_Doc->itemToolPrefs.imageScaleY);
+	dc.setAttribute("PSCALE", static_cast<int>(m_Doc->itemToolPrefs.imageScaleType));
+	dc.setAttribute("PASPECT", static_cast<int>(m_Doc->itemToolPrefs.imageAspectRatio));
+	dc.setAttribute("EmbeddedPath", static_cast<int>(m_Doc->itemToolPrefs.imageUseEmbeddedPath));
+	dc.setAttribute("HalfRes", m_Doc->itemToolPrefs.imageLowResType);
 	dc.setAttribute("MINORC",m_Doc->guidesSettings.minorGridColor.name());
 	dc.setAttribute("MAJORC",m_Doc->guidesSettings.majorGridColor.name());
 	dc.setAttribute("GuideC", m_Doc->guidesSettings.guideColor.name());
@@ -1737,7 +1737,7 @@
 		if ((!prefsManager->appPrefs.GFontSub.contains(fontname)) || (!(*m_AvailableFonts)[prefsManager->appPrefs.GFontSub[fontname]].usable()))
 		{
 			newReplacement = true;
-			ReplacedFonts.insert(fontname, doc->itemToolPrefs.defFont);
+			ReplacedFonts.insert(fontname, doc->itemToolPrefs.textFont);
 		}
 		else
 			ReplacedFonts.insert(fontname, prefsManager->appPrefs.GFontSub[fontname]);
@@ -1917,16 +1917,16 @@
 	vg.setGapBefore(ScCLocale::toDoubleC(pg.attribute("VOR"), 0.0));
 	vg.setGapAfter(ScCLocale::toDoubleC(pg.attribute("NACH"), 0.0));
 	
-	vg.charStyle().setFont(m_AvailableFonts->findFont(pg.attribute("FONT", doc->itemToolPrefs.defFont), doc));
+	vg.charStyle().setFont(m_AvailableFonts->findFont(pg.attribute("FONT", doc->itemToolPrefs.textFont), doc));
 	vg.charStyle().setFontSize(qRound(ScCLocale::toDoubleC(pg.attribute("FONTSIZE"), 12.0) * 10.0));
 	vg.setHasDropCap(static_cast<bool>(pg.attribute("DROP", "0").toInt()));
 	vg.setDropCapLines(pg.attribute("DROPLIN", "2").toInt());
 	vg.setDropCapOffset(ScCLocale::toDoubleC(pg.attribute("DROPDIST"), 0.0));
 	vg.charStyle().setFeatures(static_cast<StyleFlag>(pg.attribute("EFFECT", "0").toInt()).featureList());
-	QString fColor = pg.attribute("FCOLOR", doc->itemToolPrefs.dBrush);
+	QString fColor = pg.attribute("FCOLOR", doc->itemToolPrefs.shapeBrush);
 	int fShade = pg.attribute("FSHADE", "100").toInt();
 	handleOldColorShade(doc, fColor, fShade);
-	QString sColor = pg.attribute("SCOLOR", doc->itemToolPrefs.dPen);
+	QString sColor = pg.attribute("SCOLOR", doc->itemToolPrefs.shapePen);
 	int sShade = pg.attribute("SSHADE", "100").toInt();
 	handleOldColorShade(doc, sColor, sShade);
 	vg.charStyle().setFillColor(fColor);
@@ -2037,7 +2037,7 @@
 		break;
 	//
 	case PageItem::ImageFrame:
-		z = doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, x, y, w, h, 1, doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+		z = doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, x, y, w, h, 1, doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
@@ -2239,7 +2239,7 @@
 		pstyle.setParent(DoVorl[align-5]);
 	else if (align >= 0)
 		pstyle.setAlignment(static_cast<ParagraphStyle::AlignmentType>(align));
-	pstyle.charStyle().setFont(m_AvailableFonts->findFont(obj->attribute("IFONT", m_Doc->itemToolPrefs.defFont), m_Doc));
+	pstyle.charStyle().setFont(m_AvailableFonts->findFont(obj->attribute("IFONT", m_Doc->itemToolPrefs.textFont), m_Doc));
 	pstyle.charStyle().setFontSize(qRound(ScCLocale::toDoubleC(obj->attribute("ISIZE"), 12.0) * 10));
 	pstyle.charStyle().setStrokeColor(obj->attribute("TXTSTROKE", CommonStrings::None));
 	pstyle.charStyle().setFillColor(obj->attribute("TXTFILL", "Black"));
@@ -2861,10 +2861,10 @@
 					delete last;
 					if (Neu->fill_gradient.Stops() == 0)
 					{
-						const ScColor& col1 = m_Doc->PageColors[m_Doc->itemToolPrefs.dBrush];
-						const ScColor& col2 = m_Doc->PageColors[m_Doc->itemToolPrefs.dPen];
-						Neu->fill_gradient.addStop(ScColorEngine::getRGBColor(col1, m_Doc), 0.0, 0.5, 1.0, m_Doc->itemToolPrefs.dBrush, 100);
-						Neu->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, m_Doc), 1.0, 0.5, 1.0, m_Doc->itemToolPrefs.dPen, 100);
+						const ScColor& col1 = m_Doc->PageColors[m_Doc->itemToolPrefs.shapeBrush];
+						const ScColor& col2 = m_Doc->PageColors[m_Doc->itemToolPrefs.shapePen];
+						Neu->fill_gradient.addStop(ScColorEngine::getRGBColor(col1, m_Doc), 0.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapeBrush, 100);
+						Neu->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, m_Doc), 1.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapePen, 100);
 					}
 //					Neu->Language = ScMW->GetLang(pg.attribute("LANGUAGE", m_Doc->Language));
 //					Neu->Language = m_Doc->Language;
Index: scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
===================================================================
--- scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp	(revision 13995)
+++ scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp	(revision 13996)
@@ -100,12 +100,12 @@
 	docu.writeAttribute("AUTOSPALTEN" ,m_Doc->PageSp);
 	docu.writeAttribute("ABSTSPALTEN" ,m_Doc->PageSpa);
 	docu.writeAttribute("UNITS"       , m_Doc->unitIndex());
-	docu.writeAttribute("DFONT"       ,m_Doc->itemToolPrefs.defFont);
-	docu.writeAttribute("DSIZE"       ,m_Doc->itemToolPrefs.defSize / 10.0);
-	docu.writeAttribute("DCOL"        ,m_Doc->itemToolPrefs.dCols);
-	docu.writeAttribute("DGAP"        ,m_Doc->itemToolPrefs.dGap);
-	docu.writeAttribute("TabFill"     ,m_Doc->itemToolPrefs.tabFillChar);
-	docu.writeAttribute("TabWidth"    ,m_Doc->itemToolPrefs.dTabWidth);
+	docu.writeAttribute("DFONT"       ,m_Doc->itemToolPrefs.textFont);
+	docu.writeAttribute("DSIZE"       ,m_Doc->itemToolPrefs.textSize / 10.0);
+	docu.writeAttribute("DCOL"        ,m_Doc->itemToolPrefs.textColumns);
+	docu.writeAttribute("DGAP"        ,m_Doc->itemToolPrefs.textColumnGap);
+	docu.writeAttribute("TabFill"     ,m_Doc->itemToolPrefs.textTabFillChar);
+	docu.writeAttribute("TabWidth"    ,m_Doc->itemToolPrefs.textTabWidth);
 	docu.writeAttribute("AUTHOR"      ,m_Doc->documentInfo.getAuthor());
 	docu.writeAttribute("COMMENTS"    ,m_Doc->documentInfo.getComments());
 	docu.writeAttribute("KEYWORDS"    ,m_Doc->documentInfo.getKeywords());
@@ -177,12 +177,12 @@
 	docu.writeAttribute("rulerYoffset", m_Doc->rulerYoffset);
 	docu.writeAttribute("GuideRad", m_Doc->guidesSettings.guideRad);
 	docu.writeAttribute("GRAB",m_Doc->guidesSettings.grabRadius);
-	docu.writeAttribute("POLYC", m_Doc->itemToolPrefs.polyC);
-	docu.writeAttribute("POLYF", m_Doc->itemToolPrefs.polyF);
-	docu.writeAttribute("POLYR", m_Doc->itemToolPrefs.polyR);
+	docu.writeAttribute("POLYC", m_Doc->itemToolPrefs.polyCorners);
+	docu.writeAttribute("POLYF", m_Doc->itemToolPrefs.polyFactorValue2);
+	docu.writeAttribute("POLYR", m_Doc->itemToolPrefs.polyRotation);
 	docu.writeAttribute("POLYCUR", m_Doc->itemToolPrefs.polyCurvature);
-	docu.writeAttribute("POLYFD", m_Doc->itemToolPrefs.polyFd);
-	docu.writeAttribute("POLYS", static_cast<int>(m_Doc->itemToolPrefs.polyS));
+	docu.writeAttribute("POLYFD", m_Doc->itemToolPrefs.polyFactorValue);
+	docu.writeAttribute("POLYS", static_cast<int>(m_Doc->itemToolPrefs.polyUseFactor));
 	docu.writeAttribute("AutoSave", static_cast<int>(m_Doc->AutoSave));
 	docu.writeAttribute("AutoSaveTime", m_Doc->AutoSaveTime);
 	docu.writeAttribute("ScratchBottom", m_Doc->scratch.Bottom);
@@ -191,37 +191,37 @@
 	docu.writeAttribute("ScratchTop", m_Doc->scratch.Top);
 	docu.writeAttribute("GapHorizontal", m_Doc->GapHorizontal);
 	docu.writeAttribute("GapVertical", m_Doc->GapVertical);
-	docu.writeAttribute("StartArrow", m_Doc->itemToolPrefs.dStartArrow);
-	docu.writeAttribute("EndArrow", m_Doc->itemToolPrefs.dEndArrow);
-	docu.writeAttribute("PEN",m_Doc->itemToolPrefs.dPen);
-	docu.writeAttribute("BRUSH",m_Doc->itemToolPrefs.dBrush);
-	docu.writeAttribute("PENLINE",m_Doc->itemToolPrefs.dPenLine);
-	docu.writeAttribute("PENTEXT",m_Doc->itemToolPrefs.dPenText);
-	docu.writeAttribute("StrokeText",m_Doc->itemToolPrefs.dStrokeText);
-	docu.writeAttribute("TextBackGround", m_Doc->itemToolPrefs.dTextBackGround);
-	docu.writeAttribute("TextLineColor", m_Doc->itemToolPrefs.dTextLineColor);
-	docu.writeAttribute("TextBackGroundShade", m_Doc->itemToolPrefs.dTextBackGroundShade);
-	docu.writeAttribute("TextLineShade", m_Doc->itemToolPrefs.dTextLineShade);
-	docu.writeAttribute("TextPenShade", m_Doc->itemToolPrefs.dTextPenShade);
-	docu.writeAttribute("TextStrokeShade", m_Doc->itemToolPrefs.dTextStrokeShade);
-	docu.writeAttribute("STIL",m_Doc->itemToolPrefs.dLineArt);
-	docu.writeAttribute("STILLINE",m_Doc->itemToolPrefs.dLstyleLine);
-	docu.writeAttribute("WIDTH",m_Doc->itemToolPrefs.dWidth);
-	docu.writeAttribute("WIDTHLINE",m_Doc->itemToolPrefs.dWidthLine);
-	docu.writeAttribute("PENSHADE",m_Doc->itemToolPrefs.dShade2);
-	docu.writeAttribute("LINESHADE",m_Doc->itemToolPrefs.dShadeLine);
-	docu.writeAttribute("BRUSHSHADE",m_Doc->itemToolPrefs.dShade);
+	docu.writeAttribute("StartArrow", m_Doc->itemToolPrefs.lineStartArrow);
+	docu.writeAttribute("EndArrow", m_Doc->itemToolPrefs.lineEndArrow);
+	docu.writeAttribute("PEN",m_Doc->itemToolPrefs.shapePen);
+	docu.writeAttribute("BRUSH",m_Doc->itemToolPrefs.shapeBrush);
+	docu.writeAttribute("PENLINE",m_Doc->itemToolPrefs.lineColor);
+	docu.writeAttribute("PENTEXT",m_Doc->itemToolPrefs.textColor);
+	docu.writeAttribute("StrokeText",m_Doc->itemToolPrefs.textStrokeColor);
+	docu.writeAttribute("TextBackGround", m_Doc->itemToolPrefs.textBackground);
+	docu.writeAttribute("TextLineColor", m_Doc->itemToolPrefs.textLineColor);
+	docu.writeAttribute("TextBackGroundShade", m_Doc->itemToolPrefs.textBackgroundShade);
+	docu.writeAttribute("TextLineShade", m_Doc->itemToolPrefs.textLineShade);
+	docu.writeAttribute("TextPenShade", m_Doc->itemToolPrefs.textShade);
+	docu.writeAttribute("TextStrokeShade", m_Doc->itemToolPrefs.textStrokeShade);
+	docu.writeAttribute("STIL",m_Doc->itemToolPrefs.shapeLineArt);
+	docu.writeAttribute("STILLINE",m_Doc->itemToolPrefs.lineStyle);
+	docu.writeAttribute("WIDTH",m_Doc->itemToolPrefs.shapeWidth);
+	docu.writeAttribute("WIDTHLINE",m_Doc->itemToolPrefs.lineWidth);
+	docu.writeAttribute("PENSHADE",m_Doc->itemToolPrefs.shapeShade2);
+	docu.writeAttribute("LINESHADE",m_Doc->itemToolPrefs.lineShade);
+	docu.writeAttribute("BRUSHSHADE",m_Doc->itemToolPrefs.shapeShade);
 	docu.writeAttribute("MAGMIN",m_Doc->opToolPrefs.magMin);
 	docu.writeAttribute("MAGMAX",m_Doc->opToolPrefs.magMax);
 	docu.writeAttribute("MAGSTEP",m_Doc->opToolPrefs.magStep);
-	docu.writeAttribute("CPICT",m_Doc->itemToolPrefs.dBrushPict);
-	docu.writeAttribute("PICTSHADE",m_Doc->itemToolPrefs.shadePict);
-	docu.writeAttribute("PICTSCX",m_Doc->itemToolPrefs.scaleX);
-	docu.writeAttribute("PICTSCY",m_Doc->itemToolPrefs.scaleY);
-	docu.writeAttribute("PSCALE", static_cast<int>(m_Doc->itemToolPrefs.scaleType));
-	docu.writeAttribute("PASPECT", static_cast<int>(m_Doc->itemToolPrefs.aspectRatio));
-	docu.writeAttribute("EmbeddedPath", static_cast<int>(m_Doc->itemToolPrefs.useEmbeddedPath));
-	docu.writeAttribute("HalfRes", m_Doc->itemToolPrefs.lowResType);
+	docu.writeAttribute("CPICT",m_Doc->itemToolPrefs.imageFillColor);
+	docu.writeAttribute("PICTSHADE",m_Doc->itemToolPrefs.imageFillShade);
+	docu.writeAttribute("PICTSCX",m_Doc->itemToolPrefs.imageScaleX);
+	docu.writeAttribute("PICTSCY",m_Doc->itemToolPrefs.imageScaleY);
+	docu.writeAttribute("PSCALE", static_cast<int>(m_Doc->itemToolPrefs.imageScaleType));
+	docu.writeAttribute("PASPECT", static_cast<int>(m_Doc->itemToolPrefs.imageAspectRatio));
+	docu.writeAttribute("EmbeddedPath", static_cast<int>(m_Doc->itemToolPrefs.imageUseEmbeddedPath));
+	docu.writeAttribute("HalfRes", m_Doc->itemToolPrefs.imageLowResType);
 	docu.writeAttribute("dispX", m_Doc->opToolPrefs.dispX);
 	docu.writeAttribute("dispY", m_Doc->opToolPrefs.dispY);
 	docu.writeAttribute("constrain", m_Doc->opToolPrefs.constrain);
Index: scribus/plugins/fileloader/scribus150format/scribus150format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(revision 13995)
+++ scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(revision 13996)
@@ -852,52 +852,52 @@
 
 void Scribus150Format::readToolSettings(ScribusDoc* doc, ScXmlStreamAttributes& attrs)
 {
-	QString defFont = attrs.valueAsString("DFONT");
-	m_AvailableFonts->findFont(defFont, doc);
+	QString textFont = attrs.valueAsString("DFONT");
+	m_AvailableFonts->findFont(textFont, doc);
 
-	doc->itemToolPrefs.defFont = defFont;
-	doc->itemToolPrefs.defSize = qRound(attrs.valueAsDouble("DSIZE", 12.0) * 10);
-	doc->itemToolPrefs.dCols   = attrs.valueAsInt("DCOL", 1);
-	doc->itemToolPrefs.dGap    = attrs.valueAsDouble("DGAP", 0.0);
+	doc->itemToolPrefs.textFont = textFont;
+	doc->itemToolPrefs.textSize = qRound(attrs.valueAsDouble("DSIZE", 12.0) * 10);
+	doc->itemToolPrefs.textColumns   = attrs.valueAsInt("DCOL", 1);
+	doc->itemToolPrefs.textColumnGap    = attrs.valueAsDouble("DGAP", 0.0);
 
-	doc->itemToolPrefs.polyC   = attrs.valueAsInt("POLYC", 4);
-	doc->itemToolPrefs.polyF   = attrs.valueAsDouble("POLYF", 0.5);
-	doc->itemToolPrefs.polyR   = attrs.valueAsDouble("POLYR", 0.0);
-	doc->itemToolPrefs.polyCurvature = attrs.valueAsDouble("POLYCUR", 0.0);
-	doc->itemToolPrefs.polyFd  = attrs.valueAsInt("POLYFD", 0);
-	doc->itemToolPrefs.polyS   = attrs.valueAsBool("POLYS", false);
+	doc->itemToolPrefs.polyCorners      = attrs.valueAsInt("POLYC", 4);
+	doc->itemToolPrefs.polyFactorValue2 = attrs.valueAsDouble("POLYF", 0.5);
+	doc->itemToolPrefs.polyRotation     = attrs.valueAsDouble("POLYR", 0.0);
+	doc->itemToolPrefs.polyCurvature    = attrs.valueAsDouble("POLYCUR", 0.0);
+	doc->itemToolPrefs.polyFactorValue  = attrs.valueAsInt("POLYFD", 0);
+	doc->itemToolPrefs.polyUseFactor    = attrs.valueAsBool("POLYS", false);
 
-	doc->itemToolPrefs.dStartArrow = attrs.valueAsInt("StartArrow", 0);
-	doc->itemToolPrefs.dEndArrow   = attrs.valueAsInt("EndArrow", 0);
-	doc->itemToolPrefs.scaleX      = attrs.valueAsDouble("PICTSCX", 1.0);
-	doc->itemToolPrefs.scaleY      = attrs.valueAsDouble("PICTSCY", 1.0);
-	doc->itemToolPrefs.scaleType   = attrs.valueAsBool("PSCALE", true);
-	doc->itemToolPrefs.aspectRatio = attrs.valueAsBool("PASPECT", false);
-	doc->itemToolPrefs.lowResType  = attrs.valueAsInt("HalfRes", 1);
-	doc->itemToolPrefs.useEmbeddedPath = attrs.valueAsBool("EmbeddedPath", false);
+	doc->itemToolPrefs.lineStartArrow = attrs.valueAsInt("StartArrow", 0);
+	doc->itemToolPrefs.lineEndArrow   = attrs.valueAsInt("EndArrow", 0);
+	doc->itemToolPrefs.imageScaleX      = attrs.valueAsDouble("PICTSCX", 1.0);
+	doc->itemToolPrefs.imageScaleY      = attrs.valueAsDouble("PICTSCY", 1.0);
+	doc->itemToolPrefs.imageScaleType   = attrs.valueAsBool("PSCALE", true);
+	doc->itemToolPrefs.imageAspectRatio = attrs.valueAsBool("PASPECT", false);
+	doc->itemToolPrefs.imageLowResType  = attrs.valueAsInt("HalfRes", 1);
+	doc->itemToolPrefs.imageUseEmbeddedPath = attrs.valueAsBool("EmbeddedPath", false);
 	if (attrs.hasAttribute("PEN"))
-		doc->itemToolPrefs.dPen = attrs.valueAsString("PEN");
+		doc->itemToolPrefs.shapePen = attrs.valueAsString("PEN");
 	if (attrs.hasAttribute("BRUSH"))
-		doc->itemToolPrefs.dBrush = attrs.valueAsString("BRUSH");
+		doc->itemToolPrefs.shapeBrush = attrs.valueAsString("BRUSH");
 	if (attrs.hasAttribute("PENLINE"))
-		doc->itemToolPrefs.dPenLine = attrs.valueAsString("PENLINE");
+		doc->itemToolPrefs.lineColor = attrs.valueAsString("PENLINE");
 	if (attrs.hasAttribute("PENTEXT"))
-		doc->itemToolPrefs.dPenText = attrs.valueAsString("PENTEXT");
+		doc->itemToolPrefs.textColor = attrs.valueAsString("PENTEXT");
 	if (attrs.hasAttribute("StrokeText"))
-		doc->itemToolPrefs.dStrokeText = attrs.valueAsString("StrokeText");
-	doc->itemToolPrefs.dTextBackGround  = attrs.valueAsString("TextBackGround", CommonStrings::None);
-	doc->itemToolPrefs.dTextLineColor   = attrs.valueAsString("TextLineColor", CommonStrings::None);
-	doc->itemToolPrefs.dTextBackGroundShade =attrs.valueAsInt("TextBackGroundShade", 100);
-	doc->itemToolPrefs.dTextLineShade   = attrs.valueAsInt("TextLineShade", 100);
-	doc->itemToolPrefs.dTextPenShade    = attrs.valueAsInt("TextPenShade", 100);
-	doc->itemToolPrefs.dTextStrokeShade = attrs.valueAsInt("TextStrokeShade", 100);
-	doc->itemToolPrefs.dLineArt    = static_cast<Qt::PenStyle>(attrs.valueAsInt("STIL"));
-	doc->itemToolPrefs.dLstyleLine = static_cast<Qt::PenStyle>(attrs.valueAsInt("STILLINE"));
-	doc->itemToolPrefs.dWidth      = attrs.valueAsDouble("WIDTH", 0.0);
-	doc->itemToolPrefs.dWidthLine  = attrs.valueAsDouble("WIDTHLINE", 1.0);
-	doc->itemToolPrefs.dShade2     = attrs.valueAsInt("PENSHADE", 100);
-	doc->itemToolPrefs.dShadeLine  = attrs.valueAsInt("LINESHADE", 100);
-	doc->itemToolPrefs.dShade      = attrs.valueAsInt("BRUSHSHADE", 100);
+		doc->itemToolPrefs.textStrokeColor = attrs.valueAsString("StrokeText");
+	doc->itemToolPrefs.textBackground  = attrs.valueAsString("TextBackGround", CommonStrings::None);
+	doc->itemToolPrefs.textLineColor   = attrs.valueAsString("TextLineColor", CommonStrings::None);
+	doc->itemToolPrefs.textBackgroundShade =attrs.valueAsInt("TextBackGroundShade", 100);
+	doc->itemToolPrefs.textLineShade   = attrs.valueAsInt("TextLineShade", 100);
+	doc->itemToolPrefs.textShade    = attrs.valueAsInt("TextPenShade", 100);
+	doc->itemToolPrefs.textStrokeShade = attrs.valueAsInt("TextStrokeShade", 100);
+	doc->itemToolPrefs.shapeLineArt    = static_cast<Qt::PenStyle>(attrs.valueAsInt("STIL"));
+	doc->itemToolPrefs.lineStyle = static_cast<Qt::PenStyle>(attrs.valueAsInt("STILLINE"));
+	doc->itemToolPrefs.shapeWidth      = attrs.valueAsDouble("WIDTH", 0.0);
+	doc->itemToolPrefs.lineWidth  = attrs.valueAsDouble("WIDTHLINE", 1.0);
+	doc->itemToolPrefs.shapeShade2     = attrs.valueAsInt("PENSHADE", 100);
+	doc->itemToolPrefs.lineShade  = attrs.valueAsInt("LINESHADE", 100);
+	doc->itemToolPrefs.shapeShade      = attrs.valueAsInt("BRUSHSHADE", 100);
 	doc->opToolPrefs.magMin      = attrs.valueAsInt("MAGMIN", 10);
 	doc->opToolPrefs.magMax      = attrs.valueAsInt("MAGMAX", 3200);
 	doc->opToolPrefs.magStep     = attrs.valueAsInt("MAGSTEP", 200);
@@ -907,11 +907,11 @@
 	//CB Reset doc zoom step value to 200% instead of old values.
 	if (doc->opToolPrefs.magStep < 100)
 		doc->opToolPrefs.magStep = 200;
-	doc->itemToolPrefs.tabFillChar = attrs.valueAsString("TabFill","");
-	doc->itemToolPrefs.dTabWidth   = attrs.valueAsDouble("TabWidth", 36.0);
+	doc->itemToolPrefs.textTabFillChar = attrs.valueAsString("TabFill","");
+	doc->itemToolPrefs.textTabWidth   = attrs.valueAsDouble("TabWidth", 36.0);
 	if (attrs.hasAttribute("CPICT"))
-		doc->itemToolPrefs.dBrushPict = attrs.valueAsString("CPICT");
-	doc->itemToolPrefs.shadePict = attrs.valueAsInt("PICTSHADE", 100);
+		doc->itemToolPrefs.imageFillColor = attrs.valueAsString("CPICT");
+	doc->itemToolPrefs.imageFillShade = attrs.valueAsInt("PICTSHADE", 100);
 }
 
 void Scribus150Format::readTypographicSettings(ScribusDoc* doc, ScXmlStreamAttributes& attrs)
@@ -1674,7 +1674,7 @@
 		newItem->OwnPage = attrs.valueAsInt("OwnPage");
 	if (tagName == "PAGEOBJECT")
 		newItem->OnMasterPage = "";
-	QString tmpf = attrs.valueAsString("IFONT", doc->itemToolPrefs.defFont);
+	QString tmpf = attrs.valueAsString("IFONT", doc->itemToolPrefs.textFont);
 	m_AvailableFonts->findFont(tmpf, doc);
 
 //	newItem->Language = ScMW->GetLang(pg.attribute("LANGUAGE", doc->Language));
@@ -1890,10 +1890,10 @@
 
 	if (newItem->fill_gradient.Stops() == 0)
 	{
-		const ScColor& col1 = doc->PageColors[doc->itemToolPrefs.dBrush];
-		const ScColor& col2 = doc->PageColors[doc->itemToolPrefs.dPen];
-		newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col1, doc), 0.0, 0.5, 1.0, doc->itemToolPrefs.dBrush, 100);
-		newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, doc), 1.0, 0.5, 1.0, doc->itemToolPrefs.dPen, 100);
+		const ScColor& col1 = doc->PageColors[doc->itemToolPrefs.shapeBrush];
+		const ScColor& col2 = doc->PageColors[doc->itemToolPrefs.shapePen];
+		newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col1, doc), 0.0, 0.5, 1.0, doc->itemToolPrefs.shapeBrush, 100);
+		newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, doc), 1.0, 0.5, 1.0, doc->itemToolPrefs.shapePen, 100);
 	}
 
 	if (newItem->asPathText())
@@ -2217,7 +2217,7 @@
 	case PageItem::ImageFrame:
 	case PageItem::OSGFrame:
 	case PageItem::LatexFrame: /*Everything that is valid for image frames is also valid for latex frames*/
-		z = doc->itemAdd(pt, PageItem::Unspecified, x, y, w, h, 1, doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+		z = doc->itemAdd(pt, PageItem::Unspecified, x, y, w, h, 1, doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
Index: scribus/plugins/fileloader/oodraw/oodrawimp.cpp
===================================================================
--- scribus/plugins/fileloader/oodraw/oodrawimp.cpp	(revision 13995)
+++ scribus/plugins/fileloader/oodraw/oodrawimp.cpp	(revision 13996)
@@ -462,7 +462,7 @@
 			double gw = maxx - minx;
 			double gh = maxy - miny;
 			PageItem *high = m_Doc->Items->at(highestItem);
-			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.dBrush, m_Doc->itemToolPrefs.dPen, true);
+			int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
 			PageItem *neu = m_Doc->Items->takeAt(z);
 			m_Doc->Items->insert(lowestItem, neu);
 			neu->Groups.push(m_Doc->GroupCounter);
Index: scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp	(revision 13995)
+++ scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp	(revision 13996)
@@ -97,12 +97,12 @@
 	docu.writeAttribute("AUTOSPALTEN" ,m_Doc->PageSp);
 	docu.writeAttribute("ABSTSPALTEN" ,m_Doc->PageSpa);
 	docu.writeAttribute("UNITS"       , m_Doc->unitIndex());
-	docu.writeAttribute("DFONT"       ,m_Doc->itemToolPrefs.defFont);
-	docu.writeAttribute("DSIZE"       ,m_Doc->itemToolPrefs.defSize / 10.0);
-	docu.writeAttribute("DCOL"        ,m_Doc->itemToolPrefs.dCols);
-	docu.writeAttribute("DGAP"        ,m_Doc->itemToolPrefs.dGap);
-	docu.writeAttribute("TabFill"     ,m_Doc->itemToolPrefs.tabFillChar);
-	docu.writeAttribute("TabWidth"    ,m_Doc->itemToolPrefs.dTabWidth);
+	docu.writeAttribute("DFONT"       ,m_Doc->itemToolPrefs.textFont);
+	docu.writeAttribute("DSIZE"       ,m_Doc->itemToolPrefs.textSize / 10.0);
+	docu.writeAttribute("DCOL"        ,m_Doc->itemToolPrefs.textColumns);
+	docu.writeAttribute("DGAP"        ,m_Doc->itemToolPrefs.textColumnGap);
+	docu.writeAttribute("TabFill"     ,m_Doc->itemToolPrefs.textTabFillChar);
+	docu.writeAttribute("TabWidth"    ,m_Doc->itemToolPrefs.textTabWidth);
 	docu.writeAttribute("AUTHOR"      ,m_Doc->documentInfo.getAuthor());
 	docu.writeAttribute("COMMENTS"    ,m_Doc->documentInfo.getComments());
 	docu.writeAttribute("KEYWORDS"    ,m_Doc->documentInfo.getKeywords());
@@ -174,12 +174,12 @@
 	docu.writeAttribute("rulerYoffset", m_Doc->rulerYoffset);
 	docu.writeAttribute("GuideRad", m_Doc->guidesSettings.guideRad);
 	docu.writeAttribute("GRAB",m_Doc->guidesSettings.grabRadius);
-	docu.writeAttribute("POLYC", m_Doc->itemToolPrefs.polyC);
-	docu.writeAttribute("POLYF", m_Doc->itemToolPrefs.polyF);
-	docu.writeAttribute("POLYR", m_Doc->itemToolPrefs.polyR);
+	docu.writeAttribute("POLYC", m_Doc->itemToolPrefs.polyCorners);
+	docu.writeAttribute("POLYF", m_Doc->itemToolPrefs.polyFactorValue2);
+	docu.writeAttribute("POLYR", m_Doc->itemToolPrefs.polyRotation);
 	docu.writeAttribute("POLYCUR", m_Doc->itemToolPrefs.polyCurvature);
-	docu.writeAttribute("POLYFD", m_Doc->itemToolPrefs.polyFd);
-	docu.writeAttribute("POLYS", static_cast<int>(m_Doc->itemToolPrefs.polyS));
+	docu.writeAttribute("POLYFD", m_Doc->itemToolPrefs.polyFactorValue);
+	docu.writeAttribute("POLYS", static_cast<int>(m_Doc->itemToolPrefs.polyUseFactor));
 	docu.writeAttribute("AutoSave", static_cast<int>(m_Doc->AutoSave));
 	docu.writeAttribute("AutoSaveTime", m_Doc->AutoSaveTime);
 	docu.writeAttribute("ScratchBottom", m_Doc->scratch.Bottom);
@@ -188,37 +188,37 @@
 	docu.writeAttribute("ScratchTop", m_Doc->scratch.Top);
 	docu.writeAttribute("GapHorizontal", m_Doc->GapHorizontal);
 	docu.writeAttribute("GapVertical", m_Doc->GapVertical);
-	docu.writeAttribute("StartArrow", m_Doc->itemToolPrefs.dStartArrow);
-	docu.writeAttribute("EndArrow", m_Doc->itemToolPrefs.dEndArrow);
-	docu.writeAttribute("PEN",m_Doc->itemToolPrefs.dPen);
-	docu.writeAttribute("BRUSH",m_Doc->itemToolPrefs.dBrush);
-	docu.writeAttribute("PENLINE",m_Doc->itemToolPrefs.dPenLine);
-	docu.writeAttribute("PENTEXT",m_Doc->itemToolPrefs.dPenText);
-	docu.writeAttribute("StrokeText",m_Doc->itemToolPrefs.dStrokeText);
-	docu.writeAttribute("TextBackGround", m_Doc->itemToolPrefs.dTextBackGround);
-	docu.writeAttribute("TextLineColor", m_Doc->itemToolPrefs.dTextLineColor);
-	docu.writeAttribute("TextBackGroundShade", m_Doc->itemToolPrefs.dTextBackGroundShade);
-	docu.writeAttribute("TextLineShade", m_Doc->itemToolPrefs.dTextLineShade);
-	docu.writeAttribute("TextPenShade", m_Doc->itemToolPrefs.dTextPenShade);
-	docu.writeAttribute("TextStrokeShade", m_Doc->itemToolPrefs.dTextStrokeShade);
-	docu.writeAttribute("STIL",m_Doc->itemToolPrefs.dLineArt);
-	docu.writeAttribute("STILLINE",m_Doc->itemToolPrefs.dLstyleLine);
-	docu.writeAttribute("WIDTH",m_Doc->itemToolPrefs.dWidth);
-	docu.writeAttribute("WIDTHLINE",m_Doc->itemToolPrefs.dWidthLine);
-	docu.writeAttribute("PENSHADE",m_Doc->itemToolPrefs.dShade2);
-	docu.writeAttribute("LINESHADE",m_Doc->itemToolPrefs.dShadeLine);
-	docu.writeAttribute("BRUSHSHADE",m_Doc->itemToolPrefs.dShade);
+	docu.writeAttribute("StartArrow", m_Doc->itemToolPrefs.lineStartArrow);
+	docu.writeAttribute("EndArrow", m_Doc->itemToolPrefs.lineEndArrow);
+	docu.writeAttribute("PEN",m_Doc->itemToolPrefs.shapePen);
+	docu.writeAttribute("BRUSH",m_Doc->itemToolPrefs.shapeBrush);
+	docu.writeAttribute("PENLINE",m_Doc->itemToolPrefs.lineColor);
+	docu.writeAttribute("PENTEXT",m_Doc->itemToolPrefs.textColor);
+	docu.writeAttribute("StrokeText",m_Doc->itemToolPrefs.textStrokeColor);
+	docu.writeAttribute("TextBackGround", m_Doc->itemToolPrefs.textBackground);
+	docu.writeAttribute("TextLineColor", m_Doc->itemToolPrefs.textLineColor);
+	docu.writeAttribute("TextBackGroundShade", m_Doc->itemToolPrefs.textBackgroundShade);
+	docu.writeAttribute("TextLineShade", m_Doc->itemToolPrefs.textLineShade);
+	docu.writeAttribute("TextPenShade", m_Doc->itemToolPrefs.textShade);
+	docu.writeAttribute("TextStrokeShade", m_Doc->itemToolPrefs.textStrokeShade);
+	docu.writeAttribute("STIL",m_Doc->itemToolPrefs.shapeLineArt);
+	docu.writeAttribute("STILLINE",m_Doc->itemToolPrefs.lineStyle);
+	docu.writeAttribute("WIDTH",m_Doc->itemToolPrefs.shapeWidth);
+	docu.writeAttribute("WIDTHLINE",m_Doc->itemToolPrefs.lineWidth);
+	docu.writeAttribute("PENSHADE",m_Doc->itemToolPrefs.shapeShade2);
+	docu.writeAttribute("LINESHADE",m_Doc->itemToolPrefs.lineShade);
+	docu.writeAttribute("BRUSHSHADE",m_Doc->itemToolPrefs.shapeShade);
 	docu.writeAttribute("MAGMIN",m_Doc->opToolPrefs.magMin);
 	docu.writeAttribute("MAGMAX",m_Doc->opToolPrefs.magMax);
 	docu.writeAttribute("MAGSTEP",m_Doc->opToolPrefs.magStep);
-	docu.writeAttribute("CPICT",m_Doc->itemToolPrefs.dBrushPict);
-	docu.writeAttribute("PICTSHADE",m_Doc->itemToolPrefs.shadePict);
-	docu.writeAttribute("PICTSCX",m_Doc->itemToolPrefs.scaleX);
-	docu.writeAttribute("PICTSCY",m_Doc->itemToolPrefs.scaleY);
-	docu.writeAttribute("PSCALE", static_cast<int>(m_Doc->itemToolPrefs.scaleType));
-	docu.writeAttribute("PASPECT", static_cast<int>(m_Doc->itemToolPrefs.aspectRatio));
-	docu.writeAttribute("EmbeddedPath", static_cast<int>(m_Doc->itemToolPrefs.useEmbeddedPath));
-	docu.writeAttribute("HalfRes", m_Doc->itemToolPrefs.lowResType);
+	docu.writeAttribute("CPICT",m_Doc->itemToolPrefs.imageFillColor);
+	docu.writeAttribute("PICTSHADE",m_Doc->itemToolPrefs.imageFillShade);
+	docu.writeAttribute("PICTSCX",m_Doc->itemToolPrefs.imageScaleX);
+	docu.writeAttribute("PICTSCY",m_Doc->itemToolPrefs.imageScaleY);
+	docu.writeAttribute("PSCALE", static_cast<int>(m_Doc->itemToolPrefs.imageScaleType));
+	docu.writeAttribute("PASPECT", static_cast<int>(m_Doc->itemToolPrefs.imageAspectRatio));
+	docu.writeAttribute("EmbeddedPath", static_cast<int>(m_Doc->itemToolPrefs.imageUseEmbeddedPath));
+	docu.writeAttribute("HalfRes", m_Doc->itemToolPrefs.imageLowResType);
 	docu.writeAttribute("dispX", m_Doc->opToolPrefs.dispX);
 	docu.writeAttribute("dispY", m_Doc->opToolPrefs.dispY);
 	docu.writeAttribute("constrain", m_Doc->opToolPrefs.constrain);
Index: scribus/plugins/fileloader/scribus134format/scribus134format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 13995)
+++ scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 13996)
@@ -860,52 +860,52 @@
 
 void Scribus134Format::readToolSettings(ScribusDoc* doc, ScXmlStreamAttributes& attrs)
 {
-	QString defFont = attrs.valueAsString("DFONT");
-	m_AvailableFonts->findFont(defFont, doc);
+	QString textFont = attrs.valueAsString("DFONT");
+	m_AvailableFonts->findFont(textFont, doc);
 
-	doc->itemToolPrefs.defFont = defFont;
-	doc->itemToolPrefs.defSize = qRound(attrs.valueAsDouble("DSIZE", 12.0) * 10);
-	doc->itemToolPrefs.dCols   = attrs.valueAsInt("DCOL", 1);
-	doc->itemToolPrefs.dGap    = attrs.valueAsDouble("DGAP", 0.0);
+	doc->itemToolPrefs.textFont = textFont;
+	doc->itemToolPrefs.textSize = qRound(attrs.valueAsDouble("DSIZE", 12.0) * 10);
+	doc->itemToolPrefs.textColumns   = attrs.valueAsInt("DCOL", 1);
+	doc->itemToolPrefs.textColumnGap    = attrs.valueAsDouble("DGAP", 0.0);
 
-	doc->itemToolPrefs.polyC   = attrs.valueAsInt("POLYC", 4);
-	doc->itemToolPrefs.polyF   = attrs.valueAsDouble("POLYF", 0.5);
-	doc->itemToolPrefs.polyR   = attrs.valueAsDouble("POLYR", 0.0);
+	doc->itemToolPrefs.polyCorners   = attrs.valueAsInt("POLYC", 4);
+	doc->itemToolPrefs.polyFactorValue2   = attrs.valueAsDouble("POLYF", 0.5);
+	doc->itemToolPrefs.polyRotation   = attrs.valueAsDouble("POLYR", 0.0);
 	doc->itemToolPrefs.polyCurvature = attrs.valueAsDouble("POLYCUR", 0.0);
-	doc->itemToolPrefs.polyFd  = attrs.valueAsInt("POLYFD", 0);
-	doc->itemToolPrefs.polyS   = attrs.valueAsBool("POLYS", false);
+	doc->itemToolPrefs.polyFactorValue  = attrs.valueAsInt("POLYFD", 0);
+	doc->itemToolPrefs.polyUseFactor   = attrs.valueAsBool("POLYS", false);
 
-	doc->itemToolPrefs.dStartArrow = attrs.valueAsInt("StartArrow", 0);
-	doc->itemToolPrefs.dEndArrow   = attrs.valueAsInt("EndArrow", 0);
-	doc->itemToolPrefs.scaleX      = attrs.valueAsDouble("PICTSCX", 1.0);
-	doc->itemToolPrefs.scaleY      = attrs.valueAsDouble("PICTSCY", 1.0);
-	doc->itemToolPrefs.scaleType   = attrs.valueAsBool("PSCALE", true);
-	doc->itemToolPrefs.aspectRatio = attrs.valueAsBool("PASPECT", false);
-	doc->itemToolPrefs.lowResType  = attrs.valueAsInt("HalfRes", 1);
-	doc->itemToolPrefs.useEmbeddedPath = attrs.valueAsBool("EmbeddedPath", false);
+	doc->itemToolPrefs.lineStartArrow = attrs.valueAsInt("StartArrow", 0);
+	doc->itemToolPrefs.lineEndArrow   = attrs.valueAsInt("EndArrow", 0);
+	doc->itemToolPrefs.imageScaleX      = attrs.valueAsDouble("PICTSCX", 1.0);
+	doc->itemToolPrefs.imageScaleY      = attrs.valueAsDouble("PICTSCY", 1.0);
+	doc->itemToolPrefs.imageScaleType   = attrs.valueAsBool("PSCALE", true);
+	doc->itemToolPrefs.imageAspectRatio = attrs.valueAsBool("PASPECT", false);
+	doc->itemToolPrefs.imageLowResType  = attrs.valueAsInt("HalfRes", 1);
+	doc->itemToolPrefs.imageUseEmbeddedPath = attrs.valueAsBool("EmbeddedPath", false);
 	if (attrs.hasAttribute("PEN"))
-		doc->itemToolPrefs.dPen = attrs.valueAsString("PEN");
+		doc->itemToolPrefs.shapePen = attrs.valueAsString("PEN");
 	if (attrs.hasAttribute("BRUSH"))
-		doc->itemToolPrefs.dBrush = attrs.valueAsString("BRUSH");
+		doc->itemToolPrefs.shapeBrush = attrs.valueAsString("BRUSH");
 	if (attrs.hasAttribute("PENLINE"))
-		doc->itemToolPrefs.dPenLine = attrs.valueAsString("PENLINE");
+		doc->itemToolPrefs.lineColor = attrs.valueAsString("PENLINE");
 	if (attrs.hasAttribute("PENTEXT"))
-		doc->itemToolPrefs.dPenText = attrs.valueAsString("PENTEXT");
+		doc->itemToolPrefs.textColor = attrs.valueAsString("PENTEXT");
 	if (attrs.hasAttribute("StrokeText"))
-		doc->itemToolPrefs.dStrokeText = attrs.valueAsString("StrokeText");
-	doc->itemToolPrefs.dTextBackGround  = attrs.valueAsString("TextBackGround", CommonStrings::None);
-	doc->itemToolPrefs.dTextLineColor   = attrs.valueAsString("TextLineColor", CommonStrings::None);
-	doc->itemToolPrefs.dTextBackGroundShade =attrs.valueAsInt("TextBackGroundShade", 100);
-	doc->itemToolPrefs.dTextLineShade   = attrs.valueAsInt("TextLineShade", 100);
-	doc->itemToolPrefs.dTextPenShade    = attrs.valueAsInt("TextPenShade", 100);
-	doc->itemToolPrefs.dTextStrokeShade = attrs.valueAsInt("TextStrokeShade", 100);
-	doc->itemToolPrefs.dLineArt    = static_cast<Qt::PenStyle>(attrs.valueAsInt("STIL"));
-	doc->itemToolPrefs.dLstyleLine = static_cast<Qt::PenStyle>(attrs.valueAsInt("STILLINE"));
-	doc->itemToolPrefs.dWidth      = attrs.valueAsDouble("WIDTH", 0.0);
-	doc->itemToolPrefs.dWidthLine  = attrs.valueAsDouble("WIDTHLINE", 1.0);
-	doc->itemToolPrefs.dShade2     = attrs.valueAsInt("PENSHADE", 100);
-	doc->itemToolPrefs.dShadeLine  = attrs.valueAsInt("LINESHADE", 100);
-	doc->itemToolPrefs.dShade      = attrs.valueAsInt("BRUSHSHADE", 100);
+		doc->itemToolPrefs.textStrokeColor = attrs.valueAsString("StrokeText");
+	doc->itemToolPrefs.textBackground  = attrs.valueAsString("TextBackGround", CommonStrings::None);
+	doc->itemToolPrefs.textLineColor   = attrs.valueAsString("TextLineColor", CommonStrings::None);
+	doc->itemToolPrefs.textBackgroundShade =attrs.valueAsInt("TextBackGroundShade", 100);
+	doc->itemToolPrefs.textLineShade   = attrs.valueAsInt("TextLineShade", 100);
+	doc->itemToolPrefs.textShade    = attrs.valueAsInt("TextPenShade", 100);
+	doc->itemToolPrefs.textStrokeShade = attrs.valueAsInt("TextStrokeShade", 100);
+	doc->itemToolPrefs.shapeLineArt    = static_cast<Qt::PenStyle>(attrs.valueAsInt("STIL"));
+	doc->itemToolPrefs.lineStyle = static_cast<Qt::PenStyle>(attrs.valueAsInt("STILLINE"));
+	doc->itemToolPrefs.shapeWidth      = attrs.valueAsDouble("WIDTH", 0.0);
+	doc->itemToolPrefs.lineWidth  = attrs.valueAsDouble("WIDTHLINE", 1.0);
+	doc->itemToolPrefs.shapeShade2     = attrs.valueAsInt("PENSHADE", 100);
+	doc->itemToolPrefs.lineColor  = attrs.valueAsInt("LINESHADE", 100);
+	doc->itemToolPrefs.shapeShade      = attrs.valueAsInt("BRUSHSHADE", 100);
 	doc->opToolPrefs.magMin      = attrs.valueAsInt("MAGMIN", 10);
 	doc->opToolPrefs.magMax      = attrs.valueAsInt("MAGMAX", 3200);
 	doc->opToolPrefs.magStep     = attrs.valueAsInt("MAGSTEP", 200);
@@ -915,11 +915,11 @@
 	//CB Reset doc zoom step value to 200% instead of old values.
 	if (doc->opToolPrefs.magStep < 100)
 		doc->opToolPrefs.magStep = 200;
-	doc->itemToolPrefs.tabFillChar = attrs.valueAsString("TabFill","");
-	doc->itemToolPrefs.dTabWidth   = attrs.valueAsDouble("TabWidth", 36.0);
+	doc->itemToolPrefs.textTabFillChar = attrs.valueAsString("TabFill","");
+	doc->itemToolPrefs.textTabWidth   = attrs.valueAsDouble("TabWidth", 36.0);
 	if (attrs.hasAttribute("CPICT"))
-		doc->itemToolPrefs.dBrushPict = attrs.valueAsString("CPICT");
-	doc->itemToolPrefs.shadePict = attrs.valueAsInt("PICTSHADE", 100);
+		doc->itemToolPrefs.imageFillColor = attrs.valueAsString("CPICT");
+	doc->itemToolPrefs.imageFillShade = attrs.valueAsInt("PICTSHADE", 100);
 }
 
 void Scribus134Format::readTypographicSettings(ScribusDoc* doc, ScXmlStreamAttributes& attrs)
@@ -1705,7 +1705,7 @@
 		newItem->OwnPage = attrs.valueAsInt("OwnPage");
 	if (tagName == "PAGEOBJECT")
 		newItem->OnMasterPage = "";
-	QString tmpf = attrs.valueAsString("IFONT", doc->itemToolPrefs.defFont);
+	QString tmpf = attrs.valueAsString("IFONT", doc->itemToolPrefs.textFont);
 	m_AvailableFonts->findFont(tmpf, doc);
 
 //	newItem->Language = ScMW->GetLang(pg.attribute("LANGUAGE", doc->Language));
@@ -1868,10 +1868,10 @@
 
 	if (newItem->fill_gradient.Stops() == 0)
 	{
-		const ScColor& col1 = doc->PageColors[doc->itemToolPrefs.dBrush];
-		const ScColor& col2 = doc->PageColors[doc->itemToolPrefs.dPen];
-		newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col1, doc), 0.0, 0.5, 1.0, doc->itemToolPrefs.dBrush, 100);
-		newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, doc), 1.0, 0.5, 1.0, doc->itemToolPrefs.dPen, 100);
+		const ScColor& col1 = doc->PageColors[doc->itemToolPrefs.shapeBrush];
+		const ScColor& col2 = doc->PageColors[doc->itemToolPrefs.shapePen];
+		newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col1, doc), 0.0, 0.5, 1.0, doc->itemToolPrefs.shapeBrush, 100);
+		newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, doc), 1.0, 0.5, 1.0, doc->itemToolPrefs.shapePen, 100);
 	}
 
 	if (newItem->asPathText())
@@ -2288,7 +2288,7 @@
 	case PageItem::ImageFrame:
 	case PageItem::OSGFrame:
 	case PageItem::LatexFrame: /*Everything that is valid for image frames is also valid for latex frames*/
-		z = doc->itemAdd(pt, PageItem::Unspecified, x, y, w, h, 1, doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+		z = doc->itemAdd(pt, PageItem::Unspecified, x, y, w, h, 1, doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 		currItem = doc->Items->at(z);
 		if (pagenr > -2) 
 			currItem->OwnPage = pagenr;
Index: scribus/plugins/fontpreview/fontpreview.cpp
===================================================================
--- scribus/plugins/fontpreview/fontpreview.cpp	(revision 13995)
+++ scribus/plugins/fontpreview/fontpreview.cpp	(revision 13996)
@@ -70,7 +70,7 @@
 		if (m_Doc->m_Selection->count() != 0)
 			searchName = m_Doc->currentStyle.charStyle().font().scName();
 		else
-			searchName = PrefsManager::instance()->appPrefs.itemToolPrefs.defFont;
+			searchName = PrefsManager::instance()->appPrefs.itemToolPrefs.textFont;
 	}
 	QModelIndexList found = fontModel->match(fontModel->index(0, 0),
 											 Qt::DisplayRole, searchName,
Index: scribus/pageitem_textframe.cpp
===================================================================
--- scribus/pageitem_textframe.cpp	(revision 13995)
+++ scribus/pageitem_textframe.cpp	(revision 13996)
@@ -1413,7 +1413,7 @@
 					tTabValues = style.tabValues();
 					if (tTabValues.isEmpty())
 					{
-						double dtw=m_Doc->itemToolPrefs.dTabWidth;
+						double dtw=m_Doc->itemToolPrefs.textTabWidth;
 						if ((current.xPos - current.colLeft) != 0)
 						{
 							if (current.xPos == current.colLeft + ceil((current.xPos-current.colLeft) / dtw) * dtw)
@@ -1441,7 +1441,7 @@
 						}
 						tabs.active = (tabs.status != TabLEFT);
 						if (tCurX == oCurX-wide)
-							current.xPos = current.colLeft + ceil((current.xPos-current.colLeft) / m_Doc->itemToolPrefs.dTabWidth) * m_Doc->itemToolPrefs.dTabWidth;
+							current.xPos = current.colLeft + ceil((current.xPos-current.colLeft) / m_Doc->itemToolPrefs.textTabWidth) * m_Doc->itemToolPrefs.textTabWidth;
 						else
 							current.xPos = current.colLeft + tCurX;
 						
Index: scribus/ui/polygonwidget.cpp
===================================================================
--- scribus/ui/polygonwidget.cpp	(revision 13995)
+++ scribus/ui/polygonwidget.cpp	(revision 13996)
@@ -65,14 +65,14 @@
 	disconnect(CurvatureSpin, SIGNAL(valueChanged(int)), this, SLOT(ValFromSpin3(int)));
 	disconnect(CurvatureSlider, SIGNAL(valueChanged(int)), CurvatureSpin, SLOT(setValue(int)));
 	disconnect(CurvatureSlider, SIGNAL(valueChanged(int)), this, SLOT(UpdatePreView()));
-	PFactor = prefsData->polyS;
-	Ecken->setValue(prefsData->polyC);	
-	Faktor2->setValue(static_cast<int>(prefsData->polyR));
-	Slider2->setValue(static_cast<int>(prefsData->polyR));
-	Konvex->setChecked(prefsData->polyS);
-	Faktor->setValue(prefsData->polyFd);
-	Slider1->setValue(prefsData->polyFd);
-	if (prefsData->polyFd == 0)
+	PFactor = prefsData->polyUseFactor;
+	Ecken->setValue(prefsData->polyCorners);
+	Faktor2->setValue(static_cast<int>(prefsData->polyRotation));
+	Slider2->setValue(static_cast<int>(prefsData->polyRotation));
+	Konvex->setChecked(prefsData->polyUseFactor);
+	Faktor->setValue(prefsData->polyFactorValue);
+	Slider1->setValue(prefsData->polyFactorValue);
+	if (prefsData->polyFactorValue == 0)
 		Konvex->setChecked(false);
 	CurvatureSpin->setValue(qRound(prefsData->polyCurvature * 100));
 	CurvatureSlider->setValue(qRound(prefsData->polyCurvature * 100));
Index: scribus/ui/prefs.cpp
===================================================================
--- scribus/ui/prefs.cpp	(revision 13995)
+++ scribus/ui/prefs.cpp	(revision 13996)
@@ -391,11 +391,11 @@
 	prefsManager->appPrefs.scrapbookPrefs.persistentScrapbook = tabScrapbook->persistentScrapbook->isChecked();
 	prefsManager->appPrefs.scrapbookPrefs.numScrapbookCopies = tabScrapbook->numScrapCopies->value();
 
-	tabTools->polyWidget->getValues(&prefsManager->appPrefs.itemToolPrefs.polyC,
-									&prefsManager->appPrefs.itemToolPrefs.polyFd,
-									&prefsManager->appPrefs.itemToolPrefs.polyF,
-									&prefsManager->appPrefs.itemToolPrefs.polyS,
-									&prefsManager->appPrefs.itemToolPrefs.polyR,
+	tabTools->polyWidget->getValues(&prefsManager->appPrefs.itemToolPrefs.polyCorners,
+									&prefsManager->appPrefs.itemToolPrefs.polyFactorValue,
+									&prefsManager->appPrefs.itemToolPrefs.polyFactorValue2,
+									&prefsManager->appPrefs.itemToolPrefs.polyUseFactor,
+									&prefsManager->appPrefs.itemToolPrefs.polyRotation,
 									&prefsManager->appPrefs.itemToolPrefs.polyCurvature);
 
 	prefsManager->appPrefs.docSetupPrefs.pageSize = tabDocument->prefsPageSizeName;
@@ -440,8 +440,8 @@
 
 	prefsManager->appPrefs.docSetupPrefs.docUnitIndex = tabDocument->unitCombo->currentIndex();
 
-	prefsManager->appPrefs.itemToolPrefs.defFont = tabTools->fontComboText->currentText();
-	prefsManager->appPrefs.itemToolPrefs.defSize = tabTools->sizeComboText->currentText().left(2).toInt() * 10;
+	prefsManager->appPrefs.itemToolPrefs.textFont = tabTools->fontComboText->currentText();
+	prefsManager->appPrefs.itemToolPrefs.textSize = tabTools->sizeComboText->currentText().left(2).toInt() * 10;
 
 	prefsManager->appPrefs.guidesPrefs.marginsShown = tabGuides->marginBox->isChecked();
 	prefsManager->appPrefs.guidesPrefs.gridShown = tabGuides->checkGrid->isChecked();
@@ -470,73 +470,73 @@
 	prefsManager->appPrefs.typoPrefs.valueUnderlineWidth = qRound(tabTypo->underlineWidth->value() * 10);
 	prefsManager->appPrefs.typoPrefs.valueStrikeThruPos = qRound(tabTypo->strikethruPos->value() * 10);
 	prefsManager->appPrefs.typoPrefs.valueStrikeThruWidth = qRound(tabTypo->strikethruWidth->value() * 10);
-	prefsManager->appPrefs.itemToolPrefs.dTextBackGround = tabTools->colorComboTextBackground->currentText();
-	if (prefsManager->appPrefs.itemToolPrefs.dTextBackGround == CommonStrings::tr_NoneColor)
-		prefsManager->appPrefs.itemToolPrefs.dTextBackGround = CommonStrings::None;
-	prefsManager->appPrefs.itemToolPrefs.dTextLineColor = tabTools->colorComboTextLine->currentText();
-	if (prefsManager->appPrefs.itemToolPrefs.dTextLineColor == CommonStrings::tr_NoneColor)
-		prefsManager->appPrefs.itemToolPrefs.dTextLineColor = CommonStrings::None;
-	prefsManager->appPrefs.itemToolPrefs.dTextBackGroundShade = tabTools->shadingTextBack->value();
-	prefsManager->appPrefs.itemToolPrefs.dTextLineShade = tabTools->shadingTextLine->value();
-	prefsManager->appPrefs.itemToolPrefs.dTextPenShade = tabTools->shadingText->value();
-	prefsManager->appPrefs.itemToolPrefs.dTextStrokeShade = tabTools->shadingTextStroke->value();
-	prefsManager->appPrefs.itemToolPrefs.dPen = tabTools->colorComboLineShape->currentText();
-	if (prefsManager->appPrefs.itemToolPrefs.dPen == CommonStrings::tr_NoneColor)
-		prefsManager->appPrefs.itemToolPrefs.dPen = CommonStrings::None;
-	prefsManager->appPrefs.itemToolPrefs.dPenText = tabTools->colorComboText->currentText();
-	if (prefsManager->appPrefs.itemToolPrefs.dPenText == CommonStrings::tr_NoneColor)
-		prefsManager->appPrefs.itemToolPrefs.dPenText = CommonStrings::None;
-	prefsManager->appPrefs.itemToolPrefs.dStrokeText = tabTools->colorComboStrokeText->currentText();
-	if (prefsManager->appPrefs.itemToolPrefs.dStrokeText == CommonStrings::tr_NoneColor)
-		prefsManager->appPrefs.itemToolPrefs.dStrokeText = CommonStrings::None;
-	prefsManager->appPrefs.itemToolPrefs.dCols = tabTools->columnsText->value();
-	prefsManager->appPrefs.itemToolPrefs.dGap = tabTools->gapText->value() / prefsUnitRatio;
-	prefsManager->appPrefs.itemToolPrefs.dTabWidth = tabTools->gapTab->value() / prefsUnitRatio;
-	prefsManager->appPrefs.itemToolPrefs.dBrush = tabTools->comboFillShape->currentText();
-	if (prefsManager->appPrefs.itemToolPrefs.dBrush == CommonStrings::tr_NoneColor)
-		prefsManager->appPrefs.itemToolPrefs.dBrush = CommonStrings::None;
-	prefsManager->appPrefs.itemToolPrefs.dShade = tabTools->shadingFillShape->value();
-	prefsManager->appPrefs.itemToolPrefs.dShade2 = tabTools->shadingLineShape->value();
+	prefsManager->appPrefs.itemToolPrefs.textBackground = tabTools->colorComboTextBackground->currentText();
+	if (prefsManager->appPrefs.itemToolPrefs.textBackground == CommonStrings::tr_NoneColor)
+		prefsManager->appPrefs.itemToolPrefs.textBackground = CommonStrings::None;
+	prefsManager->appPrefs.itemToolPrefs.textLineColor = tabTools->colorComboTextLine->currentText();
+	if (prefsManager->appPrefs.itemToolPrefs.textLineColor == CommonStrings::tr_NoneColor)
+		prefsManager->appPrefs.itemToolPrefs.textLineColor = CommonStrings::None;
+	prefsManager->appPrefs.itemToolPrefs.textBackgroundShade = tabTools->shadingTextBack->value();
+	prefsManager->appPrefs.itemToolPrefs.textLineShade = tabTools->shadingTextLine->value();
+	prefsManager->appPrefs.itemToolPrefs.textShade = tabTools->shadingText->value();
+	prefsManager->appPrefs.itemToolPrefs.textStrokeShade = tabTools->shadingTextStroke->value();
+	prefsManager->appPrefs.itemToolPrefs.shapePen = tabTools->colorComboLineShape->currentText();
+	if (prefsManager->appPrefs.itemToolPrefs.shapePen == CommonStrings::tr_NoneColor)
+		prefsManager->appPrefs.itemToolPrefs.shapePen = CommonStrings::None;
+	prefsManager->appPrefs.itemToolPrefs.textColor = tabTools->colorComboText->currentText();
+	if (prefsManager->appPrefs.itemToolPrefs.textColor == CommonStrings::tr_NoneColor)
+		prefsManager->appPrefs.itemToolPrefs.textColor = CommonStrings::None;
+	prefsManager->appPrefs.itemToolPrefs.textStrokeColor = tabTools->colorComboStrokeText->currentText();
+	if (prefsManager->appPrefs.itemToolPrefs.textStrokeColor == CommonStrings::tr_NoneColor)
+		prefsManager->appPrefs.itemToolPrefs.textStrokeColor = CommonStrings::None;
+	prefsManager->appPrefs.itemToolPrefs.textColumns = tabTools->columnsText->value();
+	prefsManager->appPrefs.itemToolPrefs.textColumnGap = tabTools->gapText->value() / prefsUnitRatio;
+	prefsManager->appPrefs.itemToolPrefs.textTabWidth = tabTools->gapTab->value() / prefsUnitRatio;
+	prefsManager->appPrefs.itemToolPrefs.shapeBrush = tabTools->comboFillShape->currentText();
+	if (prefsManager->appPrefs.itemToolPrefs.shapeBrush == CommonStrings::tr_NoneColor)
+		prefsManager->appPrefs.itemToolPrefs.shapeBrush = CommonStrings::None;
+	prefsManager->appPrefs.itemToolPrefs.shapeShade = tabTools->shadingFillShape->value();
+	prefsManager->appPrefs.itemToolPrefs.shapeShade2 = tabTools->shadingLineShape->value();
 	switch (tabTools->tabFillCombo->currentIndex())
 	{
 		case 0:
-			prefsManager->appPrefs.itemToolPrefs.tabFillChar = "";
+			prefsManager->appPrefs.itemToolPrefs.textTabFillChar = "";
 			break;
 		case 1:
-			prefsManager->appPrefs.itemToolPrefs.tabFillChar = ".";
+			prefsManager->appPrefs.itemToolPrefs.textTabFillChar = ".";
 			break;
 		case 2:
-			prefsManager->appPrefs.itemToolPrefs.tabFillChar = "-";
+			prefsManager->appPrefs.itemToolPrefs.textTabFillChar = "-";
 			break;
 		case 3:
-			prefsManager->appPrefs.itemToolPrefs.tabFillChar = "_";
+			prefsManager->appPrefs.itemToolPrefs.textTabFillChar = "_";
 			break;
 		case 4:
-			prefsManager->appPrefs.itemToolPrefs.tabFillChar = tabTools->tabFillCombo->currentText().right(1);
+			prefsManager->appPrefs.itemToolPrefs.textTabFillChar = tabTools->tabFillCombo->currentText().right(1);
 			break;
 	}
-	prefsManager->appPrefs.itemToolPrefs.dLineArt = static_cast<Qt::PenStyle>(tabTools->comboStyleShape->currentIndex()) + 1;
-	prefsManager->appPrefs.itemToolPrefs.dWidth = tabTools->lineWidthShape->value();
-	prefsManager->appPrefs.itemToolPrefs.dPenLine = tabTools->colorComboLine->currentText();
-	if (prefsManager->appPrefs.itemToolPrefs.dPenLine == CommonStrings::tr_NoneColor)
-		prefsManager->appPrefs.itemToolPrefs.dPenLine = CommonStrings::None;
-	prefsManager->appPrefs.itemToolPrefs.dShadeLine = tabTools->shadingLine->value();
-	prefsManager->appPrefs.itemToolPrefs.dLstyleLine = static_cast<Qt::PenStyle>(tabTools->comboStyleLine->currentIndex()) + 1;
-	prefsManager->appPrefs.itemToolPrefs.dWidthLine = tabTools->lineWidthLine->value();
-	prefsManager->appPrefs.itemToolPrefs.dStartArrow = tabTools->startArrow->currentIndex();
-	prefsManager->appPrefs.itemToolPrefs.dEndArrow = tabTools->endArrow->currentIndex();
+	prefsManager->appPrefs.itemToolPrefs.shapeLineArt = static_cast<Qt::PenStyle>(tabTools->comboStyleShape->currentIndex()) + 1;
+	prefsManager->appPrefs.itemToolPrefs.shapeWidth = tabTools->lineWidthShape->value();
+	prefsManager->appPrefs.itemToolPrefs.lineColor = tabTools->colorComboLine->currentText();
+	if (prefsManager->appPrefs.itemToolPrefs.lineColor == CommonStrings::tr_NoneColor)
+		prefsManager->appPrefs.itemToolPrefs.lineColor = CommonStrings::None;
+	prefsManager->appPrefs.itemToolPrefs.lineShade = tabTools->shadingLine->value();
+	prefsManager->appPrefs.itemToolPrefs.lineStyle = static_cast<Qt::PenStyle>(tabTools->comboStyleLine->currentIndex()) + 1;
+	prefsManager->appPrefs.itemToolPrefs.lineWidth = tabTools->lineWidthLine->value();
+	prefsManager->appPrefs.itemToolPrefs.lineStartArrow = tabTools->startArrow->currentIndex();
+	prefsManager->appPrefs.itemToolPrefs.lineEndArrow = tabTools->endArrow->currentIndex();
 	prefsManager->appPrefs.opToolPrefs.magMin = tabTools->minimumZoom->value();
 	prefsManager->appPrefs.opToolPrefs.magMax = tabTools->maximumZoom->value();
 	prefsManager->appPrefs.opToolPrefs.magStep = tabTools->zoomStep->value();
-	prefsManager->appPrefs.itemToolPrefs.dBrushPict = tabTools->comboFillImage->currentText();
-	if (prefsManager->appPrefs.itemToolPrefs.dBrushPict == CommonStrings::tr_NoneColor)
-		prefsManager->appPrefs.itemToolPrefs.dBrushPict = CommonStrings::None;
-	prefsManager->appPrefs.itemToolPrefs.shadePict = tabTools->shadingFillImage->value();
-	prefsManager->appPrefs.itemToolPrefs.scaleX = static_cast<double>(tabTools->scalingHorizontal->value()) / 100.0;
-	prefsManager->appPrefs.itemToolPrefs.scaleY = static_cast<double>(tabTools->scalingVertical->value()) / 100.0;
-	prefsManager->appPrefs.itemToolPrefs.scaleType = tabTools->buttonGroup3->isChecked();
-	prefsManager->appPrefs.itemToolPrefs.aspectRatio = tabTools->checkRatioImage->isChecked();
-	prefsManager->appPrefs.itemToolPrefs.useEmbeddedPath = tabTools->embeddedPath->isChecked();
+	prefsManager->appPrefs.itemToolPrefs.imageFillColor = tabTools->comboFillImage->currentText();
+	if (prefsManager->appPrefs.itemToolPrefs.imageFillColor == CommonStrings::tr_NoneColor)
+		prefsManager->appPrefs.itemToolPrefs.imageFillColor = CommonStrings::None;
+	prefsManager->appPrefs.itemToolPrefs.imageFillShade = tabTools->shadingFillImage->value();
+	prefsManager->appPrefs.itemToolPrefs.imageScaleX = static_cast<double>(tabTools->scalingHorizontal->value()) / 100.0;
+	prefsManager->appPrefs.itemToolPrefs.imageScaleY = static_cast<double>(tabTools->scalingVertical->value()) / 100.0;
+	prefsManager->appPrefs.itemToolPrefs.imageScaleType = tabTools->buttonGroup3->isChecked();
+	prefsManager->appPrefs.itemToolPrefs.imageAspectRatio = tabTools->checkRatioImage->isChecked();
+	prefsManager->appPrefs.itemToolPrefs.imageUseEmbeddedPath = tabTools->embeddedPath->isChecked();
 	int haRes = 0;
 	if (tabTools->checkFullRes->isChecked())
 		haRes = 0;
@@ -544,7 +544,7 @@
 		haRes = 1;
 	if (tabTools->checkHalfRes->isChecked())
 		haRes = 2;
-	prefsManager->appPrefs.itemToolPrefs.lowResType = haRes;
+	prefsManager->appPrefs.itemToolPrefs.imageLowResType = haRes;
 	prefsManager->appPrefs.opToolPrefs.dispX = tabTools->genDispX->value();
 	prefsManager->appPrefs.opToolPrefs.dispY = tabTools->genDispY->value();
 	prefsManager->appPrefs.opToolPrefs.constrain = tabTools->genRot->value();
Index: scribus/ui/hruler.cpp
===================================================================
--- scribus/ui/hruler.cpp	(revision 13995)
+++ scribus/ui/hruler.cpp	(revision 13996)
@@ -170,7 +170,7 @@
 			ParagraphStyle::TabRecord tb;
 			tb.tabPosition = newY / Scaling;
 			tb.tabType = 0;
-			tb.tabFillChar = currDoc->itemToolPrefs.tabFillChar[0];
+			tb.tabFillChar = currDoc->itemToolPrefs.textTabFillChar[0];
 			TabValues.prepend(tb);
 			ActTab = 0;
 			RulerCode = rc_tab;
Index: scribus/ui/modetoolbar.cpp
===================================================================
--- scribus/ui/modetoolbar.cpp	(revision 13995)
+++ scribus/ui/modetoolbar.cpp	(revision 13996)
@@ -89,9 +89,9 @@
 
 void ModeToolBar::GetPolyProps()
 {
-	PolygonProps* dia = new PolygonProps(this, m_ScMW->doc->itemToolPrefs.polyC, m_ScMW->doc->itemToolPrefs.polyFd, m_ScMW->doc->itemToolPrefs.polyF, m_ScMW->doc->itemToolPrefs.polyS, m_ScMW->doc->itemToolPrefs.polyR, m_ScMW->doc->itemToolPrefs.polyCurvature);
+	PolygonProps* dia = new PolygonProps(this, m_ScMW->doc->itemToolPrefs.polyCorners, m_ScMW->doc->itemToolPrefs.polyFactorValue, m_ScMW->doc->itemToolPrefs.polyFactorValue2, m_ScMW->doc->itemToolPrefs.polyUseFactor, m_ScMW->doc->itemToolPrefs.polyRotation, m_ScMW->doc->itemToolPrefs.polyCurvature);
 	if (dia->exec())
-		dia->getValues(&m_ScMW->doc->itemToolPrefs.polyC, &m_ScMW->doc->itemToolPrefs.polyFd, &m_ScMW->doc->itemToolPrefs.polyF, &m_ScMW->doc->itemToolPrefs.polyS, &m_ScMW->doc->itemToolPrefs.polyR, &m_ScMW->doc->itemToolPrefs.polyCurvature);
+		dia->getValues(&m_ScMW->doc->itemToolPrefs.polyCorners, &m_ScMW->doc->itemToolPrefs.polyFactorValue, &m_ScMW->doc->itemToolPrefs.polyFactorValue2, &m_ScMW->doc->itemToolPrefs.polyUseFactor, &m_ScMW->doc->itemToolPrefs.polyRotation, &m_ScMW->doc->itemToolPrefs.polyCurvature);
 	delete dia;
 }
 
Index: scribus/ui/reformdoc.cpp
===================================================================
--- scribus/ui/reformdoc.cpp	(revision 13995)
+++ scribus/ui/reformdoc.cpp	(revision 13996)
@@ -343,75 +343,75 @@
 	currDoc->typographicSettings.valueUnderlineWidth = qRound(tabTypo->underlineWidth->value() * 10);
 	currDoc->typographicSettings.valueStrikeThruPos = qRound(tabTypo->strikethruPos->value() * 10);
 	currDoc->typographicSettings.valueStrikeThruWidth = qRound(tabTypo->strikethruWidth->value() * 10);
-	currDoc->itemToolPrefs.defFont = tabTools->fontComboText->currentText();
-	currDoc->itemToolPrefs.defSize = tabTools->sizeComboText->currentText().left(2).toInt() * 10;
-	currDoc->itemToolPrefs.dStrokeText = tabTools->colorComboStrokeText->currentText();
+	currDoc->itemToolPrefs.textFont = tabTools->fontComboText->currentText();
+	currDoc->itemToolPrefs.textSize = tabTools->sizeComboText->currentText().left(2).toInt() * 10;
+	currDoc->itemToolPrefs.textStrokeColor = tabTools->colorComboStrokeText->currentText();
 	switch (tabTools->tabFillCombo->currentIndex())
 	{
 		case 0:
-			currDoc->itemToolPrefs.tabFillChar = "";
+			currDoc->itemToolPrefs.textTabFillChar = "";
 			break;
 		case 1:
-			currDoc->itemToolPrefs.tabFillChar = ".";
+			currDoc->itemToolPrefs.textTabFillChar = ".";
 			break;
 		case 2:
-			currDoc->itemToolPrefs.tabFillChar = "-";
+			currDoc->itemToolPrefs.textTabFillChar = "-";
 			break;
 		case 3:
-			currDoc->itemToolPrefs.tabFillChar = "_";
+			currDoc->itemToolPrefs.textTabFillChar = "_";
 			break;
 		case 4:
-			currDoc->itemToolPrefs.tabFillChar = tabTools->tabFillCombo->currentText().right(1);
+			currDoc->itemToolPrefs.textTabFillChar = tabTools->tabFillCombo->currentText().right(1);
 			break;
 	}
-	if (currDoc->itemToolPrefs.dStrokeText == CommonStrings::tr_NoneColor)
-		currDoc->itemToolPrefs.dStrokeText = CommonStrings::None;
-	currDoc->itemToolPrefs.dPenText = tabTools->colorComboText->currentText();
-	if (currDoc->itemToolPrefs.dPenText == CommonStrings::tr_NoneColor)
-		currDoc->itemToolPrefs.dPenText = CommonStrings::None;
-	currDoc->itemToolPrefs.dTextBackGround = tabTools->colorComboTextBackground->currentText();
-	if (currDoc->itemToolPrefs.dTextBackGround == CommonStrings::tr_NoneColor)
-		currDoc->itemToolPrefs.dTextBackGround = CommonStrings::None;
-	currDoc->itemToolPrefs.dTextLineColor = tabTools->colorComboTextLine->currentText();
-	if (currDoc->itemToolPrefs.dTextLineColor == CommonStrings::tr_NoneColor)
-		currDoc->itemToolPrefs.dTextLineColor = CommonStrings::None;
-	currDoc->itemToolPrefs.dTextBackGroundShade = tabTools->shadingTextBack->value();
-	currDoc->itemToolPrefs.dTextLineShade = tabTools->shadingTextLine->value();
-	currDoc->itemToolPrefs.dTextPenShade = tabTools->shadingText->value();
-	currDoc->itemToolPrefs.dTextStrokeShade = tabTools->shadingTextStroke->value();
-	currDoc->itemToolPrefs.dCols = tabTools->columnsText->value();
-	currDoc->itemToolPrefs.dGap = tabTools->gapText->value() / currDoc->unitRatio();
-	currDoc->itemToolPrefs.dTabWidth = tabTools->gapTab->value() / currDoc->unitRatio();
-	currDoc->itemToolPrefs.dPen = tabTools->colorComboLineShape->currentText();
-	if (currDoc->itemToolPrefs.dPen == CommonStrings::tr_NoneColor)
-		currDoc->itemToolPrefs.dPen = CommonStrings::None;
-	currDoc->itemToolPrefs.dBrush = tabTools->comboFillShape->currentText();
-	if (currDoc->itemToolPrefs.dBrush == CommonStrings::tr_NoneColor)
-		currDoc->itemToolPrefs.dBrush = CommonStrings::None;
-	currDoc->itemToolPrefs.dShade = tabTools->shadingFillShape->value();
-	currDoc->itemToolPrefs.dShade2 = tabTools->shadingLineShape->value();
-	currDoc->itemToolPrefs.dLineArt = static_cast<Qt::PenStyle>(tabTools->comboStyleShape->currentIndex()) + 1;
-	currDoc->itemToolPrefs.dWidth = tabTools->lineWidthShape->value();
-	currDoc->itemToolPrefs.dStartArrow = tabTools->startArrow->currentIndex();
-	currDoc->itemToolPrefs.dEndArrow = tabTools->endArrow->currentIndex();
+	if (currDoc->itemToolPrefs.textStrokeColor == CommonStrings::tr_NoneColor)
+		currDoc->itemToolPrefs.textStrokeColor = CommonStrings::None;
+	currDoc->itemToolPrefs.textColor = tabTools->colorComboText->currentText();
+	if (currDoc->itemToolPrefs.textColor == CommonStrings::tr_NoneColor)
+		currDoc->itemToolPrefs.textColor = CommonStrings::None;
+	currDoc->itemToolPrefs.textBackground = tabTools->colorComboTextBackground->currentText();
+	if (currDoc->itemToolPrefs.textBackground == CommonStrings::tr_NoneColor)
+		currDoc->itemToolPrefs.textBackground = CommonStrings::None;
+	currDoc->itemToolPrefs.textLineColor = tabTools->colorComboTextLine->currentText();
+	if (currDoc->itemToolPrefs.textLineColor == CommonStrings::tr_NoneColor)
+		currDoc->itemToolPrefs.textLineColor = CommonStrings::None;
+	currDoc->itemToolPrefs.textBackgroundShade = tabTools->shadingTextBack->value();
+	currDoc->itemToolPrefs.textLineShade = tabTools->shadingTextLine->value();
+	currDoc->itemToolPrefs.textShade = tabTools->shadingText->value();
+	currDoc->itemToolPrefs.textStrokeShade = tabTools->shadingTextStroke->value();
+	currDoc->itemToolPrefs.textColumns = tabTools->columnsText->value();
+	currDoc->itemToolPrefs.textColumnGap = tabTools->gapText->value() / currDoc->unitRatio();
+	currDoc->itemToolPrefs.textTabWidth = tabTools->gapTab->value() / currDoc->unitRatio();
+	currDoc->itemToolPrefs.shapePen = tabTools->colorComboLineShape->currentText();
+	if (currDoc->itemToolPrefs.shapePen == CommonStrings::tr_NoneColor)
+		currDoc->itemToolPrefs.shapePen = CommonStrings::None;
+	currDoc->itemToolPrefs.shapeBrush = tabTools->comboFillShape->currentText();
+	if (currDoc->itemToolPrefs.shapeBrush == CommonStrings::tr_NoneColor)
+		currDoc->itemToolPrefs.shapeBrush = CommonStrings::None;
+	currDoc->itemToolPrefs.shapeShade = tabTools->shadingFillShape->value();
+	currDoc->itemToolPrefs.shapeShade2 = tabTools->shadingLineShape->value();
+	currDoc->itemToolPrefs.shapeLineArt = static_cast<Qt::PenStyle>(tabTools->comboStyleShape->currentIndex()) + 1;
+	currDoc->itemToolPrefs.shapeWidth = tabTools->lineWidthShape->value();
+	currDoc->itemToolPrefs.lineStartArrow = tabTools->startArrow->currentIndex();
+	currDoc->itemToolPrefs.lineEndArrow = tabTools->endArrow->currentIndex();
 	currDoc->opToolPrefs.magMin = tabTools->minimumZoom->value();
 	currDoc->opToolPrefs.magMax = tabTools->maximumZoom->value();
 	currDoc->opToolPrefs.magStep = tabTools->zoomStep->value();
-	currDoc->itemToolPrefs.dPenLine = tabTools->colorComboLine->currentText();
-	if (currDoc->itemToolPrefs.dPenLine == CommonStrings::tr_NoneColor)
-		currDoc->itemToolPrefs.dPenLine = CommonStrings::None;
-	currDoc->itemToolPrefs.dShadeLine = tabTools->shadingLine->value();
-	currDoc->itemToolPrefs.dLstyleLine = static_cast<Qt::PenStyle>(tabTools->comboStyleLine->currentIndex()) + 1;
-	currDoc->itemToolPrefs.dWidthLine = tabTools->lineWidthLine->value();
-	currDoc->itemToolPrefs.dBrushPict = tabTools->comboFillImage->currentText();
-	if (currDoc->itemToolPrefs.dBrushPict == CommonStrings::tr_NoneColor)
-		currDoc->itemToolPrefs.dBrushPict = CommonStrings::None;
-	currDoc->itemToolPrefs.shadePict = tabTools->shadingFillImage->value();
-	currDoc->itemToolPrefs.scaleX = static_cast<double>(tabTools->scalingHorizontal->value()) / 100.0;
-	currDoc->itemToolPrefs.scaleY = static_cast<double>(tabTools->scalingVertical->value()) / 100.0;
-	currDoc->itemToolPrefs.scaleType = tabTools->buttonGroup3->isChecked();
-	currDoc->itemToolPrefs.aspectRatio = tabTools->checkRatioImage->isChecked();
-	currDoc->itemToolPrefs.useEmbeddedPath = tabTools->embeddedPath->isChecked();
+	currDoc->itemToolPrefs.lineColor = tabTools->colorComboLine->currentText();
+	if (currDoc->itemToolPrefs.lineColor == CommonStrings::tr_NoneColor)
+		currDoc->itemToolPrefs.lineColor = CommonStrings::None;
+	currDoc->itemToolPrefs.lineShade = tabTools->shadingLine->value();
+	currDoc->itemToolPrefs.lineStyle = static_cast<Qt::PenStyle>(tabTools->comboStyleLine->currentIndex()) + 1;
+	currDoc->itemToolPrefs.lineWidth = tabTools->lineWidthLine->value();
+	currDoc->itemToolPrefs.imageFillColor = tabTools->comboFillImage->currentText();
+	if (currDoc->itemToolPrefs.imageFillColor == CommonStrings::tr_NoneColor)
+		currDoc->itemToolPrefs.imageFillColor = CommonStrings::None;
+	currDoc->itemToolPrefs.imageFillShade = tabTools->shadingFillImage->value();
+	currDoc->itemToolPrefs.imageScaleX = static_cast<double>(tabTools->scalingHorizontal->value()) / 100.0;
+	currDoc->itemToolPrefs.imageScaleY = static_cast<double>(tabTools->scalingVertical->value()) / 100.0;
+	currDoc->itemToolPrefs.imageScaleType = tabTools->buttonGroup3->isChecked();
+	currDoc->itemToolPrefs.imageAspectRatio = tabTools->checkRatioImage->isChecked();
+	currDoc->itemToolPrefs.imageUseEmbeddedPath = tabTools->embeddedPath->isChecked();
 	int haRes = 0;
 	if (tabTools->checkFullRes->isChecked())
 		haRes = 0;
@@ -419,9 +419,9 @@
 		haRes = 1;
 	if (tabTools->checkHalfRes->isChecked())
 		haRes = 2;
-	if (currDoc->itemToolPrefs.lowResType != haRes)
+	if (currDoc->itemToolPrefs.imageLowResType != haRes)
 	{
-		currDoc->itemToolPrefs.lowResType = haRes;
+		currDoc->itemToolPrefs.imageLowResType = haRes;
 		viewToRecalcPictureRes=true;
 	}
 	else
@@ -429,11 +429,11 @@
 	currDoc->opToolPrefs.dispX = tabTools->genDispX->value();
 	currDoc->opToolPrefs.dispY = tabTools->genDispY->value();
 	currDoc->opToolPrefs.constrain = tabTools->genRot->value();
-	tabTools->polyWidget->getValues(&currDoc->itemToolPrefs.polyC,
-									&currDoc->itemToolPrefs.polyFd,
-									&currDoc->itemToolPrefs.polyF,
-									&currDoc->itemToolPrefs.polyS,
-									&currDoc->itemToolPrefs.polyR,
+	tabTools->polyWidget->getValues(&currDoc->itemToolPrefs.polyCorners,
+									&currDoc->itemToolPrefs.polyFactorValue,
+									&currDoc->itemToolPrefs.polyFactorValue2,
+									&currDoc->itemToolPrefs.polyUseFactor,
+									&currDoc->itemToolPrefs.polyRotation,
 									&currDoc->itemToolPrefs.polyCurvature);
 	currDoc->AutoSave = tabPage->GroupAS->isChecked();
 	currDoc->AutoSaveTime = tabPage->ASTime->value() * 60 * 1000;
Index: scribus/ui/charselect.cpp
===================================================================
--- scribus/ui/charselect.cpp	(revision 13995)
+++ scribus/ui/charselect.cpp	(revision 13996)
@@ -37,7 +37,7 @@
 	uniClearButton->setIcon(loadIcon("22/document-new.png"));
 
 	m_userTableModel = new CharTableModel(this, 6, m_doc,
-										  PrefsManager::instance()->appPrefs.itemToolPrefs.defFont);
+										  PrefsManager::instance()->appPrefs.itemToolPrefs.textFont);
 	loadUserContent(ScPaths::getApplicationDataDir() + "charpalette.ucp");
 
 	m_userTable->setModel(m_userTableModel);
Index: scribus/ui/tabtools.cpp
===================================================================
--- scribus/ui/tabtools.cpp	(revision 13995)
+++ scribus/ui/tabtools.cpp	(revision 13996)
@@ -425,7 +425,12 @@
 	polygonHeadLine = new QLabel( tr( "Regular Polygons" ), subTabPolygon);
 	polygonHeadLine->setFont(f);
 	subTabPolygonLayout->addWidget( polygonHeadLine, 0, 0, Qt::AlignHCenter | Qt::AlignTop );
-	polyWidget = new PolygonWidget(subTabPolygon, prefsData->polyC, prefsData->polyFd, prefsData->polyF, prefsData->polyS, prefsData->polyR, prefsData->polyCurvature);
+	polyWidget = new PolygonWidget(subTabPolygon, prefsData->polyCorners,
+								   prefsData->polyFactorValue,
+								   prefsData->polyFactorValue2,
+								   prefsData->polyUseFactor,
+								   prefsData->polyRotation,
+								   prefsData->polyCurvature);
 	subTabPolygonLayout->addWidget( polyWidget, 1, 0 );
 	subStackTools->addWidget( subTabPolygon );
 
@@ -620,7 +625,7 @@
 
 	for (int fc=0; fc<fontComboText->count(); ++fc)
 	{
-		if (fontComboText->itemText(fc) == itemPrefsData->defFont)
+		if (fontComboText->itemText(fc) == itemPrefsData->textFont)
 		{
 			fontComboText->setCurrentIndex(fc);
 			break;
@@ -633,7 +638,7 @@
 		sizeComboText->addItem(ar_sizes[s] + tr(" pt"));
 	for (int a = 0; a < sizeComboText->count(); ++a)
 	{
-		if (sizeComboText->itemText(a).left(2).toInt() == itemPrefsData->defSize / 10)
+		if (sizeComboText->itemText(a).left(2).toInt() == itemPrefsData->textSize / 10)
 		{
 			sizeComboText->setCurrentIndex(a);
 			break;
@@ -645,56 +650,56 @@
 	ColorList* colorList = (docu != 0) ? (&docu->PageColors) : prefsManager->colorSetPtr();
 	colorComboText->clear();
 	colorComboText->addItem(CommonStrings::tr_NoneColor);
-	if (itemPrefsData->dPenText == CommonStrings::None)
+	if (itemPrefsData->textColor == CommonStrings::None)
 		colorComboText->setCurrentIndex(colorComboText->count()-1);
 	endOfColorList=colorList->end();
 	for (itc = colorList->begin(); itc != endOfColorList; ++itc)
 	{
 		colorComboText->insertFancyItem( itc.value(), docu, itc.key() );
-		if (itc.key() == itemPrefsData->dPenText)
+		if (itc.key() == itemPrefsData->textColor)
 			colorComboText->setCurrentIndex(colorComboText->count()-1);
 	}
 
-	shadingText->setValue(itemPrefsData->dTextPenShade);
+	shadingText->setValue(itemPrefsData->textShade);
 
 	colorComboStrokeText->clear();
 	colorComboStrokeText->addItem(CommonStrings::tr_NoneColor);
-	if (itemPrefsData->dStrokeText == CommonStrings::None)
+	if (itemPrefsData->textStrokeColor == CommonStrings::None)
 		colorComboStrokeText->setCurrentIndex(colorComboStrokeText->count()-1);
 	endOfColorList=colorList->end();
 	for (itc = colorList->begin(); itc != endOfColorList; ++itc)
 	{
 		colorComboStrokeText->insertFancyItem( itc.value(), docu, itc.key() );
-		if (itc.key() == itemPrefsData->dStrokeText)
+		if (itc.key() == itemPrefsData->textStrokeColor)
 			colorComboStrokeText->setCurrentIndex(colorComboStrokeText->count()-1);
 	}
-	shadingTextStroke->setValue(itemPrefsData->dTextStrokeShade);
+	shadingTextStroke->setValue(itemPrefsData->textStrokeShade);
 
 	colorComboTextBackground->clear();
 	colorComboTextBackground->addItem(CommonStrings::tr_NoneColor);
-	if (itemPrefsData->dTextBackGround == CommonStrings::None)
+	if (itemPrefsData->textBackground == CommonStrings::None)
 		colorComboTextBackground->setCurrentIndex(colorComboTextBackground->count()-1);
 	endOfColorList=colorList->end();
 	for (itc = colorList->begin(); itc != endOfColorList; ++itc)
 	{
 		colorComboTextBackground->insertFancyItem( itc.value(), docu, itc.key() );
-		if (itc.key() == itemPrefsData->dTextBackGround)
+		if (itc.key() == itemPrefsData->textBackground)
 			colorComboTextBackground->setCurrentIndex(colorComboTextBackground->count()-1);
 	}
-	shadingTextBack->setValue(itemPrefsData->dTextBackGroundShade);
+	shadingTextBack->setValue(itemPrefsData->textBackgroundShade);
 
 	colorComboTextLine->clear();
 	colorComboTextLine->addItem(CommonStrings::tr_NoneColor);
-	if (itemPrefsData->dTextLineColor == CommonStrings::None)
+	if (itemPrefsData->textLineColor == CommonStrings::None)
 		colorComboTextLine->setCurrentIndex(colorComboTextLine->count()-1);
 	endOfColorList=colorList->end();
 	for (itc = colorList->begin(); itc != endOfColorList; ++itc)
 	{
 		colorComboTextLine->insertFancyItem( itc.value(), docu, itc.key() );
-		if (itc.key() == itemPrefsData->dTextLineColor)
+		if (itc.key() == itemPrefsData->textLineColor)
 			colorComboTextLine->setCurrentIndex(colorComboTextLine->count()-1);
 	}
-	shadingTextLine->setValue(itemPrefsData->dTextLineShade);
+	shadingTextLine->setValue(itemPrefsData->textLineShade);
 
 	tabFillCombo->clear();
 	tabFillCombo->addItem( tr("None", "tab fill" ));
@@ -702,19 +707,19 @@
 	tabFillCombo->addItem( tr("Hyphen"));
 	tabFillCombo->addItem( tr("Underscore"));
 	tabFillCombo->addItem( tr("Custom"));
-	if (itemPrefsData->tabFillChar.isEmpty())
+	if (itemPrefsData->textTabFillChar.isEmpty())
 	{
 		tabFillCombo->setCurrentIndex(0);
 	}
-	else if (itemPrefsData->tabFillChar == ".")
+	else if (itemPrefsData->textTabFillChar == ".")
 	{
 		tabFillCombo->setCurrentIndex(1);
 	}
-	else if (itemPrefsData->tabFillChar == "-")
+	else if (itemPrefsData->textTabFillChar == "-")
 	{
 		tabFillCombo->setCurrentIndex(2);
 	}
-	else if (itemPrefsData->tabFillChar == "_")
+	else if (itemPrefsData->textTabFillChar == "_")
 	{
 		tabFillCombo->setCurrentIndex(3);
 	}
@@ -722,58 +727,59 @@
 	{
 		tabFillCombo->setCurrentIndex(4);
 		tabFillCombo->setEditable(true);
-		tabFillCombo->setItemText(tabFillCombo->currentIndex(), CommonStrings::trCustomTabFill + itemPrefsData->tabFillChar);
+		tabFillCombo->setItemText(tabFillCombo->currentIndex(), CommonStrings::trCustomTabFill + itemPrefsData->textTabFillChar);
 	}
 	gapText->setNewUnit(unitIndex);
 	gapTab->setNewUnit(unitIndex);
-	gapTab->setValue(itemPrefsData->dTabWidth * unitRatio);
-	columnsText->setValue(itemPrefsData->dCols);
-	gapText->setValue(itemPrefsData->dGap * unitRatio);
+	gapTab->setValue(itemPrefsData->textTabWidth * unitRatio);
+	columnsText->setValue(itemPrefsData->textColumns);
+	gapText->setValue(itemPrefsData->textColumnGap * unitRatio);
 
 	colorComboLineShape->clear();
 	colorComboLineShape->addItem(CommonStrings::tr_NoneColor);
-	if (itemPrefsData->dPen == CommonStrings::None)
+	if (itemPrefsData->shapePen == CommonStrings::None)
 		colorComboLineShape->setCurrentIndex(colorComboLineShape->count()-1);
 	endOfColorList=colorList->end();
 	for (itc = colorList->begin(); itc != endOfColorList; ++itc)
 	{
 		colorComboLineShape->insertFancyItem( itc.value(), docu, itc.key() );
-		if (itc.key() == itemPrefsData->dPen)
+		if (itc.key() == itemPrefsData->shapePen)
 			colorComboLineShape->setCurrentIndex(colorComboLineShape->count()-1);
 	}
-	shadingLineShape->setValue(itemPrefsData->dShade2);
+	shadingLineShape->setValue(itemPrefsData->shapeShade2);
 
 	comboFillShape->clear();
 	comboFillShape->addItem( tr("None"));
-	if (itemPrefsData->dBrush == CommonStrings::None)
+	if (itemPrefsData->shapeBrush == CommonStrings::None)
 		comboFillShape->setCurrentIndex(comboFillShape->count()-1);
 	endOfColorList=colorList->end();
 	for (itc = colorList->begin(); itc != endOfColorList; ++itc)
 	{
 		comboFillShape->insertFancyItem( itc.value(), docu, itc.key() );
-		if (itc.key() == itemPrefsData->dBrush)
+		if (itc.key() == itemPrefsData->shapeBrush)
 			comboFillShape->setCurrentIndex(comboFillShape->count()-1);
 	}
 
-	shadingFillShape->setValue(itemPrefsData->dShade);
-	comboStyleShape->setCurrentIndex(static_cast<int>(itemPrefsData->dLineArt) - 1);
-	lineWidthShape->setValue(itemPrefsData->dWidth);
+	shadingFillShape->setValue(itemPrefsData->shapeShade);
+	comboStyleShape->setCurrentIndex(static_cast<int>(itemPrefsData->shapeLineArt) - 1);
+	//CB: shapeWidth? or lineWidth?
+	lineWidthShape->setValue(itemPrefsData->shapeWidth);
 
 	colorComboLine->clear();
 	colorComboLine->addItem(CommonStrings::tr_NoneColor);
-	if (itemPrefsData->dPenLine == CommonStrings::None)
+	if (itemPrefsData->lineColor == CommonStrings::None)
 		colorComboLine->setCurrentIndex(colorComboLine->count()-1);
 	endOfColorList=colorList->end();
 	for (itc = colorList->begin(); itc != endOfColorList; ++itc)
 	{
 		colorComboLine->insertFancyItem( itc.value(), docu, itc.key() );
-		if (itc.key() == itemPrefsData->dPenLine)
+		if (itc.key() == itemPrefsData->lineColor)
 			colorComboLine->setCurrentIndex(colorComboLine->count()-1);
 	}
 
-	shadingLine->setValue(itemPrefsData->dShadeLine);
+	shadingLine->setValue(itemPrefsData->lineShade);
 
-	comboStyleLine->setCurrentIndex(static_cast<int>(itemPrefsData->dLstyleLine) - 1);
+	comboStyleLine->setCurrentIndex(static_cast<int>(itemPrefsData->lineStyle) - 1);
 	if (docu != 0)
 	{
 		startArrow->rebuildList(&docu->arrowStyles);
@@ -784,31 +790,31 @@
 		startArrow->rebuildList(&prefsManager->appPrefs.arrowStyles);
 		endArrow->rebuildList(&prefsManager->appPrefs.arrowStyles);
 	}
-	startArrow->setCurrentIndex(itemPrefsData->dStartArrow);
-	endArrow->setCurrentIndex(itemPrefsData->dEndArrow);
-	lineWidthLine->setValue(itemPrefsData->dWidthLine);
+	startArrow->setCurrentIndex(itemPrefsData->lineStartArrow);
+	endArrow->setCurrentIndex(itemPrefsData->lineEndArrow);
+	lineWidthLine->setValue(itemPrefsData->lineWidth);
 
-	buttonGroup3->setChecked( itemPrefsData->scaleType );
-	scalingHorizontal->setValue(qRound(itemPrefsData->scaleX * 100));
-	scalingVertical->setValue(qRound(itemPrefsData->scaleY * 100));
-	buttonGroup5->setChecked( !itemPrefsData->scaleType );
-	checkRatioImage->setChecked(itemPrefsData->aspectRatio);
+	buttonGroup3->setChecked( itemPrefsData->imageScaleType );
+	scalingHorizontal->setValue(qRound(itemPrefsData->imageScaleX * 100));
+	scalingVertical->setValue(qRound(itemPrefsData->imageScaleY * 100));
+	buttonGroup5->setChecked( !itemPrefsData->imageScaleType );
+	checkRatioImage->setChecked(itemPrefsData->imageAspectRatio);
 
 	comboFillImage->clear();
 	comboFillImage->addItem(CommonStrings::tr_NoneColor);
-	if (itemPrefsData->dBrushPict == CommonStrings::None)
+	if (itemPrefsData->imageFillColor == CommonStrings::None)
 		comboFillImage->setCurrentIndex(comboFillImage->count()-1);
 	endOfColorList=colorList->end();
 	for (itc = colorList->begin(); itc != endOfColorList; ++itc)
 	{
 		comboFillImage->insertFancyItem( itc.value(), docu, itc.key() );
-		if (itc.key() == itemPrefsData->dBrushPict)
+		if (itc.key() == itemPrefsData->imageFillColor)
 			comboFillImage->setCurrentIndex(comboFillImage->count()-1);
 	}
 
-	shadingFillImage->setValue( itemPrefsData->shadePict );
-	embeddedPath->setChecked(itemPrefsData->useEmbeddedPath);
-	switch (itemPrefsData->lowResType)
+	shadingFillImage->setValue( itemPrefsData->imageFillShade );
+	embeddedPath->setChecked(itemPrefsData->imageUseEmbeddedPath);
+	switch (itemPrefsData->imageLowResType)
 	{
 		case 0:
 			checkFullRes->setChecked(true);
Index: scribus/ui/smlinestyle.cpp
===================================================================
--- scribus/ui/smlinestyle.cpp	(revision 13995)
+++ scribus/ui/smlinestyle.cpp	(revision 13996)
@@ -173,12 +173,12 @@
 	if (!doc_)
 		return QString::null;
 	struct SingleLine sl;
-	sl.Color = doc_->itemToolPrefs.dPenLine;
-	sl.Shade = doc_->itemToolPrefs.dShadeLine;
+	sl.Color = doc_->itemToolPrefs.lineColor;
+	sl.Shade = doc_->itemToolPrefs.lineShade;
 	sl.Dash = Qt::SolidLine;//Docu->itemToolPrefs.;
 	sl.LineEnd = Qt::FlatCap;//Docu->itemToolPrefs.;
 	sl.LineJoin = Qt::MiterJoin;//Docu->itemToolPrefs.;
-	sl.Width = doc_->itemToolPrefs.dWidthLine;
+	sl.Width = doc_->itemToolPrefs.lineWidth;
 	multiLine ml;
 	ml.push_back(sl);
 	QString name = getUniqueName( tr("New Style"));
Index: scribus/ui/storyeditor.cpp
===================================================================
--- scribus/ui/storyeditor.cpp	(revision 13995)
+++ scribus/ui/storyeditor.cpp	(revision 13996)
@@ -1367,7 +1367,7 @@
 	Size = new ScrSpinBox( 0.5, 2048, this, SC_POINTS );
 	PrefsManager* prefsManager = PrefsManager::instance();
 	Size->setSuffix( unitGetSuffixFromIndex(SC_POINTS) );
-	Size->setValue(prefsManager->appPrefs.itemToolPrefs.defSize / 10.0);
+	Size->setValue(prefsManager->appPrefs.itemToolPrefs.textSize / 10.0);
 	sizeAction=addWidget(Size);
 	sizeAction->setVisible(true);
 	ScaleTxt = new QLabel("", this);
@@ -1898,7 +1898,7 @@
 
 //	Editor->setPaper(prefsManager->appPrefs.STEcolor);
 	QFont fo;
-	fo.fromString(prefsManager->appPrefs.storyEditorPrefs.STEfont);
+	fo.fromString(prefsManager->appPrefs.storyEditorPrefs.guiFont);
 	Editor->setFont(fo);
 	EditorBar->setFrameStyle(Editor->frameStyle());
 	EditorBar->setLineWidth(Editor->lineWidth());
@@ -2183,7 +2183,7 @@
 		pal.setColor(QPalette::Inactive, QPalette::Base, newColor);
 		pal.setColor(QPalette::Disabled, QPalette::Base, newColor);
 		Editor->setPalette(pal);
-		prefsManager->appPrefs.storyEditorPrefs.STEcolor = newColor;
+		prefsManager->appPrefs.storyEditorPrefs.guiFontColor = newColor;
 	}
 	blockUpdate = false;
 }
@@ -2192,7 +2192,7 @@
 {
 	blockUpdate = true;
 	Editor->setFont( QFontDialog::getFont( 0, Editor->font(), this ) );
-	prefsManager->appPrefs.storyEditorPrefs.STEfont = Editor->font().toString();
+	prefsManager->appPrefs.storyEditorPrefs.guiFont = Editor->font().toString();
 	EditorBar->doRepaint();
 	blockUpdate = false;
 }
Index: scribus/ui/missing.cpp
===================================================================
--- scribus/ui/missing.cpp	(revision 13995)
+++ scribus/ui/missing.cpp	(revision 13996)
@@ -324,13 +324,13 @@
 	replaceFontCombo = new FontCombo(this);
 	if (doc != 0)
 	{
-		setCurrentComboItem(replaceFontCombo, doc->itemToolPrefs.defFont);
-		replacementFont = doc->itemToolPrefs.defFont;
+		setCurrentComboItem(replaceFontCombo, doc->itemToolPrefs.textFont);
+		replacementFont = doc->itemToolPrefs.textFont;
 	}
 	else
 	{
-		setCurrentComboItem(replaceFontCombo, PrefsManager::instance()->appPrefs.itemToolPrefs.defFont);
-		replacementFont = PrefsManager::instance()->appPrefs.itemToolPrefs.defFont;
+		setCurrentComboItem(replaceFontCombo, PrefsManager::instance()->appPrefs.itemToolPrefs.textFont);
+		replacementFont = PrefsManager::instance()->appPrefs.itemToolPrefs.textFont;
 	}
 	missingFontGridLayout->addWidget( replaceFontCombo, 1, 2 );
 	insteadLabel = new QLabel( tr( "instead" ), this );
Index: scribus/scribus.cpp
===================================================================
--- scribus/scribus.cpp	(revision 13995)
+++ scribus/scribus.cpp	(revision 13996)
@@ -2561,7 +2561,7 @@
 		setStatusBarInfoText("");
 		mainWindowProgressBar->reset();
 		view->previewQualitySwitcher->blockSignals(true);
-		view->previewQualitySwitcher->setCurrentIndex(doc->itemToolPrefs.lowResType);
+		view->previewQualitySwitcher->setCurrentIndex(doc->itemToolPrefs.imageLowResType);
 		view->previewQualitySwitcher->blockSignals(false);
 	}
 	propertiesPalette->Fonts->RebuildList(doc);
@@ -7293,7 +7293,7 @@
 				{
 				}
 //				else
-//FIXME					doc->paragraphStyles()[a].charStyle().setFont((prefsManager->appPrefs.fontPrefs.AvailFonts[doc->toolSettings.defFont]));
+//FIXME					doc->paragraphStyles()[a].charStyle().setFont((prefsManager->appPrefs.fontPrefs.AvailFonts[doc->toolSettings.textFont]));
 			}
 		}
 	}
@@ -7604,7 +7604,7 @@
 	bool oldShowPageShadow = prefsManager->showPageShadow();
 	int oldUIFontSize     = prefsManager->guiFontSize();
 	double oldDisplayScale = prefsManager->displayScale();
-	int oldImageQuality = prefsManager->applicationPrefs()->itemToolPrefs.lowResType;
+	int oldImageQuality = prefsManager->applicationPrefs()->itemToolPrefs.imageLowResType;
 
 	dia->updatePreferences();
 	prefsManager->SavePrefs();
@@ -7637,7 +7637,7 @@
 	ScCore->recheckGS();
 	prefsManager->applyLoadedShortCuts();
 
-	int newImageQuality = prefsManager->appPrefs.itemToolPrefs.lowResType;
+	int newImageQuality = prefsManager->appPrefs.itemToolPrefs.imageLowResType;
 	if (oldImageQuality != newImageQuality)
 		view->previewQualitySwitcher->setCurrentIndex(newImageQuality);
 
Index: scribus/plugins/scriptplugin/cmdobj.cpp
===================================================================
--- scribus/plugins/scriptplugin/cmdobj.cpp	(revision 13995)
+++ scribus/plugins/scriptplugin/cmdobj.cpp	(revision 13996)
@@ -29,8 +29,8 @@
 	int i = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::Polygon, PageItem::Rectangle,
 								pageUnitXToDocX(x), pageUnitYToDocY(y),
 								ValueToPoint(w), ValueToPoint(h),
-								ScCore->primaryMainWindow()->doc->itemToolPrefs.dWidth,
-								ScCore->primaryMainWindow()->doc->itemToolPrefs.dBrush, ScCore->primaryMainWindow()->doc->itemToolPrefs.dPen, true);
+								ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeWidth,
+								ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeBrush, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapePen, true);
 //	ScCore->primaryMainWindow()->doc->setRedrawBounding(ScCore->primaryMainWindow()->doc->Items->at(i));
 	if (Name != EMPTY_STRING)
 	{
@@ -60,9 +60,9 @@
 										pageUnitYToDocY(y),
 										ValueToPoint(w),
 										ValueToPoint(h),
-										ScCore->primaryMainWindow()->doc->itemToolPrefs.dWidth,
-										ScCore->primaryMainWindow()->doc->itemToolPrefs.dBrush,
-										ScCore->primaryMainWindow()->doc->itemToolPrefs.dPen,
+										ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeWidth,
+										ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeBrush,
+										ScCore->primaryMainWindow()->doc->itemToolPrefs.shapePen,
 										true);
 //	if (ItemExists(QString::fromUtf8(Name)))
 //	{
@@ -98,7 +98,7 @@
 									pageUnitYToDocY(y),
 									ValueToPoint(w),
 									ValueToPoint(h),
-									1, ScCore->primaryMainWindow()->doc->itemToolPrefs.dBrushPict,
+									1, ScCore->primaryMainWindow()->doc->itemToolPrefs.imageFillColor,
 									CommonStrings::None, true);
 //	if (ItemExists(QString::fromUtf8(Name)))
 //	{
@@ -134,8 +134,8 @@
 								pageUnitYToDocY(y),
 								ValueToPoint(w),
 								ValueToPoint(h),
-								ScCore->primaryMainWindow()->doc->itemToolPrefs.dWidth, CommonStrings::None,
-								ScCore->primaryMainWindow()->doc->itemToolPrefs.dPenText, true);
+								ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeWidth, CommonStrings::None,
+								ScCore->primaryMainWindow()->doc->itemToolPrefs.textColor, true);
 //	if (ItemExists(QString::fromUtf8(Name)))
 //	{
 //		PyErr_SetString(NameExistsError, QObject::tr("An object with the requested name already exists.","python error"));
@@ -175,9 +175,9 @@
 //	}
 	int i = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::Line, PageItem::Unspecified,
 							   x, y, w, h,
-							   ScCore->primaryMainWindow()->doc->itemToolPrefs.dWidth,
-							   ScCore->primaryMainWindow()->doc->itemToolPrefs.dBrush,
-							   ScCore->primaryMainWindow()->doc->itemToolPrefs.dPen, true);
+							   ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeWidth,
+							   ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeBrush,
+							   ScCore->primaryMainWindow()->doc->itemToolPrefs.shapePen, true);
 	PageItem *it = ScCore->primaryMainWindow()->doc->Items->at(i);
 	it->setRotation(xy2Deg(w-x, h-y));
 	it->setWidthHeight(sqrt(pow(x-w, 2.0) + pow(y-h, 2.0)), 1.0);
@@ -251,7 +251,7 @@
 	i++;
 	y = pageUnitYToDocY(static_cast<double>(PyFloat_AsDouble(PyList_GetItem(il, i))));
 	i++;
-	int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, 1, 1,	ScCore->primaryMainWindow()->doc->itemToolPrefs.dWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs.dBrush, ScCore->primaryMainWindow()->doc->itemToolPrefs.dPen, true);
+	int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, 1, 1,	ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeBrush, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapePen, true);
 	PageItem *it = ScCore->primaryMainWindow()->doc->Items->at(ic);
 	it->PoLine.resize(2);
 	it->PoLine.setPoint(0, 0, 0);
@@ -335,7 +335,7 @@
 	i++;
 	y = pageUnitYToDocY(static_cast<double>(PyFloat_AsDouble(PyList_GetItem(il, i))));
 	i++;
-	int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, x, y, 1, 1,	ScCore->primaryMainWindow()->doc->itemToolPrefs.dWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs.dBrush, ScCore->primaryMainWindow()->doc->itemToolPrefs.dPen, true);
+	int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, x, y, 1, 1,	ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeBrush, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapePen, true);
 	PageItem *it = ScCore->primaryMainWindow()->doc->Items->at(ic);
 	it->PoLine.resize(2);
 	it->PoLine.setPoint(0, 0, 0);
@@ -430,7 +430,7 @@
 	ky2 = pageUnitYToDocY(static_cast<double>(PyFloat_AsDouble(PyList_GetItem(il, i))));
 	i++;
 	//int ic = ScCore->primaryMainWindow()->view->PaintPolyLine(x, y, 1, 1,	ScCore->primaryMainWindow()->doc->toolSettings.dWidth, ScCore->primaryMainWindow()->doc->toolSettings.dBrush, ScCore->primaryMainWindow()->doc->toolSettings.dPen);
-	int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, 1, 1,	ScCore->primaryMainWindow()->doc->itemToolPrefs.dWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs.dBrush, ScCore->primaryMainWindow()->doc->itemToolPrefs.dPen, true);
+	int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, 1, 1,	ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeBrush, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapePen, true);
 	PageItem *it = ScCore->primaryMainWindow()->doc->Items->at(ic);
 	it->PoLine.resize(2);
 	it->PoLine.setPoint(0, 0, 0);
Index: scribus/plugins/cvgimplugin/importcvg.cpp
===================================================================
--- scribus/plugins/cvgimplugin/importcvg.cpp	(revision 13995)
+++ scribus/plugins/cvgimplugin/importcvg.cpp	(revision 13996)
@@ -206,7 +206,7 @@
 				double gw = maxx - minx;
 				double gh = maxy - miny;
 				PageItem *high = m_Doc->Items->at(highestItem);
-				int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.dBrush, m_Doc->itemToolPrefs.dPen, true);
+				int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
 				PageItem *neu = m_Doc->Items->takeAt(z);
 				m_Doc->Items->insert(lowestItem, neu);
 				neu->Groups.push(m_Doc->GroupCounter);
Index: scribus/plugins/pctimplugin/importpct.cpp
===================================================================
--- scribus/plugins/pctimplugin/importpct.cpp	(revision 13995)
+++ scribus/plugins/pctimplugin/importpct.cpp	(revision 13996)
@@ -204,7 +204,7 @@
 				double gw = maxx - minx;
 				double gh = maxy - miny;
 				PageItem *high = m_Doc->Items->at(highestItem);
-				int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.dBrush, m_Doc->itemToolPrefs.dPen, true);
+				int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
 				PageItem *neu = m_Doc->Items->takeAt(z);
 				m_Doc->Items->insert(lowestItem, neu);
 				neu->Groups.push(m_Doc->GroupCounter);
@@ -910,7 +910,7 @@
 						QImage image;
 						image.loadFromData(imageData);
 						image = image.convertToFormat(QImage::Format_ARGB32);
-						int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, image.width(), image.height(), 0, m_Doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+						int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX, baseY, image.width(), image.height(), 0, m_Doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 						PageItem *ite = m_Doc->Items->at(z);
 						ite->tempImageFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_pct_XXXXXX.png");
 						ite->tempImageFile->open();
@@ -1522,7 +1522,7 @@
 		image = image.convertToFormat(QImage::Format_ARGB32);
 		if (!isPixmap)
 			image.invertPixels();
-		int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX + dstRect.left(), baseY + dstRect.top(), imgCols, imgRows, 0, m_Doc->itemToolPrefs.dBrushPict, CommonStrings::None, true);
+		int z = m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX + dstRect.left(), baseY + dstRect.top(), imgCols, imgRows, 0, m_Doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
 		PageItem *ite = m_Doc->Items->at(z);
 		ite->tempImageFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_pct_XXXXXX.png");
 		ite->tempImageFile->open();
Index: scribus/plugins/psimport/importps.cpp
===================================================================
--- scribus/plugins/psimport/importps.cpp	(revision 13995)
+++ scribus/plugins/psimport/importps.cpp	(revision 13996)
@@ -274,7 +274,7 @@
 				double gw = maxx - minx;
 				double gh = maxy - miny;
 				PageItem *high = m_Doc->Items->at(highestItem);
-				int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.dBrush, m_Doc->itemToolPrefs.dPen, true);
+				int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
 				PageItem *neu = m_Doc->Items->takeAt(z);
 				m_Doc->Items->insert(lowestItem, neu);
 				neu->Groups.push(m_Doc->GroupCounter);
Index: scribus/scpreview.cpp
===================================================================
--- scribus/scpreview.cpp	(revision 13995)
+++ scribus/scpreview.cpp	(revision 13996)
@@ -143,14 +143,14 @@
 //				FT_Face face;
 //				error = FT_New_Face( library, prefsManager->appPrefs.AvailFonts[tmpf].fontFilePath(), prefsManager->appPrefs.AvailFonts[tmpf].faceIndex(), &face );
 				if ( prefsManager->appPrefs.fontPrefs.AvailFonts[tmpf].usable() )
-					tmpf = prefsManager->appPrefs.itemToolPrefs.defFont;
+					tmpf = prefsManager->appPrefs.itemToolPrefs.textFont;
 /*				if (prefsManager->appPrefs.AvailFonts[tmpf]->ReadMetrics()) {
 //already done in ScFonts::addScalaableFont():
 //					prefsManager->appPrefs.AvailFonts[tmpf]->CharWidth[13] = 0;
 				}
 				else
 				{
-					tmpf = prefsManager->appPrefs.toolSettings.defFont;
+					tmpf = prefsManager->appPrefs.toolSettings.textFont;
 //					prefsManager->appPrefs.AvailFonts[tmpf]->ReadMetrics();
 //already done in ScFonts::addScalaableFont():
 //					prefsManager->appPrefs.AvailFonts[tmpf]->CharWidth[13] = 0;




More information about the scribus-commit mailing list