diff --git a/src/frontends/qt2/ui/Makefile.am b/src/frontends/qt2/ui/Makefile.am
index bbf5887fea..f1f71665f5 100644
--- a/src/frontends/qt2/ui/Makefile.am
+++ b/src/frontends/qt2/ui/Makefile.am
@@ -1,68 +1,11 @@
 include $(top_srcdir)/config/common.am
+include $(srcdir)/../Makefile.dialogs
 
-EXTRA_DIST = $(SRCS)
+EXTRA_DIST = $(UIFILES)
 
-SRCS = \
-	BiblioModuleBase.ui \
-	BulletsModuleBase.ui \
-	ClassModuleBase.ui \
-	LanguageModuleBase.ui \
-	MarginsModuleBase.ui \
-	NumberingModuleBase.ui \
-	PackagesModuleBase.ui \
-	PaperModuleBase.ui \
-	PreambleModuleBase.ui \
-	QAboutDialog.ui \
-	QAskForTextDialog.ui \
-	QBibitemDialog.ui \
-	QBibtexDialog.ui \
-	QCharacterDialog.ui \
-	QCitationDialog.ui \
-	QDelimiterDialog.ui \
-	QDocumentDialog.ui \
-	QErrorDialog.ui \
-	QERTDialog.ui \
-	QExternalDialog.ui \
-	QFloatDialog.ui \
-	QGraphicsDialog.ui \
-	QIncludeDialog.ui \
-	QIndexDialog.ui \
-	QLogDialog.ui \
-	QMathDialog.ui \
-	QMathMatrixDialog.ui \
-	QMinipageDialog.ui \
-	QParagraphDialog.ui \
-	QPreambleDialog.ui \
-	QPrefAsciiModule.ui \
-	QPrefColorsModule.ui \
-	QPrefConvertersModule.ui \
-	QPrefDateModule.ui \
-	QPrefDisplayModule.ui \
-	QPrefFileformatsModule.ui \
-	QPrefKeyboardModule.ui \
-	QPrefLanguageModule.ui \
-	QPrefLatexModule.ui \
-	QPrefPathsModule.ui \
-	QPrefPrinterModule.ui \
-	QPrefScreenFontsModule.ui \
-	QPrefsDialog.ui \
-	QPrefSpellcheckerModule.ui \
-	QPrefUIModule.ui \
-	QPrintDialog.ui \
-	QRefDialog.ui \
-	QSearchDialog.ui \
-	QSendtoDialog.ui \
-	QShowFileDialog.ui \
-	QSpellcheckerDialog.ui \
-	QTabularCreateDialog.ui \
-	QTabularDialog.ui \
-	QTexinfoDialog.ui \
-	QThesaurusDialog.ui \
-	QTocDialog.ui \
-	QURLDialog.ui \
-	QVCLogDialog.ui \
-	QWrapDialog.ui
+DISTCLEANFILES += *.C *.h
 
+SUBDIRS = . moc
 
 noinst_LTLIBRARIES = libqt2ui.la
 
@@ -74,13 +17,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/frontends \
 AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
 
 
-SUBDIRS = . moc
-
-include $(srcdir)/../Makefile.dialogs
-
-DISTCLEANFILES += $(UIDIALOGS)
-
-nodist_libqt2ui_la_SOURCES = $(UIDIALOGS)
+nodist_libqt2ui_la_SOURCES = $(UIFILES:.ui=.h) $(UIFILES:.ui=.C)
 
 libqt2ui.la: $(libqt2ui_la_OBJECTS) $(libqt2ui_la_DEPENDENCIES)
 
@@ -91,64 +28,3 @@ UICFLAGS=-tr qt_
 	$(UIC) $(UICFLAGS) $< -o $@
 %.C: %.h %.ui
 	$(UIC) $(UICFLAGS) -impl $^ -o $@
-
-QAskForTextDialog.h: QAskForTextDialog.ui
-	$(UIC) $(UICFLAGS) $< -o $@
-QAskForTextDialog.C: QAskForTextDialog.h QAskForTextDialog.ui
-	$(UIC) $(UICFLAGS) -impl $^ -o $@
-
-ClassModuleBase.h: ClassModuleBase.ui
-	$(UIC) $(UICFLAGS) $< -o $@
-ClassModuleBase.C: ClassModuleBase.h ClassModuleBase.ui
-	$(UIC) $(UICFLAGS) -impl $^ -o $@
-
-BulletsModuleBase.h: BulletsModuleBase.ui
-	$(UIC) $(UICFLAGS) $< -o $@
-BulletsModuleBase.C: BulletsModuleBase.h BulletsModuleBase.ui
-	$(UIC) $(UICFLAGS) -impl $^ -o $@
-
-PackagesModuleBase.h: PackagesModuleBase.ui
-	$(UIC) $(UICFLAGS) $< -o $@
-PackagesModuleBase.C: PackagesModuleBase.h PackagesModuleBase.ui
-	$(UIC) $(UICFLAGS) -impl $^ -o $@
-
-PaperModuleBase.h: PaperModuleBase.ui
-	$(UIC) $(UICFLAGS) $< -o $@
-PaperModuleBase.C: PaperModuleBase.h PaperModuleBase.ui
-	$(UIC) $(UICFLAGS) -impl $^ -o $@
-
-MarginsModuleBase.h: MarginsModuleBase.ui
-	$(UIC) $(UICFLAGS) $< -o $@
-MarginsModuleBase.C: MarginsModuleBase.h MarginsModuleBase.ui
-	$(UIC) $(UICFLAGS) -impl $^ -o $@
-
-LanguageModuleBase.h: LanguageModuleBase.ui
-	$(UIC) $(UICFLAGS) $< -o $@
-LanguageModuleBase.C: LanguageModuleBase.h LanguageModuleBase.ui
-	$(UIC) $(UICFLAGS) -impl $^ -o $@
-
-NumberingModuleBase.h: NumberingModuleBase.ui
-	$(UIC) $(UICFLAGS) $< -o $@
-NumberingModuleBase.C: NumberingModuleBase.h NumberingModuleBase.ui
-	$(UIC) $(UICFLAGS) -impl $^ -o $@
-
-BiblioModuleBase.h: BiblioModuleBase.ui
-	$(UIC) $(UICFLAGS) $< -o $@
-BiblioModuleBase.C: BiblioModuleBase.h BiblioModuleBase.ui
-	$(UIC) $(UICFLAGS) -impl $^ -o $@
-
-PreambleModuleBase.h: PreambleModuleBase.ui
-	$(UIC) $(UICFLAGS) $< -o $@
-PreambleModuleBase.C: PreambleModuleBase.h PreambleModuleBase.ui
-	$(UIC) $(UICFLAGS) -impl $^ -o $@
-
-
-%Module.h: %Module.ui
-	$(UIC) $(UICFLAGS) $< -o $@
-%Module.C: %Module.h %Module.ui
-	$(UIC) $(UICFLAGS) -impl $^ -o $@
-
-%Base.h: %.ui
-	$(UIC) $(UICFLAGS) $< -o $@
-%Base.C: %Base.h %.ui
-	$(UIC) $(UICFLAGS) -impl $^ -o $@
diff --git a/src/frontends/qt2/ui/QAboutDialog.ui b/src/frontends/qt2/ui/QAboutDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QAboutDialog.ui
rename to src/frontends/qt2/ui/QAboutDialogBase.ui
diff --git a/src/frontends/qt2/ui/QBibitemDialog.ui b/src/frontends/qt2/ui/QBibitemDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QBibitemDialog.ui
rename to src/frontends/qt2/ui/QBibitemDialogBase.ui
diff --git a/src/frontends/qt2/ui/QBibtexDialog.ui b/src/frontends/qt2/ui/QBibtexDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QBibtexDialog.ui
rename to src/frontends/qt2/ui/QBibtexDialogBase.ui
diff --git a/src/frontends/qt2/ui/QCharacterDialog.ui b/src/frontends/qt2/ui/QCharacterDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QCharacterDialog.ui
rename to src/frontends/qt2/ui/QCharacterDialogBase.ui
diff --git a/src/frontends/qt2/ui/QCitationDialog.ui b/src/frontends/qt2/ui/QCitationDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QCitationDialog.ui
rename to src/frontends/qt2/ui/QCitationDialogBase.ui
diff --git a/src/frontends/qt2/ui/QDelimiterDialog.ui b/src/frontends/qt2/ui/QDelimiterDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QDelimiterDialog.ui
rename to src/frontends/qt2/ui/QDelimiterDialogBase.ui
diff --git a/src/frontends/qt2/ui/QDocumentDialog.ui b/src/frontends/qt2/ui/QDocumentDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QDocumentDialog.ui
rename to src/frontends/qt2/ui/QDocumentDialogBase.ui
diff --git a/src/frontends/qt2/ui/QERTDialog.ui b/src/frontends/qt2/ui/QERTDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QERTDialog.ui
rename to src/frontends/qt2/ui/QERTDialogBase.ui
diff --git a/src/frontends/qt2/ui/QErrorDialog.ui b/src/frontends/qt2/ui/QErrorDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QErrorDialog.ui
rename to src/frontends/qt2/ui/QErrorDialogBase.ui
diff --git a/src/frontends/qt2/ui/QExternalDialog.ui b/src/frontends/qt2/ui/QExternalDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QExternalDialog.ui
rename to src/frontends/qt2/ui/QExternalDialogBase.ui
diff --git a/src/frontends/qt2/ui/QFloatDialog.ui b/src/frontends/qt2/ui/QFloatDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QFloatDialog.ui
rename to src/frontends/qt2/ui/QFloatDialogBase.ui
diff --git a/src/frontends/qt2/ui/QGraphicsDialog.ui b/src/frontends/qt2/ui/QGraphicsDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QGraphicsDialog.ui
rename to src/frontends/qt2/ui/QGraphicsDialogBase.ui
diff --git a/src/frontends/qt2/ui/QIncludeDialog.ui b/src/frontends/qt2/ui/QIncludeDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QIncludeDialog.ui
rename to src/frontends/qt2/ui/QIncludeDialogBase.ui
diff --git a/src/frontends/qt2/ui/QIndexDialog.ui b/src/frontends/qt2/ui/QIndexDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QIndexDialog.ui
rename to src/frontends/qt2/ui/QIndexDialogBase.ui
diff --git a/src/frontends/qt2/ui/QLogDialog.ui b/src/frontends/qt2/ui/QLogDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QLogDialog.ui
rename to src/frontends/qt2/ui/QLogDialogBase.ui
diff --git a/src/frontends/qt2/ui/QMathDialog.ui b/src/frontends/qt2/ui/QMathDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QMathDialog.ui
rename to src/frontends/qt2/ui/QMathDialogBase.ui
diff --git a/src/frontends/qt2/ui/QMathMatrixDialog.ui b/src/frontends/qt2/ui/QMathMatrixDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QMathMatrixDialog.ui
rename to src/frontends/qt2/ui/QMathMatrixDialogBase.ui
diff --git a/src/frontends/qt2/ui/QMinipageDialog.ui b/src/frontends/qt2/ui/QMinipageDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QMinipageDialog.ui
rename to src/frontends/qt2/ui/QMinipageDialogBase.ui
diff --git a/src/frontends/qt2/ui/QParagraphDialog.ui b/src/frontends/qt2/ui/QParagraphDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QParagraphDialog.ui
rename to src/frontends/qt2/ui/QParagraphDialogBase.ui
diff --git a/src/frontends/qt2/ui/QPreambleDialogBase.ui b/src/frontends/qt2/ui/QPreambleDialogBase.ui
new file mode 100644
index 0000000000..cb83d32324
--- /dev/null
+++ b/src/frontends/qt2/ui/QPreambleDialogBase.ui
@@ -0,0 +1,179 @@
+<!DOCTYPE UI><UI>
+<class>QPreambleDialogBase</class>
+<include location="global">config.h</include>
+<include location="local">qt_helpers.h</include>
+<widget>
+    <class>QDialog</class>
+    <property stdset="1">
+        <name>name</name>
+        <cstring>QPreambleDialogBase</cstring>
+    </property>
+    <property stdset="1">
+        <name>geometry</name>
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>412</width>
+            <height>328</height>
+        </rect>
+    </property>
+    <property stdset="1">
+        <name>caption</name>
+        <string>LaTeX pre-amble</string>
+    </property>
+    <property stdset="1">
+        <name>sizeGripEnabled</name>
+        <bool>true</bool>
+    </property>
+    <vbox>
+        <property stdset="1">
+            <name>margin</name>
+            <number>11</number>
+        </property>
+        <property stdset="1">
+            <name>spacing</name>
+            <number>6</number>
+        </property>
+        <widget>
+            <class>QMultiLineEdit</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>preambleLE</cstring>
+            </property>
+            <property>
+                <name>toolTip</name>
+                <string>The LaTeX pre-amble</string>
+            </property>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout2</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>editPB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;Edit ...</string>
+                    </property>
+                    <property stdset="1">
+                        <name>default</name>
+                        <bool>true</bool>
+                    </property>
+                    <property>
+                        <name>toolTip</name>
+                        <string>Edit the pre-amble in an external editor</string>
+                    </property>
+                </widget>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer3</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Expanding</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>okPB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;OK</string>
+                    </property>
+                    <property stdset="1">
+                        <name>default</name>
+                        <bool>true</bool>
+                    </property>
+                    <property>
+                        <name>toolTip</name>
+                        <string></string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>applyPB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;Apply</string>
+                    </property>
+                    <property stdset="1">
+                        <name>default</name>
+                        <bool>true</bool>
+                    </property>
+                    <property>
+                        <name>toolTip</name>
+                        <string></string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>closePB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;Close</string>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+    </vbox>
+</widget>
+<connections>
+    <connection>
+        <sender>preambleLE</sender>
+        <signal>textChanged()</signal>
+        <receiver>QPreambleDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>editPB</sender>
+        <signal>clicked()</signal>
+        <receiver>QPreambleDialogBase</receiver>
+        <slot>editClicked()</slot>
+    </connection>
+    <slot access="public">change_adaptor()</slot>
+    <slot access="public">editClicked()</slot>
+</connections>
+<tabstops>
+    <tabstop>preambleLE</tabstop>
+    <tabstop>editPB</tabstop>
+    <tabstop>okPB</tabstop>
+    <tabstop>applyPB</tabstop>
+    <tabstop>closePB</tabstop>
+</tabstops>
+</UI>
diff --git a/src/frontends/qt2/ui/QPrefsDialog.ui b/src/frontends/qt2/ui/QPrefsDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrefsDialog.ui
rename to src/frontends/qt2/ui/QPrefsDialogBase.ui
diff --git a/src/frontends/qt2/ui/QPrintDialog.ui b/src/frontends/qt2/ui/QPrintDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QPrintDialog.ui
rename to src/frontends/qt2/ui/QPrintDialogBase.ui
diff --git a/src/frontends/qt2/ui/QRefDialog.ui b/src/frontends/qt2/ui/QRefDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QRefDialog.ui
rename to src/frontends/qt2/ui/QRefDialogBase.ui
diff --git a/src/frontends/qt2/ui/QSearchDialog.ui b/src/frontends/qt2/ui/QSearchDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QSearchDialog.ui
rename to src/frontends/qt2/ui/QSearchDialogBase.ui
diff --git a/src/frontends/qt2/ui/QSendtoDialog.ui b/src/frontends/qt2/ui/QSendtoDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QSendtoDialog.ui
rename to src/frontends/qt2/ui/QSendtoDialogBase.ui
diff --git a/src/frontends/qt2/ui/QShowFileDialog.ui b/src/frontends/qt2/ui/QShowFileDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QShowFileDialog.ui
rename to src/frontends/qt2/ui/QShowFileDialogBase.ui
diff --git a/src/frontends/qt2/ui/QSpellcheckerDialog.ui b/src/frontends/qt2/ui/QSpellcheckerDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QSpellcheckerDialog.ui
rename to src/frontends/qt2/ui/QSpellcheckerDialogBase.ui
diff --git a/src/frontends/qt2/ui/QTabularCreateDialog.ui b/src/frontends/qt2/ui/QTabularCreateDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QTabularCreateDialog.ui
rename to src/frontends/qt2/ui/QTabularCreateDialogBase.ui
diff --git a/src/frontends/qt2/ui/QTabularDialog.ui b/src/frontends/qt2/ui/QTabularDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QTabularDialog.ui
rename to src/frontends/qt2/ui/QTabularDialogBase.ui
diff --git a/src/frontends/qt2/ui/QTexinfoDialog.ui b/src/frontends/qt2/ui/QTexinfoDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QTexinfoDialog.ui
rename to src/frontends/qt2/ui/QTexinfoDialogBase.ui
diff --git a/src/frontends/qt2/ui/QThesaurusDialog.ui b/src/frontends/qt2/ui/QThesaurusDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QThesaurusDialog.ui
rename to src/frontends/qt2/ui/QThesaurusDialogBase.ui
diff --git a/src/frontends/qt2/ui/QTocDialog.ui b/src/frontends/qt2/ui/QTocDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QTocDialog.ui
rename to src/frontends/qt2/ui/QTocDialogBase.ui
diff --git a/src/frontends/qt2/ui/QURLDialog.ui b/src/frontends/qt2/ui/QURLDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QURLDialog.ui
rename to src/frontends/qt2/ui/QURLDialogBase.ui
diff --git a/src/frontends/qt2/ui/QVCLogDialog.ui b/src/frontends/qt2/ui/QVCLogDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QVCLogDialog.ui
rename to src/frontends/qt2/ui/QVCLogDialogBase.ui
diff --git a/src/frontends/qt2/ui/QWrapDialog.ui b/src/frontends/qt2/ui/QWrapDialogBase.ui
similarity index 100%
rename from src/frontends/qt2/ui/QWrapDialog.ui
rename to src/frontends/qt2/ui/QWrapDialogBase.ui
diff --git a/src/frontends/qt2/ui/moc/Makefile.am b/src/frontends/qt2/ui/moc/Makefile.am
index 3d0116000a..1d7aa5c522 100644
--- a/src/frontends/qt2/ui/moc/Makefile.am
+++ b/src/frontends/qt2/ui/moc/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/config/common.am
 include $(srcdir)/../../Makefile.dialogs
 
-DISTCLEANFILES += $(UIMOCDIALOGS)
+DISTCLEANFILES += $(UIFILES:.ui=_moc.C)
 
 noinst_LTLIBRARIES = libqt2uimoc.la
 
@@ -13,12 +13,9 @@ INCLUDES = -I$(top_srcdir)/src \
 
 AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
 
-nodist_libqt2uimoc_la_SOURCES = $(UIMOCDIALOGS)
+nodist_libqt2uimoc_la_SOURCES = $(UIFILES:.ui=_moc.C)
 
 libqt2uimoc.la: $(libqt2uimoc_la_OBJECTS) $(libqt2uimoc_la_DEPENDENCIES)
 
 %_moc.C: ../%.h
 	$(MOC) -o $@ $<
-
-distclean-local:
-	rm -f *_moc.C