diff --git a/Scribus/scribus/ui/smcstylewidget.ui b/Scribus/scribus/ui/smcstylewidget.ui
index d3e320b..e80fc76 100644
--- a/Scribus/scribus/ui/smcstylewidget.ui
+++ b/Scribus/scribus/ui/smcstylewidget.ui
@@ -1,40 +1,41 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SMCStyleWidget</class>
- <widget class="QWidget" name="SMCStyleWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="SMCStyleWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>378</width>
+    <width>414</width>
     <height>478</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
-      <widget class="QLabel" name="parentLabel" >
-       <property name="text" >
+      <widget class="QLabel" name="parentLabel">
+       <property name="text">
         <string>Based On:</string>
        </property>
-       <property name="wordWrap" >
+       <property name="wordWrap">
         <bool>false</bool>
        </property>
-       <property name="buddy" >
+       <property name="buddy">
         <cstring>parentCombo</cstring>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="parentCombo" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+      <widget class="QComboBox" name="parentCombo">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
          <horstretch>5</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -44,20 +45,20 @@
     </layout>
    </item>
    <item>
-    <widget class="QGroupBox" name="basicGroup" >
-     <property name="title" >
+    <widget class="QGroupBox" name="basicGroup">
+     <property name="title">
       <string>Basic Formatting</string>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout">
       <item>
-       <widget class="SMFontComboH" native="1" name="fontFace_" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+       <widget class="SMFontComboH" name="fontFace_" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="minimumSize" >
+        <property name="minimumSize">
          <size>
           <width>0</width>
           <height>62</height>
@@ -66,100 +67,100 @@
        </widget>
       </item>
       <item>
-       <layout class="QHBoxLayout" >
+       <layout class="QHBoxLayout">
         <item>
-         <widget class="QLabel" name="fontSizeLabel_" >
-          <property name="minimumSize" >
+         <widget class="QLabel" name="fontSizeLabel_">
+          <property name="minimumSize">
            <size>
             <width>22</width>
             <height>22</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string/>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>fontSize_</cstring>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="SMScrSpinBox" name="fontSize_" >
-          <property name="minimum" >
+         <widget class="SMScrSpinBox" name="fontSize_">
+          <property name="minimum">
            <number>1</number>
           </property>
-          <property name="maximum" >
+          <property name="maximum">
            <number>2048</number>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QLabel" name="trackingLabel_" >
-          <property name="minimumSize" >
+         <widget class="QLabel" name="trackingLabel_">
+          <property name="minimumSize">
            <size>
             <width>22</width>
             <height>22</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string/>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>tracking_</cstring>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="SMScrSpinBox" name="tracking_" >
-          <property name="suffix" >
+         <widget class="SMScrSpinBox" name="tracking_">
+          <property name="suffix">
            <string> %</string>
           </property>
-          <property name="minimum" >
+          <property name="minimum">
            <number>-300</number>
           </property>
-          <property name="maximum" >
+          <property name="maximum">
            <number>300</number>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QLabel" name="widthSpaceLabel" >
-          <property name="minimumSize" >
+         <widget class="QLabel" name="widthSpaceLabel">
+          <property name="minimumSize">
            <size>
             <width>22</width>
             <height>22</height>
            </size>
           </property>
-          <property name="textInteractionFlags" >
+          <property name="textInteractionFlags">
            <set>Qt::NoTextInteraction</set>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>widthSpaceSpin</cstring>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="SMScrSpinBox" name="widthSpaceSpin" >
-          <property name="suffix" >
+         <widget class="SMScrSpinBox" name="widthSpaceSpin">
+          <property name="suffix">
            <string> %</string>
           </property>
-          <property name="minimum" >
+          <property name="minimum">
            <number>1</number>
           </property>
-          <property name="maximum" >
+          <property name="maximum">
            <number>199</number>
           </property>
-          <property name="value" >
+          <property name="value">
            <number>100</number>
           </property>
          </widget>
         </item>
         <item>
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>40</width>
             <height>20</height>
@@ -170,16 +171,16 @@
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout" >
+       <layout class="QHBoxLayout">
         <item>
-         <widget class="SMStyleSelect" native="1" name="effects_" >
-          <property name="sizePolicy" >
-           <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+         <widget class="SMStyleSelect" name="effects_" native="true">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="minimumSize" >
+          <property name="minimumSize">
            <size>
             <width>30</width>
             <height>0</height>
@@ -189,13 +190,13 @@
         </item>
         <item>
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeType" >
+          <property name="sizeType">
            <enum>QSizePolicy::Expanding</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>20</width>
             <height>40</height>
@@ -207,13 +208,13 @@
       </item>
       <item>
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
-        <property name="sizeType" >
+        <property name="sizeType">
          <enum>QSizePolicy::MinimumExpanding</enum>
         </property>
-        <property name="sizeHint" stdset="0" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>300</width>
           <height>0</height>
@@ -225,106 +226,106 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="advGroup" >
-     <property name="title" >
+    <widget class="QGroupBox" name="advGroup">
+     <property name="title">
       <string>Advanced Formatting</string>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout">
       <item>
-       <layout class="QHBoxLayout" >
+       <layout class="QHBoxLayout">
         <item>
-         <widget class="QLabel" name="hscaleLabel_" >
-          <property name="maximumSize" >
+         <widget class="QLabel" name="hscaleLabel_">
+          <property name="maximumSize">
            <size>
             <width>22</width>
             <height>22</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>TextLabel</string>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>fontHScale_</cstring>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="SMScrSpinBox" name="fontHScale_" >
-          <property name="suffix" >
+         <widget class="SMScrSpinBox" name="fontHScale_">
+          <property name="suffix">
            <string> %</string>
           </property>
-          <property name="minimum" >
+          <property name="minimum">
            <number>10</number>
           </property>
-          <property name="maximum" >
+          <property name="maximum">
            <number>400</number>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QLabel" name="vscaleLabel_" >
-          <property name="maximumSize" >
+         <widget class="QLabel" name="vscaleLabel_">
+          <property name="maximumSize">
            <size>
             <width>22</width>
             <height>22</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>TextLabel</string>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>fontVScale_</cstring>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="SMScrSpinBox" name="fontVScale_" >
-          <property name="suffix" >
+         <widget class="SMScrSpinBox" name="fontVScale_">
+          <property name="suffix">
            <string> %</string>
           </property>
-          <property name="minimum" >
+          <property name="minimum">
            <number>10</number>
           </property>
-          <property name="maximum" >
+          <property name="maximum">
            <number>400</number>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QLabel" name="baselineOffsetLabel_" >
-          <property name="maximumSize" >
+         <widget class="QLabel" name="baselineOffsetLabel_">
+          <property name="maximumSize">
            <size>
             <width>22</width>
             <height>22</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>TextLabel</string>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>baselineOffset_</cstring>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="SMScrSpinBox" name="baselineOffset_" >
-          <property name="suffix" >
+         <widget class="SMScrSpinBox" name="baselineOffset_">
+          <property name="suffix">
            <string> %</string>
           </property>
-          <property name="minimum" >
+          <property name="minimum">
            <number>-100</number>
           </property>
-          <property name="maximum" >
+          <property name="maximum">
            <number>100</number>
           </property>
          </widget>
         </item>
         <item>
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>40</width>
             <height>20</height>
@@ -335,26 +336,26 @@
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout" >
+       <layout class="QHBoxLayout">
         <item>
-         <widget class="QLabel" name="languageLabel_" >
-          <property name="text" >
+         <widget class="QLabel" name="languageLabel_">
+          <property name="text">
            <string>Language:</string>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>language_</cstring>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="SMScComboBox" name="language_" />
+         <widget class="SMScComboBox" name="language_"/>
         </item>
         <item>
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>40</width>
             <height>20</height>
@@ -364,81 +365,68 @@
         </item>
        </layout>
       </item>
-      <item>
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType" >
-         <enum>QSizePolicy::MinimumExpanding</enum>
-        </property>
-        <property name="sizeHint" stdset="0" >
-         <size>
-          <width>300</width>
-          <height>0</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="smColorGroup" >
-     <property name="title" >
+    <widget class="QGroupBox" name="smColorGroup">
+     <property name="title">
       <string>Colors</string>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout">
       <item>
-       <layout class="QHBoxLayout" >
+       <layout class="QHBoxLayout">
         <item>
-         <widget class="QLabel" name="FillIcon" >
-          <property name="maximumSize" >
+         <widget class="QLabel" name="FillIcon">
+          <property name="maximumSize">
            <size>
             <width>22</width>
             <height>22</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>TextLabel</string>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>fillColor_</cstring>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="SMColorCombo" name="fillColor_" />
+         <widget class="SMColorCombo" name="fillColor_"/>
         </item>
         <item>
-         <widget class="QLabel" name="fillShadeLabel" >
-          <property name="maximumSize" >
+         <widget class="QLabel" name="fillShadeLabel">
+          <property name="maximumSize">
            <size>
             <width>22</width>
             <height>22</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>TextLabel</string>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>fillShade_</cstring>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="SMShadeButton" name="fillShade_" >
-          <property name="text" >
+         <widget class="SMShadeButton" name="fillShade_">
+          <property name="text">
            <string/>
           </property>
          </widget>
         </item>
         <item>
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeType">
+           <enum>QSizePolicy::Maximum</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
            <size>
             <width>40</width>
             <height>20</height>
@@ -446,58 +434,54 @@
           </property>
          </spacer>
         </item>
-       </layout>
-      </item>
         <item>
-       <layout class="QHBoxLayout" >
-        <item>
-         <widget class="QLabel" name="StrokeIcon" >
-          <property name="maximumSize" >
+         <widget class="QLabel" name="StrokeIcon">
+          <property name="maximumSize">
            <size>
             <width>22</width>
             <height>22</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>TextLabel</string>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>strokeColor_</cstring>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="SMColorCombo" name="strokeColor_" />
+         <widget class="SMColorCombo" name="strokeColor_"/>
         </item>
         <item>
-         <widget class="QLabel" name="strokeShadeLabel" >
-          <property name="maximumSize" >
+         <widget class="QLabel" name="strokeShadeLabel">
+          <property name="maximumSize">
            <size>
             <width>22</width>
             <height>22</height>
            </size>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>TextLabel</string>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>strokeShade_</cstring>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="SMShadeButton" name="strokeShade_" >
-          <property name="text" >
+         <widget class="SMShadeButton" name="strokeShade_">
+          <property name="text">
            <string/>
           </property>
          </widget>
         </item>
         <item>
-         <spacer>
-          <property name="orientation" >
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>40</width>
             <height>20</height>
@@ -507,15 +491,18 @@
         </item>
        </layout>
       </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <spacer>
-        <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-        <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
-        <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>72</width>
        <height>0</height>
@@ -525,10 +512,7 @@
    </item>
   </layout>
  </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>SMScComboBox</class>
diff --git a/Scribus/scribus/ui/smpstylewidget.cpp b/Scribus/scribus/ui/smpstylewidget.cpp
index fa0afbe..0327727 100644
--- a/Scribus/scribus/ui/smpstylewidget.cpp
+++ b/Scribus/scribus/ui/smpstylewidget.cpp
@@ -50,18 +50,21 @@ SMPStyleWidget::SMPStyleWidget(ScribusDoc* doc) : QWidget()
 //	optMarginCombo->addItem(tr("Right Hanging Punctuation"), ParagraphStyle::OM_RightHangingPunct);
 //	optMarginCombo->addItem(tr("Default"), ParagraphStyle::OM_Default);
 
-	parEffectOffset_->setSuffix(unitGetSuffixFromIndex(0));
+	//compress space in Character Style tab
+	cpage->layout()->setMargin(0);
+	
+	parEffectOffset->setSuffix(unitGetSuffixFromIndex(0));
 	
 	fillBulletStrEditCombo();
-	bulletCharTableButton_->setIcon(loadIcon("22/insert-table.png"));
+	bulletCharTableButton->setIcon(loadIcon("22/insert-table.png"));
 	fillNumFormatCombo();
 	numStartSpin->setMinimum(1);
 	numStartSpin->setMaximum(9999);
 	numLevelSpin->setMinimum(1);
 	numLevelSpin->setMaximum(1);
 	fillNumRestartCombo();
-	dropCapLines_->setMinimum(2);
-	dropCapLines_->setMaximum(99);
+	dropCapLines->setMinimum(2);
+	dropCapLines->setMaximum(99);
 
 	minSpaceSpin->setSuffix(unitGetSuffixFromIndex(SC_PERCENT));
 	minGlyphExtSpin->setSuffix(unitGetSuffixFromIndex(SC_PERCENT));
@@ -107,9 +110,9 @@ void SMPStyleWidget::languageChange()
 //	optMarginLabel->setToolTip(optMarginCombo->toolTip());
 	//CB Unneeded, gets in the way of single widget tooltips
 	//dropCapsBox->setToolTip(      tr("Enable or disable drop cap"));
-	dropCapLines_->setToolTip(    tr("Drop Cap Lines"));
-	bulletCharTableButton_->setToolTip(tr("Enhanced Char Table for inserting customs chars as bullets"));
-	parEffectOffset_->setToolTip(   tr("Paragraph Effects Chars Offset"));
+	dropCapLines->setToolTip(    tr("Drop Cap Lines"));
+	bulletCharTableButton->setToolTip(tr("Enhanced Char Table for inserting customs chars as bullets"));
+	parEffectOffset->setToolTip(   tr("Paragraph Effects Chars Offset"));
 	parEffectIndentBox->setToolTip(   tr("Hang Paragraph Effect before paragraph indent"));
 	parEffectCharStyleCombo->setToolTip("<qt>" + tr("Choose chracter style or leave blank for use default paragraph style"));
 	alignement_->setToolTip(      tr("Alignment"));
@@ -158,13 +161,12 @@ void SMPStyleWidget::languageChange()
 	parentLabel->setText( tr("Based On:"));
 	distancesBox->setTitle( tr("Distances and Alignment"));
 
-	parEffectsBox->setTitle(tr("Paragraph Effects"));
 	dropCapsBox->setTitle( tr("Drop Caps"));
 	bulletBox->setTitle(tr("Bullets"));
 	numBox->setTitle(tr("Numeration"));
 	dropCapsLineLabel->setText( tr("Lines:"));
 	bulletCharLabel->setText(tr("Bullet Char/String"));
-	bulletCharTableButton_->setText(tr("Char Table"));
+	bulletCharTableButton->setText(tr("Char Table"));
 	numFormatLabel->setText(tr("Numbering Style"));
 	numLevelLabel->setText(tr("Level"));
 	numPrefixLabel->setText(tr("Prefix"));
@@ -182,12 +184,13 @@ void SMPStyleWidget::languageChange()
 		font1.setPointSize(font1.pointSize() *2);
 	else if (font1.pixelSize())
 		font1.setPixelSize(font1.pixelSize() *2);
-	((QComboBox*) bulletStrEdit_)->setFont(font1);
-	(bulletStrEdit_->lineEdit())->setFont(font1);
+	((QComboBox*) bulletStrEdit)->setFont(font1);
+	(bulletStrEdit->lineEdit())->setFont(font1);
 
 	tabsBox->setTitle( tr("Tabulators and Indentation"));
 	tabWidget->setTabText(0, tr("Properties"));
 	tabWidget->setTabText(1, tr("Character Style"));
+	tabWidget->setTabText(2, tr("Paragraph Effects"));
 	
 	advSettingsGroupBox->setTitle( tr("Advanced Settings"));
 	minSpaceLabel->setText( tr("Min. Space Width:"));
@@ -207,7 +210,7 @@ void SMPStyleWidget::languageChange()
 
 void SMPStyleWidget::unitChange(double oldRatio, double newRatio, int unitIndex)
 {
-	parEffectOffset_->setNewUnit(unitIndex);
+	parEffectOffset->setNewUnit(unitIndex);
 	tabList_->unitChange(unitIndex);
 }
 
@@ -225,13 +228,13 @@ void SMPStyleWidget::setDoc(ScribusDoc *doc)
 
 void SMPStyleWidget::fillBulletStrEditCombo()
 {
-	bulletStrEdit_->clear();
-	bulletStrEdit_->addItem(QChar(0x2022));
-	bulletStrEdit_->addItem("*");
-	bulletStrEdit_->addItem(QChar(0x2013));
-	bulletStrEdit_->setMinimumWidth(50);
-	if (bulletStrEdit_->currentText().isEmpty())
-		bulletStrEdit_->setEditText(QChar(0x2022));
+	bulletStrEdit->clear();
+	bulletStrEdit->addItem(QChar(0x2022));
+	bulletStrEdit->addItem("*");
+	bulletStrEdit->addItem(QChar(0x2013));
+	bulletStrEdit->setMinimumWidth(50);
+	if (bulletStrEdit->currentText().isEmpty())
+		bulletStrEdit->setEditText(QChar(0x2022));
 }
 
 void SMPStyleWidget::fillNumFormatCombo()
@@ -268,7 +271,7 @@ void SMPStyleWidget::checkParEffectState()
 		enable = true;
 
 	parEffectCharStyleCombo->setEnabled(enable);
-	parEffectOffset_->setEnabled(enable);
+	parEffectOffset->setEnabled(enable);
 	parEffectIndentBox->setEnabled(enable);
 }
 
@@ -382,17 +385,17 @@ void SMPStyleWidget::show(ParagraphStyle *pstyle, QList<ParagraphStyle> &pstyles
 
 		dropCapsBox->setChecked(pstyle->hasDropCap());
 		setWidgetBoldFont(dropCapsBox, !pstyle->isInhHasDropCap());
-		dropCapLines_->setValue(pstyle->dropCapLines(), pstyle->isInhDropCapLines());
-		dropCapLines_->setParentValue(parent->dropCapLines());
+		dropCapLines->setValue(pstyle->dropCapLines(), pstyle->isInhDropCapLines());
+		dropCapLines->setParentValue(parent->dropCapLines());
 
-		parEffectOffset_->setValue(pstyle->parEffectOffset() * unitRatio, pstyle->isInhParEffectOffset());
-		parEffectOffset_->setParentValue(parent->parEffectOffset() * unitRatio);
+		parEffectOffset->setValue(pstyle->parEffectOffset() * unitRatio, pstyle->isInhParEffectOffset());
+		parEffectOffset->setParentValue(parent->parEffectOffset() * unitRatio);
 		parEffectIndentBox->setChecked(pstyle->parEffectIndent(),pstyle->isInhParEffectIndent());
 		parEffectIndentBox->setParentValue(parent->parEffectIndent());
 
 		bulletBox->setChecked(pstyle->hasBullet());
 		setWidgetBoldFont(bulletBox, !pstyle->isInhHasBullet());
-		bulletStrEdit_->setEditText(pstyle->bulletStr());
+		bulletStrEdit->setEditText(pstyle->bulletStr());
 		setWidgetBoldFont(bulletCharLabel, !pstyle->isInhBulletStr());
 		numBox->setChecked(pstyle->hasNum());
 		setWidgetBoldFont(numBox, !pstyle->isInhHasNum());
@@ -439,16 +442,16 @@ void SMPStyleWidget::show(ParagraphStyle *pstyle, QList<ParagraphStyle> &pstyles
 		minGlyphExtSpin->setValue(pstyle->minGlyphExtension() * 100.0);
 		maxGlyphExtSpin->setValue(pstyle->maxGlyphExtension() * 100.0);
 
-		parEffectOffset_->setValue(pstyle->parEffectOffset() * unitRatio);
+		parEffectOffset->setValue(pstyle->parEffectOffset() * unitRatio);
 		parEffectIndentBox->setChecked(pstyle->parEffectIndent());
 		parentParEffectsButton->hide();
 		disconnect(parentParEffectsButton, SIGNAL(clicked()), this, SLOT(slotParentParEffects()));
 		dropCapsBox->setChecked(pstyle->hasDropCap());
 		setWidgetBoldFont(dropCapsBox, false);
-		dropCapLines_->setValue(pstyle->dropCapLines());
+		dropCapLines->setValue(pstyle->dropCapLines());
 		bulletBox->setChecked(pstyle->hasBullet());
 		setWidgetBoldFont(bulletBox, false);
-		bulletStrEdit_->setEditText(pstyle->bulletStr());
+		bulletStrEdit->setEditText(pstyle->bulletStr());
 		setWidgetBoldFont(bulletCharLabel, false);
 		numBox->setChecked(pstyle->hasNum());
 		setWidgetBoldFont(numBox, false);
@@ -486,7 +489,7 @@ void SMPStyleWidget::show(ParagraphStyle *pstyle, QList<ParagraphStyle> &pstyles
 	}
 
 	lineSpacing_->setEnabled(pstyle->lineSpacingMode() == ParagraphStyle::FixedLineSpacing);
-	dropCapLines_->setEnabled(pstyle->hasDropCap());
+	dropCapLines->setEnabled(pstyle->hasDropCap());
 
 	checkParEffectState();
 	parEffectCharStyleCombo->clear();
@@ -661,12 +664,12 @@ void SMPStyleWidget::showDropCap(QList<ParagraphStyle*> &pstyles, QList<CharStyl
 			lines = pstyles[i]->dropCapLines();
 	}
 	if (lines == -1)
-		dropCapLines_->clear();
+		dropCapLines->clear();
 	else
-		dropCapLines_->setValue(lines);
+		dropCapLines->setValue(lines);
 
 	dropCapsBox->setEnabled(true);
-	dropCapLines_->setEnabled(true);
+	dropCapLines->setEnabled(true);
 	connectPESignals();
 }
 
@@ -697,10 +700,10 @@ void SMPStyleWidget::showBullet(QList<ParagraphStyle *> &pstyles, QList<CharStyl
 		else
 			chStr = pstyles[i]->bulletStr();
 	}
-	bulletStrEdit_->setEditText(chStr);
+	bulletStrEdit->setEditText(chStr);
 
 	connectPESignals();
-	bulletCharTableButton_->setEnabled(true);
+	bulletCharTableButton->setEnabled(true);
 }
 
 void SMPStyleWidget::showNumeration(QList<ParagraphStyle *> &pstyles, QList<CharStyle> &cstyles, int unitIndex)
@@ -1030,11 +1033,11 @@ void SMPStyleWidget::slotDropCap(bool isOn)
 	disconnectPESignals();
 	if (isOn)
 	{
-		dropCapLines_->setEnabled(true);
+		dropCapLines->setEnabled(true);
 
 		bulletBox->setChecked(false);
-		bulletStrEdit_->setEnabled(false);
-		bulletCharTableButton_->setEnabled(false);
+		bulletStrEdit->setEnabled(false);
+		bulletCharTableButton->setEnabled(false);
 
 		numBox->setChecked(false);
 		numFormatCombo->setEnabled(false);
@@ -1044,7 +1047,7 @@ void SMPStyleWidget::slotDropCap(bool isOn)
 		numNewLineEdit->setEnabled(false);
 	}
 	else
-		dropCapLines_->setEnabled(false);
+		dropCapLines->setEnabled(false);
 	if (hasParent_)
 		parentParEffectsButton->show();
 	checkParEffectState();
@@ -1056,10 +1059,10 @@ void SMPStyleWidget::slotBullets(bool isOn)
 	disconnectPESignals();
 	if (isOn)
 	{
-		bulletStrEdit_->setEnabled(true);
-		if (bulletStrEdit_->currentText().isEmpty())
-			bulletStrEdit_->setEditText(bulletStrEdit_->itemText(0));
-		bulletCharTableButton_->setEnabled(true);
+		bulletStrEdit->setEnabled(true);
+		if (bulletStrEdit->currentText().isEmpty())
+			bulletStrEdit->setEditText(bulletStrEdit->itemText(0));
+		bulletCharTableButton->setEnabled(true);
 
 		numBox->setChecked(false);
 		numFormatCombo->setEnabled(false);
@@ -1069,12 +1072,12 @@ void SMPStyleWidget::slotBullets(bool isOn)
 		numNewLineEdit->setEnabled(false);
 
 		dropCapsBox->setChecked(false);
-		dropCapLines_->setEnabled(false);
+		dropCapLines->setEnabled(false);
 	}
 	else
 	{
-		bulletStrEdit_->setEnabled(false);
-		bulletCharTableButton_->setEnabled(false);
+		bulletStrEdit->setEnabled(false);
+		bulletCharTableButton->setEnabled(false);
 	}
 	if (hasParent_)
 		parentParEffectsButton->show();
@@ -1084,7 +1087,7 @@ void SMPStyleWidget::slotBullets(bool isOn)
 
 void SMPStyleWidget::insertSpecialChars(const QString &chars)
 {
-	bulletStrEdit_->lineEdit()->setText(chars);
+	bulletStrEdit->lineEdit()->setText(chars);
 }
 
 void SMPStyleWidget::slotNumbering(bool isOn)
@@ -1101,11 +1104,11 @@ void SMPStyleWidget::slotNumbering(bool isOn)
 		numNewLineEdit->setEnabled(true);
 
 		bulletBox->setChecked(false);
-		bulletStrEdit_->setEnabled(false);
-		bulletCharTableButton_->setEnabled(false);
+		bulletStrEdit->setEnabled(false);
+		bulletCharTableButton->setEnabled(false);
 
 		dropCapsBox->setChecked(false);
-		dropCapLines_->setEnabled(false);
+		dropCapLines->setEnabled(false);
 	}
 	else
 	{
@@ -1143,7 +1146,7 @@ void SMPStyleWidget::openEnhanced()
 	m_enhanced = new CharSelectEnhanced(this);
 	m_enhanced->setModal(true);
 	connect(m_enhanced, SIGNAL(insertSpecialChars(const QString &)), this, SLOT(insertSpecialChars(const QString &)));
-	connect(m_enhanced, SIGNAL(paletteShown(bool)), bulletCharTableButton_, SLOT(setChecked(bool)));
+	connect(m_enhanced, SIGNAL(paletteShown(bool)), bulletCharTableButton, SLOT(setChecked(bool)));
 	m_enhanced->setDoc(m_Doc);
 	m_enhanced->setEnabled(true);
 	QString styleName = parEffectCharStyleCombo->currentText();
@@ -1164,7 +1167,7 @@ void SMPStyleWidget::closeEnhanced(bool show)
 	if (!m_enhanced || show)
 		return;
 	disconnect(m_enhanced, SIGNAL(insertSpecialChars(const QString &)), this, SLOT(insertSpecialChars(const QString &)));
-	disconnect(m_enhanced, SIGNAL(paletteShown(bool)), bulletCharTableButton_, SLOT(setChecked(bool)));
+	disconnect(m_enhanced, SIGNAL(paletteShown(bool)), bulletCharTableButton, SLOT(setChecked(bool)));
 	m_enhanced->close();
 	delete m_enhanced;
 	m_enhanced = NULL;
@@ -1186,7 +1189,7 @@ void SMPStyleWidget::disconnectPESignals()
 	disconnect(dropCapsBox, SIGNAL(toggled(bool)), this, SLOT(slotDropCap(bool)));
 }
 
-void SMPStyleWidget::on_bulletCharTableButton__toggled(bool checked)
+void SMPStyleWidget::on_bulletCharTableButton_toggled(bool checked)
 {
 	if (m_enhanced && !checked)
 		closeEnhanced();
diff --git a/Scribus/scribus/ui/smpstylewidget.h b/Scribus/scribus/ui/smpstylewidget.h
index b46e016..879c59e 100644
--- a/Scribus/scribus/ui/smpstylewidget.h
+++ b/Scribus/scribus/ui/smpstylewidget.h
@@ -78,7 +78,7 @@ private slots:
 	void slotDefaultOpticalMargins();
 	void slotParentOpticalMargins();
 //	void slotUpdateOpticalMarginsFromCheckBoxes(int);
-	void on_bulletCharTableButton__toggled(bool checked);
+	void on_bulletCharTableButton_toggled(bool checked);
 	void handleUpdateRequest(int);
 
 signals:
diff --git a/Scribus/scribus/ui/smpstylewidget.ui b/Scribus/scribus/ui/smpstylewidget.ui
index fea9615..51a1462 100644
--- a/Scribus/scribus/ui/smpstylewidget.ui
+++ b/Scribus/scribus/ui/smpstylewidget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>798</width>
-    <height>755</height>
+    <width>594</width>
+    <height>451</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
@@ -161,10 +161,6 @@
                   </property>
                  </spacer>
                 </item>
-               </layout>
-              </item>
-              <item>
-               <layout class="QHBoxLayout">
                 <item>
                  <widget class="QLabel" name="spaceBelowLabel">
                   <property name="maximumSize">
@@ -234,17 +230,471 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="parEffectsBox">
+            <widget class="QGroupBox" name="advSettingsGroupBox">
+             <property name="enabled">
+              <bool>true</bool>
+             </property>
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="minimumSize">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="title">
+              <string>Advanced Settings</string>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout">
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout">
+                <property name="sizeConstraint">
+                 <enum>QLayout::SetDefaultConstraint</enum>
+                </property>
+                <property name="topMargin">
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <widget class="QLabel" name="minSpaceLabel">
+                  <property name="text">
+                   <string>TextLabel</string>
+                  </property>
+                  <property name="buddy">
+                   <cstring>minSpaceSpin</cstring>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="SMScrSpinBox" name="minSpaceSpin">
+                  <property name="minimumSize">
+                   <size>
+                    <width>0</width>
+                    <height>0</height>
+                   </size>
+                  </property>
+                  <property name="baseSize">
+                   <size>
+                    <width>0</width>
+                    <height>0</height>
+                   </size>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <widget class="QLabel" name="glyphExtensionLabel">
+                <property name="text">
+                 <string>TextLabel</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout_2">
+                <item>
+                 <widget class="QLabel" name="minGlyphExtLabel">
+                  <property name="text">
+                   <string>TextLabel</string>
+                  </property>
+                  <property name="buddy">
+                   <cstring>minGlyphExtSpin</cstring>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="SMScrSpinBox" name="minGlyphExtSpin">
+                  <property name="minimumSize">
+                   <size>
+                    <width>0</width>
+                    <height>0</height>
+                   </size>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_2">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+                <item>
+                 <widget class="QLabel" name="maxGlyphExtLabel">
+                  <property name="text">
+                   <string>TextLabel</string>
+                  </property>
+                  <property name="buddy">
+                   <cstring>maxGlyphExtSpin</cstring>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="SMScrSpinBox" name="maxGlyphExtSpin">
+                  <property name="minimumSize">
+                   <size>
+                    <width>0</width>
+                    <height>0</height>
+                   </size>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_3">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <spacer>
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Expanding</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>272</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="verticalLayout_3">
+           <item>
+            <widget class="QGroupBox" name="opticalMarginsGroupBox">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="font">
+              <font>
+               <weight>50</weight>
+               <bold>false</bold>
+              </font>
+             </property>
+             <property name="title">
+              <string>Optical Margins</string>
+             </property>
+             <layout class="QGridLayout" name="gridLayout">
+              <item row="0" column="0">
+               <widget class="SMRadioButton" name="optMarginRadioNone">
+                <property name="text">
+                 <string>None</string>
+                </property>
+                <property name="checked">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="SMRadioButton" name="optMarginRadioBoth">
+                <property name="text">
+                 <string>Both Sides</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QPushButton" name="optMarginParentButton">
+                <property name="text">
+                 <string>Use Parent Value</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="SMRadioButton" name="optMarginRadioRight">
+                <property name="text">
+                 <string>Right Only</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <widget class="SMRadioButton" name="optMarginRadioLeft">
+                <property name="text">
+                 <string>Left Only</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="0">
+               <widget class="QPushButton" name="optMarginDefaultButton">
+                <property name="text">
+                 <string>Reset to Default</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="2">
+               <spacer name="horizontalSpacer_5">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="textFlowBox">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
              <property name="title">
-              <string>Paragraph Effects</string>
+              <string>Orphans and Widows</string>
+             </property>
+             <layout class="QGridLayout" name="gridLayout_2">
+              <item row="1" column="0">
+               <widget class="QLabel" name="keepLabelEnd">
+                <property name="text">
+                 <string>Don't separate last</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="0">
+               <widget class="QLabel" name="keepLabelStart">
+                <property name="toolTip">
+                 <string>Ensure that first lines of a paragraph won't end up separated from the rest (known as widow/orphan control)</string>
+                </property>
+                <property name="text">
+                 <string>Don't separate first</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="0" colspan="2">
+               <widget class="SMCheckBox" name="keepTogether">
+                <property name="text">
+                 <string>Do not split paragraph</string>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="0" colspan="2">
+               <widget class="SMCheckBox" name="keepWithNext">
+                <property name="text">
+                 <string>Keep with next paragraph</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="SMSpinBox" name="keepLinesEnd">
+                <property name="suffix">
+                 <string> lines</string>
+                </property>
+                <property name="maximum">
+                 <number>10</number>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="SMSpinBox" name="keepLinesStart">
+                <property name="suffix">
+                 <string> lines</string>
+                </property>
+                <property name="maximum">
+                 <number>10</number>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="2">
+               <spacer name="horizontalSpacer_6">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <spacer>
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Expanding</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>270</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="tabsBox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="title">
+          <string>Tabulators and Indentation</string>
+         </property>
+         <layout class="QVBoxLayout">
+          <item>
+           <layout class="QHBoxLayout">
+            <item>
+             <widget class="SMTabruler" name="tabList_" native="true">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="TabPage">
+      <attribute name="title">
+       <string>Ch&amp;aracter Style</string>
+      </attribute>
+      <layout class="QVBoxLayout">
+       <property name="spacing">
+        <number>5</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QFrame" name="characterBox">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Plain</enum>
+         </property>
+         <property name="lineWidth">
+          <number>0</number>
+         </property>
+         <layout class="QGridLayout">
+          <item row="0" column="0">
+           <widget class="SMCStyleWidget" name="cpage" native="true">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
             </property>
-             <layout class="QVBoxLayout" name="verticalLayout_6">
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="peTab">
+      <attribute name="title">
+       <string>Strona</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_5">
        <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_13">
+        <layout class="QHBoxLayout" name="style">
          <item>
           <widget class="QLabel" name="parEffectCharStyleComboLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="text">
-                   <string>Character Style for Effect:</string>
+            <string>Character Style:</string>
            </property>
           </widget>
          </item>
@@ -252,7 +702,7 @@
           <widget class="SMScComboBox" name="parEffectCharStyleCombo"/>
          </item>
          <item>
-                 <spacer name="spacer_6">
+          <spacer name="spacer_7">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
@@ -266,16 +716,19 @@
          </item>
          <item>
           <widget class="QLabel" name="distFromTextLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="text">
-                   <string>Distance from Text:</string>
-                  </property>
-                  <property name="buddy">
-                   <cstring>parEffectOffset_</cstring>
+            <string>Distance:</string>
            </property>
           </widget>
          </item>
          <item>
-                 <widget class="SMScrSpinBox" name="parEffectOffset_">
+          <widget class="SMScrSpinBox" name="parEffectOffset">
            <property name="minimum">
             <number>-3000</number>
            </property>
@@ -304,12 +757,25 @@
            </property>
           </widget>
          </item>
+         <item>
+          <spacer name="spacer_4">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </item>
        <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_12">
+        <layout class="QHBoxLayout" name="parent">
          <item>
-                 <spacer name="spacer_10">
+          <spacer name="spacer_5">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
@@ -326,6 +792,12 @@
            <property name="enabled">
             <bool>true</bool>
            </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="text">
             <string>Use Parent`s Values</string>
            </property>
@@ -350,18 +822,24 @@
          <property name="checked">
           <bool>false</bool>
          </property>
-                <layout class="QVBoxLayout" name="verticalLayout">
+         <layout class="QVBoxLayout" name="verticalLayout_8">
           <item>
-                  <layout class="QHBoxLayout" name="horizontalLayout_7">
+           <layout class="QHBoxLayout" name="_4">
             <item>
              <widget class="QLabel" name="bulletCharLabel">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
               <property name="text">
-                      <string>Bullet Char/String</string>
+               <string>Bullet Char(s)</string>
               </property>
              </widget>
             </item>
             <item>
-                    <widget class="SMScComboBox" name="bulletStrEdit_">
+             <widget class="SMScComboBox" name="bulletStrEdit">
               <property name="sizePolicy">
                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
@@ -393,9 +871,9 @@
              </spacer>
             </item>
             <item>
-                    <widget class="QPushButton" name="bulletCharTableButton_">
+             <widget class="QPushButton" name="bulletCharTableButton">
               <property name="sizePolicy">
-                      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
@@ -443,9 +921,9 @@
          <property name="checked">
           <bool>false</bool>
          </property>
-                <layout class="QVBoxLayout" name="verticalLayout_5">
+         <layout class="QVBoxLayout" name="verticalLayout_7">
           <item>
-                  <layout class="QHBoxLayout" name="horizontalLayout_9">
+           <layout class="QHBoxLayout" name="_10">
             <item>
              <widget class="QLabel" name="numComboLabel">
               <property name="text">
@@ -464,6 +942,19 @@
              </widget>
             </item>
             <item>
+             <spacer name="spacer_14">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
              <widget class="QLabel" name="numLevelLabel">
               <property name="text">
                <string>Level</string>
@@ -474,7 +965,7 @@
              <widget class="SMSpinBox" name="numLevelSpin"/>
             </item>
             <item>
-                    <spacer name="horizontalSpacer_4">
+             <spacer name="spacer_13">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
@@ -489,25 +980,35 @@
             <item>
              <widget class="QLabel" name="numNewLabel">
               <property name="text">
-                      <string>Create New Set:</string>
+               <string>New Set:</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QLineEdit" name="numNewLineEdit"/>
             </item>
+            <item>
+             <spacer name="spacer_12">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
            </layout>
           </item>
           <item>
-                  <layout class="QHBoxLayout" name="horizontalLayout_10">
+           <layout class="QHBoxLayout" name="_11">
             <item>
              <widget class="QLabel" name="numFormatLabel">
               <property name="text">
                <string>Nums Format</string>
               </property>
-                     <property name="buddy">
-                      <cstring>numFormatCombo</cstring>
-                     </property>
              </widget>
             </item>
             <item>
@@ -521,6 +1022,19 @@
              </widget>
             </item>
             <item>
+             <spacer name="spacer_16">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
              <widget class="QLabel" name="numStartLabel">
               <property name="text">
                <string>Start with</string>
@@ -538,6 +1052,23 @@
              </widget>
             </item>
             <item>
+             <spacer name="spacer_15">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="_9">
+            <item>
              <widget class="QLabel" name="numPrefixLabel">
               <property name="text">
                <string>Prefix</string>
@@ -548,6 +1079,19 @@
              <widget class="QLineEdit" name="numPrefix"/>
             </item>
             <item>
+             <spacer name="spacer_11">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
              <widget class="QLabel" name="numSuffixLabel">
               <property name="text">
                <string>Suffix</string>
@@ -557,10 +1101,23 @@
             <item>
              <widget class="QLineEdit" name="numSuffix"/>
             </item>
+            <item>
+             <spacer name="spacer_10">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
            </layout>
           </item>
           <item>
-                  <layout class="QHBoxLayout" name="horizontalLayout_8">
+           <layout class="QHBoxLayout" name="_8">
             <item>
              <widget class="QLabel" name="numRestartLabel">
               <property name="text">
@@ -572,7 +1129,7 @@
              <widget class="SMScComboBox" name="numRestartCombo"/>
             </item>
             <item>
-                    <spacer name="horizontalSpacer_3">
+             <spacer name="spacer_9">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
@@ -584,6 +1141,10 @@
               </property>
              </spacer>
             </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="_7">
             <item>
              <widget class="SMCheckBox" name="numRestartOtherBox">
               <property name="text">
@@ -592,12 +1153,38 @@
              </widget>
             </item>
             <item>
+             <spacer name="spacer_8">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
              <widget class="SMCheckBox" name="numRestartHigherBox">
               <property name="text">
                <string>Restart after higher level</string>
               </property>
              </widget>
             </item>
+            <item>
+             <spacer name="spacer_6">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
            </layout>
           </item>
          </layout>
@@ -620,21 +1207,18 @@
          <property name="checked">
           <bool>true</bool>
          </property>
-                <layout class="QVBoxLayout">
+         <layout class="QVBoxLayout" name="_2">
           <item>
-                  <layout class="QHBoxLayout">
+           <layout class="QHBoxLayout" name="_3">
             <item>
              <widget class="QLabel" name="dropCapsLineLabel">
               <property name="text">
                <string>&amp;Lines:</string>
               </property>
-                     <property name="buddy">
-                      <cstring>dropCapLines_</cstring>
-                     </property>
              </widget>
             </item>
             <item>
-                    <widget class="SMSpinBox" name="dropCapLines_">
+             <widget class="SMSpinBox" name="dropCapLines">
               <property name="minimum">
                <number>2</number>
               </property>
@@ -644,367 +1228,7 @@
              </widget>
             </item>
             <item>
-                    <spacer name="horizontalSpacer_2">
-                     <property name="orientation">
-                      <enum>Qt::Horizontal</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>40</width>
-                       <height>20</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <spacer>
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::MinimumExpanding</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>272</width>
-               <height>13</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QVBoxLayout" name="verticalLayout_3">
-           <item>
-            <widget class="QGroupBox" name="opticalMarginsGroupBox">
-             <property name="font">
-              <font>
-               <weight>50</weight>
-               <bold>false</bold>
-              </font>
-             </property>
-             <property name="title">
-              <string>Optical Margins</string>
-             </property>
-             <layout class="QFormLayout" name="formLayout">
-              <property name="fieldGrowthPolicy">
-               <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-              </property>
-              <item row="4" column="1">
-               <layout class="QHBoxLayout" name="horizontalLayout_4">
-                <item>
-                 <widget class="QPushButton" name="optMarginDefaultButton">
-                  <property name="text">
-                   <string>Reset to Default</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QPushButton" name="optMarginParentButton">
-                  <property name="text">
-                   <string>Use Parent Value</string>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-              <item row="0" column="1">
-               <widget class="SMRadioButton" name="optMarginRadioNone">
-                <property name="text">
-                 <string>None</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="SMRadioButton" name="optMarginRadioBoth">
-                <property name="text">
-                 <string>Both Sides</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="SMRadioButton" name="optMarginRadioLeft">
-                <property name="text">
-                 <string>Left Only</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="1">
-               <widget class="SMRadioButton" name="optMarginRadioRight">
-                <property name="text">
-                 <string>Right Only</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="advSettingsGroupBox">
-             <property name="enabled">
-              <bool>true</bool>
-             </property>
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>163</height>
-              </size>
-             </property>
-             <property name="title">
-              <string>Advanced Settings</string>
-             </property>
-             <layout class="QGridLayout" name="gridLayout">
-              <item row="0" column="0">
-               <layout class="QHBoxLayout" name="horizontalLayout">
-                <property name="sizeConstraint">
-                 <enum>QLayout::SetDefaultConstraint</enum>
-                </property>
-                <property name="topMargin">
-                 <number>0</number>
-                </property>
-                <property name="bottomMargin">
-                 <number>0</number>
-                </property>
-                <item>
-                 <widget class="QLabel" name="minSpaceLabel">
-                  <property name="text">
-                   <string>TextLabel</string>
-                  </property>
-                  <property name="buddy">
-                   <cstring>minSpaceSpin</cstring>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="SMScrSpinBox" name="minSpaceSpin">
-                  <property name="minimumSize">
-                   <size>
-                    <width>0</width>
-                    <height>32</height>
-                   </size>
-                  </property>
-                  <property name="baseSize">
-                   <size>
-                    <width>0</width>
-                    <height>0</height>
-                   </size>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <spacer name="horizontalSpacer">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>40</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-               </layout>
-              </item>
-              <item row="1" column="0">
-               <widget class="QLabel" name="glyphExtensionLabel">
-                <property name="text">
-                 <string>TextLabel</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="0">
-               <layout class="QHBoxLayout" name="horizontalLayout_6">
-                <item>
-                 <layout class="QHBoxLayout" name="horizontalLayout_2">
-                  <item>
-                   <widget class="QLabel" name="minGlyphExtLabel">
-                    <property name="text">
-                     <string>TextLabel</string>
-                    </property>
-                    <property name="buddy">
-                     <cstring>minGlyphExtSpin</cstring>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="SMScrSpinBox" name="minGlyphExtSpin">
-                    <property name="minimumSize">
-                     <size>
-                      <width>0</width>
-                      <height>32</height>
-                     </size>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-                <item>
-                 <layout class="QHBoxLayout" name="horizontalLayout_3">
-                  <item>
-                   <widget class="QLabel" name="maxGlyphExtLabel">
-                    <property name="text">
-                     <string>TextLabel</string>
-                    </property>
-                    <property name="buddy">
-                     <cstring>maxGlyphExtSpin</cstring>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="SMScrSpinBox" name="maxGlyphExtSpin">
-                    <property name="minimumSize">
-                     <size>
-                      <width>0</width>
-                      <height>32</height>
-                     </size>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="Line" name="line">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="textFlowBox">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="title">
-              <string>Orphans and Widows</string>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_2">
-              <item row="1" column="1">
-               <widget class="SMSpinBox" name="keepLinesEnd">
-                <property name="suffix">
-                 <string> lines</string>
-                </property>
-                <property name="maximum">
-                 <number>10</number>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QLabel" name="keepLabelEnd">
-                <property name="text">
-                 <string>Don't separate last</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <widget class="SMSpinBox" name="keepLinesStart">
-                <property name="suffix">
-                 <string> lines</string>
-                </property>
-                <property name="maximum">
-                 <number>10</number>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="0">
-               <widget class="QLabel" name="keepLabelStart">
-                <property name="toolTip">
-                 <string>Ensure that first lines of a paragraph won't end up separated from the rest (known as widow/orphan control)</string>
-                </property>
-                <property name="text">
-                 <string>Don't separate first</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="0" colspan="2">
-               <widget class="SMCheckBox" name="keepTogether">
-                <property name="text">
-                 <string>Do not split paragraph</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0" colspan="2">
-               <widget class="SMCheckBox" name="keepWithNext">
-                <property name="text">
-                 <string>Keep with next paragraph</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <spacer>
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::Expanding</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>270</width>
-               <height>16</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="tabsBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Tabulators and Indentation</string>
-         </property>
-         <layout class="QVBoxLayout">
-          <item>
-           <layout class="QHBoxLayout">
-            <item>
-             <widget class="SMTabruler" name="tabList_" native="true">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer>
+             <spacer name="spacer_3">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
@@ -1022,54 +1246,20 @@
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacer">
+        <spacer name="spacer_17">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-           <height>0</height>
+           <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="TabPage">
-      <attribute name="title">
-       <string>Ch&amp;aracter Style</string>
-      </attribute>
-      <layout class="QVBoxLayout">
-       <property name="spacing">
-        <number>5</number>
-       </property>
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QFrame" name="characterBox">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="frameShape">
-          <enum>QFrame::NoFrame</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Plain</enum>
-         </property>
-         <property name="lineWidth">
-          <number>0</number>
-         </property>
-         <layout class="QGridLayout">
-          <item row="0" column="0">
-           <widget class="SMCStyleWidget" name="cpage" native="true"/>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
     </widget>
    </item>
   </layout>
diff --git a/Scribus/scribus/ui/smtextstyles.cpp b/Scribus/scribus/ui/smtextstyles.cpp
index ad41c30..357afa1 100644
--- a/Scribus/scribus/ui/smtextstyles.cpp
+++ b/Scribus/scribus/ui/smtextstyles.cpp
@@ -516,13 +516,13 @@ void SMParagraphStyle::setupConnections()
 
 	connect(pwidget_, SIGNAL(useParentParaEffects()), this, SLOT(slotParentParaEffects()));
 	connect(pwidget_->dropCapsBox, SIGNAL(toggled(bool)), this, SLOT(slotDropCap(bool)));
-	connect(pwidget_->dropCapLines_, SIGNAL(valueChanged(int)), this, SLOT(slotDropCapLines(int)));
-	connect(pwidget_->parEffectOffset_, SIGNAL(valueChanged(double)), this, SLOT(slotParEffectOffset()));
+	connect(pwidget_->dropCapLines, SIGNAL(valueChanged(int)), this, SLOT(slotDropCapLines(int)));
+	connect(pwidget_->parEffectOffset, SIGNAL(valueChanged(double)), this, SLOT(slotParEffectOffset()));
 	connect(pwidget_->parEffectIndentBox, SIGNAL(toggled(bool)), this, SLOT(slotParEffectIndent(bool)));
 	connect(pwidget_->parEffectCharStyleCombo, SIGNAL(activated(const QString&)), this, SLOT(slotParEffectCharStyle(const QString&)));
 
 	connect(pwidget_->bulletBox, SIGNAL(toggled(bool)), this, SLOT(slotBullet(bool)));
-	connect(pwidget_->bulletStrEdit_, SIGNAL(editTextChanged(QString)), this, SLOT(slotBulletStr(QString)));
+	connect(pwidget_->bulletStrEdit, SIGNAL(editTextChanged(QString)), this, SLOT(slotBulletStr(QString)));
 	connect(pwidget_->numBox, SIGNAL(toggled(bool)), this, SLOT(slotNumeration(bool)));
 	connect(pwidget_->numComboBox, SIGNAL(activated(QString)), this, SLOT(slotNumName(QString)));
 	connect(pwidget_->numLevelSpin, SIGNAL(valueChanged(int)), this, SLOT(slotNumLevel(int)));
@@ -601,13 +601,13 @@ void SMParagraphStyle::removeConnections()
 	
 	disconnect(pwidget_, SIGNAL(useParentParaEffects()), this, SLOT(slotParentParaEffects()));
 	disconnect(pwidget_->dropCapsBox, SIGNAL(toggled(bool)), this, SLOT(slotDropCap(bool)));
-	disconnect(pwidget_->dropCapLines_, SIGNAL(valueChanged(int)), this, SLOT(slotDropCapLines(int)));
-	disconnect(pwidget_->parEffectOffset_, SIGNAL(valueChanged(double)), this, SLOT(slotParEffectOffset()));
+	disconnect(pwidget_->dropCapLines, SIGNAL(valueChanged(int)), this, SLOT(slotDropCapLines(int)));
+	disconnect(pwidget_->parEffectOffset, SIGNAL(valueChanged(double)), this, SLOT(slotParEffectOffset()));
 	disconnect(pwidget_->parEffectIndentBox, SIGNAL(toggled(bool)), this, SLOT(slotParEffectIndent(bool)));
 	disconnect(pwidget_->parEffectCharStyleCombo, SIGNAL(activated(const QString&)), this, SLOT(slotParEffectCharStyle(const QString&)));
 
 	disconnect(pwidget_->bulletBox, SIGNAL(toggled(bool)), this, SLOT(slotBullet(bool)));
-	disconnect(pwidget_->bulletStrEdit_, SIGNAL(editTextChanged(QString)), this, SLOT(slotBulletStr(QString)));
+	disconnect(pwidget_->bulletStrEdit, SIGNAL(editTextChanged(QString)), this, SLOT(slotBulletStr(QString)));
 	disconnect(pwidget_->numBox, SIGNAL(toggled(bool)), this, SLOT(slotNumeration(bool)));
 	disconnect(pwidget_->numComboBox, SIGNAL(activated(QString)), this, SLOT(slotNumName(QString)));
 	disconnect(pwidget_->numFormatCombo, SIGNAL(activated(int)), this, SLOT(slotNumFormat(int)));
@@ -904,7 +904,7 @@ void SMParagraphStyle::slotParentParaEffects()
 
 void SMParagraphStyle::slotDropCapLines(int lines)
 {
-	if (pwidget_->dropCapLines_->useParentValue())
+	if (pwidget_->dropCapLines->useParentValue())
 		for (int i = 0; i < selection_.count(); ++i)
 			selection_[i]->resetDropCapLines();
 	else		
@@ -920,7 +920,7 @@ void SMParagraphStyle::slotDropCapLines(int lines)
 
 void SMParagraphStyle::slotParEffectOffset()
 {
-	if (pwidget_->parEffectOffset_->useParentValue())
+	if (pwidget_->parEffectOffset->useParentValue())
 		for (int i = 0; i < selection_.count(); ++i)
 			selection_[i]->resetParEffectOffset();
 	else 
@@ -928,7 +928,7 @@ void SMParagraphStyle::slotParEffectOffset()
 		double a, b, value;
 		int c;
 
-		pwidget_->parEffectOffset_->getValues(&a, &b, &c, &value);
+		pwidget_->parEffectOffset->getValues(&a, &b, &c, &value);
 		value = value / unitRatio_;
 		for (int i = 0; i < selection_.count(); ++i)
 			selection_[i]->setParEffectOffset(value);
@@ -982,7 +982,7 @@ void SMParagraphStyle::slotBullet(bool isOn)
 		selection_[i]->setHasBullet(isOn);
 		if (isOn)
 		{
-			selection_[i]->setBulletStr(pwidget_->bulletStrEdit_->currentText());
+			selection_[i]->setBulletStr(pwidget_->bulletStrEdit->currentText());
 			selection_[i]->setHasDropCap(false);
 			selection_[i]->setHasNum(false);
 		}
@@ -1000,8 +1000,8 @@ void SMParagraphStyle::slotBulletStr(const QString &str)
 	QString bstr(str);
 	if (bstr.isEmpty())
 	{
-		bstr = pwidget_->bulletStrEdit_->itemText(0);
-		pwidget_->bulletStrEdit_->setEditText(bstr);
+		bstr = pwidget_->bulletStrEdit->itemText(0);
+		pwidget_->bulletStrEdit->setEditText(bstr);
 	}
 	for (int i = 0; i < selection_.count(); ++i)
 		selection_[i]->setBulletStr(bstr);
